diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index b6eeac9a03..e55a39deb3 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
   api(libs.examination.api)
   api(libs.examination.string)
   compileOnlyApi(libs.jetbrainsAnnotations)
+  compileOnlyApi(libs.jspecify)
   testImplementation(libs.guava)
   annotationProcessor(projects.adventureAnnotationProcessors)
 }
diff --git a/api/src/main/java/net/kyori/adventure/audience/Audience.java b/api/src/main/java/net/kyori/adventure/audience/Audience.java
index 3911b9837b..35e036f1f7 100644
--- a/api/src/main/java/net/kyori/adventure/audience/Audience.java
+++ b/api/src/main/java/net/kyori/adventure/audience/Audience.java
@@ -43,7 +43,7 @@
 import net.kyori.adventure.title.Title;
 import net.kyori.adventure.title.TitlePart;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A receiver of Minecraft media.
@@ -87,6 +87,7 @@
  * @see BossBarViewer
  * @since 4.0.0
  */
+@NullMarked
 public interface Audience extends Pointered {
   /**
    * Gets an audience that does nothing.
@@ -94,7 +95,7 @@ public interface Audience extends Pointered {
    * @return a do-nothing audience
    * @since 4.0.0
    */
-  static @NotNull Audience empty() {
+  static Audience empty() {
     return EmptyAudience.INSTANCE;
   }
 
@@ -106,7 +107,7 @@ public interface Audience extends Pointered {
    * @see ForwardingAudience
    * @since 4.0.0
    */
-  static @NotNull Audience audience(final @NotNull Audience@NotNull... audiences) {
+  static Audience audience(final Audience... audiences) {
     final int length = audiences.length;
     if (length == 0) {
       return empty();
@@ -127,7 +128,7 @@ public interface Audience extends Pointered {
    * @see ForwardingAudience
    * @since 4.0.0
    */
-  static @NotNull ForwardingAudience audience(final @NotNull Iterable<? extends Audience> audiences) {
+  static ForwardingAudience audience(final Iterable<? extends Audience> audiences) {
     return () -> audiences;
   }
 
@@ -139,7 +140,7 @@ public interface Audience extends Pointered {
    * @return a collector to create a forwarding audience
    * @since 4.0.0
    */
-  static @NotNull Collector<? super Audience, ?, ForwardingAudience> toAudience() {
+  static Collector<? super Audience, ?, ForwardingAudience> toAudience() {
     return Audiences.COLLECTOR;
   }
 
@@ -156,7 +157,7 @@ public interface Audience extends Pointered {
    * @return an audience providing a snapshot of all audiences that match the predicate when this method is invoked
    * @since 4.9.0
    */
-  default @NotNull Audience filterAudience(final @NotNull Predicate<? super Audience> filter) {
+  default Audience filterAudience(final Predicate<? super Audience> filter) {
     return filter.test(this)
       ? this
       : empty();
@@ -175,7 +176,7 @@ public interface Audience extends Pointered {
    * @param action the action
    * @since 4.9.0
    */
-  default void forEachAudience(final @NotNull Consumer<? super Audience> action) {
+  default void forEachAudience(final Consumer<? super Audience> action) {
     action.accept(this);
   }
 
@@ -190,7 +191,7 @@ default void forEachAudience(final @NotNull Consumer<? super Audience> action) {
    * @since 4.1.0
    */
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull ComponentLike message) {
+  default void sendMessage(final ComponentLike message) {
     this.sendMessage(message.asComponent());
   }
 
@@ -204,7 +205,7 @@ default void sendMessage(final @NotNull ComponentLike message) {
    * @since 4.1.0
    */
   @SuppressWarnings("deprecation")
-  default void sendMessage(final @NotNull Component message) {
+  default void sendMessage(final Component message) {
     this.sendMessage(message, MessageType.SYSTEM);
   }
 
@@ -222,7 +223,7 @@ default void sendMessage(final @NotNull Component message) {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull ComponentLike message, final @NotNull MessageType type) {
+  default void sendMessage(final ComponentLike message, final MessageType type) {
     this.sendMessage(message.asComponent(), type);
   }
 
@@ -240,7 +241,7 @@ default void sendMessage(final @NotNull ComponentLike message, final @NotNull Me
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull Component message, final @NotNull MessageType type) {
+  default void sendMessage(final Component message, final MessageType type) {
     this.sendMessage(Identity.nil(), message, type);
   }
   /* End: system messages */
@@ -257,7 +258,7 @@ default void sendMessage(final @NotNull Component message, final @NotNull Messag
    */
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull Identified source, final @NotNull ComponentLike message) {
+  default void sendMessage(final Identified source, final ComponentLike message) {
     this.sendMessage(source, message.asComponent());
   }
 
@@ -272,7 +273,7 @@ default void sendMessage(final @NotNull Identified source, final @NotNull Compon
    */
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull Identity source, final @NotNull ComponentLike message) {
+  default void sendMessage(final Identity source, final ComponentLike message) {
     this.sendMessage(source, message.asComponent());
   }
 
@@ -287,7 +288,7 @@ default void sendMessage(final @NotNull Identity source, final @NotNull Componen
    */
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull Identified source, final @NotNull Component message) {
+  default void sendMessage(final Identified source, final Component message) {
     this.sendMessage(source, message, MessageType.CHAT);
   }
 
@@ -302,7 +303,7 @@ default void sendMessage(final @NotNull Identified source, final @NotNull Compon
    */
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull Identity source, final @NotNull Component message) {
+  default void sendMessage(final Identity source, final Component message) {
     this.sendMessage(source, message, MessageType.CHAT);
   }
 
@@ -319,7 +320,7 @@ default void sendMessage(final @NotNull Identity source, final @NotNull Componen
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull Identified source, final @NotNull ComponentLike message, final @NotNull MessageType type) {
+  default void sendMessage(final Identified source, final ComponentLike message, final MessageType type) {
     this.sendMessage(source, message.asComponent(), type);
   }
 
@@ -336,7 +337,7 @@ default void sendMessage(final @NotNull Identified source, final @NotNull Compon
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull Identity source, final @NotNull ComponentLike message, final @NotNull MessageType type) {
+  default void sendMessage(final Identity source, final ComponentLike message, final MessageType type) {
     this.sendMessage(source, message.asComponent(), type);
   }
 
@@ -352,7 +353,7 @@ default void sendMessage(final @NotNull Identity source, final @NotNull Componen
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
-  default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) {
+  default void sendMessage(final Identified source, final Component message, final MessageType type) {
     this.sendMessage(source.identity(), message, type);
   }
 
@@ -368,7 +369,7 @@ default void sendMessage(final @NotNull Identified source, final @NotNull Compon
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
-  default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) {
+  default void sendMessage(final Identity source, final Component message, final MessageType type) {
     // implementation required
   }
   /* End: unsigned player messages */
@@ -383,7 +384,7 @@ default void sendMessage(final @NotNull Identity source, final @NotNull Componen
    * @sinceMinecraft 1.19
    */
   @SuppressWarnings("deprecation")
-  default void sendMessage(final @NotNull Component message, final ChatType.@NotNull Bound boundChatType) {
+  default void sendMessage(final Component message, final ChatType.Bound boundChatType) {
     this.sendMessage(message, MessageType.CHAT);
   }
 
@@ -396,7 +397,7 @@ default void sendMessage(final @NotNull Component message, final ChatType.@NotNu
    * @sinceMinecraft 1.19
    */
   @ForwardingAudienceOverrideNotRequired
-  default void sendMessage(final @NotNull ComponentLike message, final ChatType.@NotNull Bound boundChatType) {
+  default void sendMessage(final ComponentLike message, final ChatType.Bound boundChatType) {
     this.sendMessage(message.asComponent(), boundChatType);
   }
   /* End: disguised player messages
@@ -411,7 +412,7 @@ default void sendMessage(final @NotNull ComponentLike message, final ChatType.@N
    * @sinceMinecraft 1.19
    */
   @SuppressWarnings("deprecation")
-  default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) {
+  default void sendMessage(final SignedMessage signedMessage, final ChatType.Bound boundChatType) {
     final Component content = signedMessage.unsignedContent() != null ? signedMessage.unsignedContent() : Component.text(signedMessage.message());
     if (signedMessage.isSystem()) {
       this.sendMessage(content);
@@ -429,7 +430,7 @@ default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatT
    * @sinceMinecraft 1.19
    */
   @ForwardingAudienceOverrideNotRequired
-  default void deleteMessage(final @NotNull SignedMessage signedMessage) {
+  default void deleteMessage(final SignedMessage signedMessage) {
     if (signedMessage.canDelete()) {
       this.deleteMessage(Objects.requireNonNull(signedMessage.signature()));
     }
@@ -442,7 +443,7 @@ default void deleteMessage(final @NotNull SignedMessage signedMessage) {
    * @since 4.12.0
    * @sinceMinecraft 1.19
    */
-  default void deleteMessage(final SignedMessage.@NotNull Signature signature) {
+  default void deleteMessage(final SignedMessage.Signature signature) {
   }
   /* End: signed player messages */
 
@@ -454,7 +455,7 @@ default void deleteMessage(final SignedMessage.@NotNull Signature signature) {
    * @since 4.0.0
    */
   @ForwardingAudienceOverrideNotRequired
-  default void sendActionBar(final @NotNull ComponentLike message) {
+  default void sendActionBar(final ComponentLike message) {
     this.sendActionBar(message.asComponent());
   }
 
@@ -465,7 +466,7 @@ default void sendActionBar(final @NotNull ComponentLike message) {
    * @see Component
    * @since 4.0.0
    */
-  default void sendActionBar(final @NotNull Component message) {
+  default void sendActionBar(final Component message) {
   }
 
   /**
@@ -478,7 +479,7 @@ default void sendActionBar(final @NotNull Component message) {
    * @since 4.3.0
    */
   @ForwardingAudienceOverrideNotRequired
-  default void sendPlayerListHeader(final @NotNull ComponentLike header) {
+  default void sendPlayerListHeader(final ComponentLike header) {
     this.sendPlayerListHeader(header.asComponent());
   }
 
@@ -491,7 +492,7 @@ default void sendPlayerListHeader(final @NotNull ComponentLike header) {
    * @param header the header
    * @since 4.3.0
    */
-  default void sendPlayerListHeader(final @NotNull Component header) {
+  default void sendPlayerListHeader(final Component header) {
     this.sendPlayerListHeaderAndFooter(header, Component.empty());
   }
 
@@ -505,7 +506,7 @@ default void sendPlayerListHeader(final @NotNull Component header) {
    * @since 4.3.0
    */
   @ForwardingAudienceOverrideNotRequired
-  default void sendPlayerListFooter(final @NotNull ComponentLike footer) {
+  default void sendPlayerListFooter(final ComponentLike footer) {
     this.sendPlayerListFooter(footer.asComponent());
   }
 
@@ -518,7 +519,7 @@ default void sendPlayerListFooter(final @NotNull ComponentLike footer) {
    * @param footer the footer
    * @since 4.3.0
    */
-  default void sendPlayerListFooter(final @NotNull Component footer) {
+  default void sendPlayerListFooter(final Component footer) {
     this.sendPlayerListHeaderAndFooter(Component.empty(), footer);
   }
 
@@ -530,7 +531,7 @@ default void sendPlayerListFooter(final @NotNull Component footer) {
    * @since 4.3.0
    */
   @ForwardingAudienceOverrideNotRequired
-  default void sendPlayerListHeaderAndFooter(final @NotNull ComponentLike header, final @NotNull ComponentLike footer) {
+  default void sendPlayerListHeaderAndFooter(final ComponentLike header, final ComponentLike footer) {
     this.sendPlayerListHeaderAndFooter(header.asComponent(), footer.asComponent());
   }
 
@@ -541,7 +542,7 @@ default void sendPlayerListHeaderAndFooter(final @NotNull ComponentLike header,
    * @param footer the footer
    * @since 4.3.0
    */
-  default void sendPlayerListHeaderAndFooter(final @NotNull Component header, final @NotNull Component footer) {
+  default void sendPlayerListHeaderAndFooter(final Component header, final Component footer) {
   }
 
   /**
@@ -552,7 +553,7 @@ default void sendPlayerListHeaderAndFooter(final @NotNull Component header, fina
    * @since 4.0.0
    */
   @ForwardingAudienceOverrideNotRequired
-  default void showTitle(final @NotNull Title title) {
+  default void showTitle(final Title title) {
     final Title.Times times = title.times();
     if (times != null) this.sendTitlePart(TitlePart.TIMES, times);
 
@@ -569,7 +570,7 @@ default void showTitle(final @NotNull Title title) {
    * @throws IllegalArgumentException if a title part that is not in {@link TitlePart} is used
    * @since 4.9.0
    */
-  default <T> void sendTitlePart(final @NotNull TitlePart<T> part, final @NotNull T value) {
+  default <T> void sendTitlePart(final TitlePart<T> part, final T value) {
   }
 
   /**
@@ -597,7 +598,7 @@ default void resetTitle() {
    * @see BossBar
    * @since 4.0.0
    */
-  default void showBossBar(final @NotNull BossBar bar) {
+  default void showBossBar(final BossBar bar) {
   }
 
   /**
@@ -607,7 +608,7 @@ default void showBossBar(final @NotNull BossBar bar) {
    * @see BossBar
    * @since 4.0.0
    */
-  default void hideBossBar(final @NotNull BossBar bar) {
+  default void hideBossBar(final BossBar bar) {
   }
 
   /**
@@ -619,7 +620,7 @@ default void hideBossBar(final @NotNull BossBar bar) {
    * @see Sound
    * @since 4.0.0
    */
-  default void playSound(final @NotNull Sound sound) {
+  default void playSound(final Sound sound) {
   }
 
   /**
@@ -632,7 +633,7 @@ default void playSound(final @NotNull Sound sound) {
    * @see Sound
    * @since 4.0.0
    */
-  default void playSound(final @NotNull Sound sound, final double x, final double y, final double z) {
+  default void playSound(final Sound sound, final double x, final double y, final double z) {
   }
 
   /**
@@ -651,7 +652,7 @@ default void playSound(final @NotNull Sound sound, final double x, final double
    * @param emitter an emitter
    * @since 4.8.0
    */
-  default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter emitter) {
+  default void playSound(final Sound sound, final Sound.Emitter emitter) {
   }
 
   /**
@@ -661,7 +662,7 @@ default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter
    * @since 4.8.0
    */
   @ForwardingAudienceOverrideNotRequired
-  default void stopSound(final @NotNull Sound sound) {
+  default void stopSound(final Sound sound) {
     this.stopSound(Objects.requireNonNull(sound, "sound").asStop());
   }
 
@@ -672,7 +673,7 @@ default void stopSound(final @NotNull Sound sound) {
    * @see SoundStop
    * @since 4.0.0
    */
-  default void stopSound(final @NotNull SoundStop stop) {
+  default void stopSound(final SoundStop stop) {
   }
 
   /**
@@ -685,7 +686,7 @@ default void stopSound(final @NotNull SoundStop stop) {
    * @since 4.0.0
    */
   @ForwardingAudienceOverrideNotRequired
-  default void openBook(final Book.@NotNull Builder book) {
+  default void openBook(final Book.Builder book) {
     this.openBook(book.build());
   }
 
@@ -698,6 +699,6 @@ default void openBook(final Book.@NotNull Builder book) {
    * @see Book
    * @since 4.0.0
    */
-  default void openBook(final @NotNull Book book) {
+  default void openBook(final Book book) {
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/audience/Audiences.java b/api/src/main/java/net/kyori/adventure/audience/Audiences.java
index ae560eef85..289a53c837 100644
--- a/api/src/main/java/net/kyori/adventure/audience/Audiences.java
+++ b/api/src/main/java/net/kyori/adventure/audience/Audiences.java
@@ -29,13 +29,14 @@
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import net.kyori.adventure.text.ComponentLike;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * {@link Audience}-related utilities.
  *
  * @since 4.13.0
  */
+@NullMarked
 public final class Audiences {
   static final Collector<? super Audience, ?, ForwardingAudience> COLLECTOR = Collectors.collectingAndThen(
     Collectors.toCollection(ArrayList::new),
@@ -52,7 +53,7 @@ private Audiences() {
    * @return an action to send a message
    * @since 4.13.0
    */
-  public static @NotNull Consumer<? super Audience> sendingMessage(final @NotNull ComponentLike message) {
+  public static Consumer<? super Audience> sendingMessage(final ComponentLike message) {
     return audience -> audience.sendMessage(message);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java b/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java
index 0c95a1c9fa..aa0d1fdf6f 100644
--- a/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java
+++ b/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java
@@ -36,86 +36,86 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class EmptyAudience implements Audience {
   static final EmptyAudience INSTANCE = new EmptyAudience();
 
   @Override
-  public @NotNull <T> Optional<T> get(final @NotNull Pointer<T> pointer) {
+  public <T> Optional<T> get(final Pointer<T> pointer) {
     return Optional.empty();
   }
 
   @Contract("_, null -> null; _, !null -> !null")
   @Override
-  public <T> @Nullable T getOrDefault(final @NotNull Pointer<T> pointer, final @Nullable T defaultValue) {
+  public <T> @Nullable T getOrDefault(final Pointer<T> pointer, final @Nullable T defaultValue) {
     return defaultValue;
   }
 
   @Override
-  public <T> @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer<T> pointer, final @NotNull Supplier<? extends T> defaultValue) {
+  public <T> @Nullable T getOrDefaultFrom(final Pointer<T> pointer, final Supplier<? extends T> defaultValue) {
     return defaultValue.get();
   }
 
   @Override
-  public @NotNull Audience filterAudience(final @NotNull Predicate<? super Audience> filter) {
+  public Audience filterAudience(final Predicate<? super Audience> filter) {
     return this;
   }
 
   @Override
-  public void forEachAudience(final @NotNull Consumer<? super Audience> action) {
+  public void forEachAudience(final Consumer<? super Audience> action) {
   }
 
   @Override
-  public void sendMessage(final @NotNull ComponentLike message) {
+  public void sendMessage(final ComponentLike message) {
   }
 
   @Override
-  public void sendMessage(final @NotNull Component message) {
+  public void sendMessage(final Component message) {
   }
 
   @Override
   @Deprecated
-  public void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) {
+  public void sendMessage(final Identified source, final Component message, final MessageType type) {
   }
 
   @Override
   @Deprecated
-  public void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) {
+  public void sendMessage(final Identity source, final Component message, final MessageType type) {
   }
 
   @Override
-  public void sendMessage(final @NotNull Component message, final ChatType.@NotNull Bound boundChatType) {
+  public void sendMessage(final Component message, final ChatType.Bound boundChatType) {
   }
 
   @Override
-  public void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) {
+  public void sendMessage(final SignedMessage signedMessage, final ChatType.Bound boundChatType) {
   }
 
   @Override
-  public void deleteMessage(final SignedMessage.@NotNull Signature signature) {
+  public void deleteMessage(final SignedMessage.Signature signature) {
   }
 
   @Override
-  public void sendActionBar(final @NotNull ComponentLike message) {
+  public void sendActionBar(final ComponentLike message) {
   }
 
   @Override
-  public void sendPlayerListHeader(final @NotNull ComponentLike header) {
+  public void sendPlayerListHeader(final ComponentLike header) {
   }
 
   @Override
-  public void sendPlayerListFooter(final @NotNull ComponentLike footer) {
+  public void sendPlayerListFooter(final ComponentLike footer) {
   }
 
   @Override
-  public void sendPlayerListHeaderAndFooter(final @NotNull ComponentLike header, final @NotNull ComponentLike footer) {
+  public void sendPlayerListHeaderAndFooter(final ComponentLike header, final ComponentLike footer) {
   }
 
   @Override
-  public void openBook(final Book.@NotNull Builder book) {
+  public void openBook(final Book.Builder book) {
   }
 
   @Override
diff --git a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java
index 8ba6135193..c02fe81768 100644
--- a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java
+++ b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java
@@ -44,9 +44,8 @@
 import net.kyori.adventure.title.TitlePart;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A receiver that wraps one or more receivers.
@@ -58,6 +57,7 @@
  * @since 4.0.0
  */
 @FunctionalInterface
+@NullMarked
 public interface ForwardingAudience extends Audience {
   /**
    * Gets the audiences.
@@ -66,15 +66,15 @@ public interface ForwardingAudience extends Audience {
    * @since 4.0.0
    */
   @ApiStatus.OverrideOnly
-  @NotNull Iterable<? extends Audience> audiences();
+  Iterable<? extends Audience> audiences();
 
   @Override
-  default @NotNull Pointers pointers() {
+  default Pointers pointers() {
     return Pointers.empty(); // unsupported
   }
 
   @Override
-  default @NotNull Audience filterAudience(final @NotNull Predicate<? super Audience> filter) {
+  default Audience filterAudience(final Predicate<? super Audience> filter) {
     @Nullable List<Audience> audiences = null;
     for (final Audience audience : this.audiences()) {
       if (filter.test(audience)) {
@@ -93,64 +93,64 @@ public interface ForwardingAudience extends Audience {
   }
 
   @Override
-  default void forEachAudience(final @NotNull Consumer<? super Audience> action) {
+  default void forEachAudience(final Consumer<? super Audience> action) {
     for (final Audience audience : this.audiences()) audience.forEachAudience(action);
   }
 
   @Override
-  default void sendMessage(final @NotNull Component message) {
+  default void sendMessage(final Component message) {
     for (final Audience audience : this.audiences()) audience.sendMessage(message);
   }
 
   @Override
-  default void sendMessage(final @NotNull Component message, final ChatType.@NotNull Bound boundChatType) {
+  default void sendMessage(final Component message, final ChatType.Bound boundChatType) {
     for (final Audience audience : this.audiences()) audience.sendMessage(message, boundChatType);
   }
 
   @Override
-  default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) {
+  default void sendMessage(final SignedMessage signedMessage, final ChatType.Bound boundChatType) {
     for (final Audience audience : this.audiences()) audience.sendMessage(signedMessage, boundChatType);
   }
 
   @Override
-  default void deleteMessage(final SignedMessage.@NotNull Signature signature) {
+  default void deleteMessage(final SignedMessage.Signature signature) {
     for (final Audience audience : this.audiences()) audience.deleteMessage(signature);
   }
 
   @Override
   @Deprecated
-  default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) {
+  default void sendMessage(final Identified source, final Component message, final MessageType type) {
     for (final Audience audience : this.audiences()) audience.sendMessage(source, message, type);
   }
 
   @Override
   @Deprecated
-  default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) {
+  default void sendMessage(final Identity source, final Component message, final MessageType type) {
     for (final Audience audience : this.audiences()) audience.sendMessage(source, message, type);
   }
 
   @Override
-  default void sendActionBar(final @NotNull Component message) {
+  default void sendActionBar(final Component message) {
     for (final Audience audience : this.audiences()) audience.sendActionBar(message);
   }
 
   @Override
-  default void sendPlayerListHeader(final @NotNull Component header) {
+  default void sendPlayerListHeader(final Component header) {
     for (final Audience audience : this.audiences()) audience.sendPlayerListHeader(header);
   }
 
   @Override
-  default void sendPlayerListFooter(final @NotNull Component footer) {
+  default void sendPlayerListFooter(final Component footer) {
     for (final Audience audience : this.audiences()) audience.sendPlayerListFooter(footer);
   }
 
   @Override
-  default void sendPlayerListHeaderAndFooter(final @NotNull Component header, final @NotNull Component footer) {
+  default void sendPlayerListHeaderAndFooter(final Component header, final Component footer) {
     for (final Audience audience : this.audiences()) audience.sendPlayerListHeaderAndFooter(header, footer);
   }
 
   @Override
-  default <T> void sendTitlePart(final @NotNull TitlePart<T> part, final @NotNull T value) {
+  default <T> void sendTitlePart(final TitlePart<T> part, final T value) {
     for (final Audience audience : this.audiences()) audience.sendTitlePart(part, value);
   }
 
@@ -165,37 +165,37 @@ default void resetTitle() {
   }
 
   @Override
-  default void showBossBar(final @NotNull BossBar bar) {
+  default void showBossBar(final BossBar bar) {
     for (final Audience audience : this.audiences()) audience.showBossBar(bar);
   }
 
   @Override
-  default void hideBossBar(final @NotNull BossBar bar) {
+  default void hideBossBar(final BossBar bar) {
     for (final Audience audience : this.audiences()) audience.hideBossBar(bar);
   }
 
   @Override
-  default void playSound(final @NotNull Sound sound) {
+  default void playSound(final Sound sound) {
     for (final Audience audience : this.audiences()) audience.playSound(sound);
   }
 
   @Override
-  default void playSound(final @NotNull Sound sound, final double x, final double y, final double z) {
+  default void playSound(final Sound sound, final double x, final double y, final double z) {
     for (final Audience audience : this.audiences()) audience.playSound(sound, x, y, z);
   }
 
   @Override
-  default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter emitter) {
+  default void playSound(final Sound sound, final Sound.Emitter emitter) {
     for (final Audience audience : this.audiences()) audience.playSound(sound, emitter);
   }
 
   @Override
-  default void stopSound(final @NotNull SoundStop stop) {
+  default void stopSound(final SoundStop stop) {
     for (final Audience audience : this.audiences()) audience.stopSound(stop);
   }
 
   @Override
-  default void openBook(final @NotNull Book book) {
+  default void openBook(final Book book) {
     for (final Audience audience : this.audiences()) audience.openBook(book);
   }
 
@@ -212,7 +212,7 @@ interface Single extends ForwardingAudience {
      * @since 4.0.0
      */
     @ApiStatus.OverrideOnly
-    @NotNull Audience audience();
+    Audience audience();
 
     /**
      * {@inheritDoc}
@@ -222,28 +222,28 @@ interface Single extends ForwardingAudience {
      */
     @Deprecated(/* forRemoval = false */)
     @Override
-    default @NotNull Iterable<? extends Audience> audiences() {
+    default Iterable<? extends Audience> audiences() {
       return Collections.singleton(this.audience());
     }
 
     @Override
-    default <T> @NotNull Optional<T> get(final @NotNull Pointer<T> pointer) {
+    default <T> Optional<T> get(final Pointer<T> pointer) {
       return this.audience().get(pointer);
     }
 
     @Contract("_, null -> null; _, !null -> !null")
     @Override
-    default <T> @Nullable T getOrDefault(final @NotNull Pointer<T> pointer, final @Nullable T defaultValue) {
+    default <T> @Nullable T getOrDefault(final Pointer<T> pointer, final @Nullable T defaultValue) {
       return this.audience().getOrDefault(pointer, defaultValue);
     }
 
     @Override
-    default <T> @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer<T> pointer, final @NotNull Supplier<? extends T> defaultValue) {
+    default <T> @Nullable T getOrDefaultFrom(final Pointer<T> pointer, final Supplier<? extends T> defaultValue) {
       return this.audience().getOrDefaultFrom(pointer, defaultValue);
     }
 
     @Override
-    default @NotNull Audience filterAudience(final @NotNull Predicate<? super Audience> filter) {
+    default Audience filterAudience(final Predicate<? super Audience> filter) {
       final Audience audience = this.audience();
       return filter.test(audience)
         ? this
@@ -251,69 +251,69 @@ interface Single extends ForwardingAudience {
     }
 
     @Override
-    default void forEachAudience(final @NotNull Consumer<? super Audience> action) {
+    default void forEachAudience(final Consumer<? super Audience> action) {
       this.audience().forEachAudience(action);
     }
 
     @Override
-    default @NotNull Pointers pointers() {
+    default Pointers pointers() {
       return this.audience().pointers();
     }
 
     @Override
-    default void sendMessage(final @NotNull Component message) {
+    default void sendMessage(final Component message) {
       this.audience().sendMessage(message);
     }
 
     @Override
-    default void sendMessage(final @NotNull Component message, final ChatType.@NotNull Bound boundChatType) {
+    default void sendMessage(final Component message, final ChatType.Bound boundChatType) {
       this.audience().sendMessage(message, boundChatType);
     }
 
     @Override
-    default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) {
+    default void sendMessage(final SignedMessage signedMessage, final ChatType.Bound boundChatType) {
       this.audience().sendMessage(signedMessage, boundChatType);
     }
 
     @Override
-    default void deleteMessage(final SignedMessage.@NotNull Signature signature) {
+    default void deleteMessage(final SignedMessage.Signature signature) {
       this.audience().deleteMessage(signature);
     }
 
     @Override
     @Deprecated
-    default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) {
+    default void sendMessage(final Identified source, final Component message, final MessageType type) {
       this.audience().sendMessage(source, message, type);
     }
 
     @Override
     @Deprecated
-    default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) {
+    default void sendMessage(final Identity source, final Component message, final MessageType type) {
       this.audience().sendMessage(source, message, type);
     }
 
     @Override
-    default void sendActionBar(final @NotNull Component message) {
+    default void sendActionBar(final Component message) {
       this.audience().sendActionBar(message);
     }
 
     @Override
-    default void sendPlayerListHeader(final @NotNull Component header) {
+    default void sendPlayerListHeader(final Component header) {
       this.audience().sendPlayerListHeader(header);
     }
 
     @Override
-    default void sendPlayerListFooter(final @NotNull Component footer) {
+    default void sendPlayerListFooter(final Component footer) {
       this.audience().sendPlayerListFooter(footer);
     }
 
     @Override
-    default void sendPlayerListHeaderAndFooter(final @NotNull Component header, final @NotNull Component footer) {
+    default void sendPlayerListHeaderAndFooter(final Component header, final Component footer) {
       this.audience().sendPlayerListHeaderAndFooter(header, footer);
     }
 
     @Override
-    default <T> void sendTitlePart(final @NotNull TitlePart<T> part, final @NotNull T value) {
+    default <T> void sendTitlePart(final TitlePart<T> part, final T value) {
       this.audience().sendTitlePart(part, value);
     }
 
@@ -328,37 +328,37 @@ default void resetTitle() {
     }
 
     @Override
-    default void showBossBar(final @NotNull BossBar bar) {
+    default void showBossBar(final BossBar bar) {
       this.audience().showBossBar(bar);
     }
 
     @Override
-    default void hideBossBar(final @NotNull BossBar bar) {
+    default void hideBossBar(final BossBar bar) {
       this.audience().hideBossBar(bar);
     }
 
     @Override
-    default void playSound(final @NotNull Sound sound) {
+    default void playSound(final Sound sound) {
       this.audience().playSound(sound);
     }
 
     @Override
-    default void playSound(final @NotNull Sound sound, final double x, final double y, final double z) {
+    default void playSound(final Sound sound, final double x, final double y, final double z) {
       this.audience().playSound(sound, x, y, z);
     }
 
     @Override
-    default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter emitter) {
+    default void playSound(final Sound sound, final Sound.Emitter emitter) {
       this.audience().playSound(sound, emitter);
     }
 
     @Override
-    default void stopSound(final @NotNull SoundStop stop) {
+    default void stopSound(final SoundStop stop) {
       this.audience().stopSound(stop);
     }
 
     @Override
-    default void openBook(final @NotNull Book book) {
+    default void openBook(final Book book) {
       this.audience().openBook(book);
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java b/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java
index 506c71bf69..cb204d22a0 100644
--- a/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java
+++ b/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java
@@ -31,8 +31,8 @@
 import net.kyori.examination.Examinable;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.UnmodifiableView;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Represents an in-game bossbar which can be shown to the client.
@@ -53,6 +53,7 @@
  * @since 4.0.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface BossBar extends Examinable {
   /**
    * The minimum value the progress can be.
@@ -96,7 +97,7 @@ public interface BossBar extends Examinable {
    * @throws IllegalArgumentException if progress is less than 0 or greater than 1
    * @since 4.3.0
    */
-  static @NotNull BossBar bossBar(final @NotNull ComponentLike name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay) {
+  static BossBar bossBar(final ComponentLike name, final float progress, final Color color, final Overlay overlay) {
     BossBarImpl.checkProgress(progress);
     return bossBar(name.asComponent(), progress, color, overlay);
   }
@@ -112,7 +113,7 @@ public interface BossBar extends Examinable {
    * @throws IllegalArgumentException if progress is less than 0 or greater than 1
    * @since 4.0.0
    */
-  static @NotNull BossBar bossBar(final @NotNull Component name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay) {
+  static BossBar bossBar(final Component name, final float progress, final Color color, final Overlay overlay) {
     BossBarImpl.checkProgress(progress);
     return new BossBarImpl(name, progress, color, overlay);
   }
@@ -129,7 +130,7 @@ public interface BossBar extends Examinable {
    * @throws IllegalArgumentException if progress is less than 0 or greater than 1
    * @since 4.3.0
    */
-  static @NotNull BossBar bossBar(final @NotNull ComponentLike name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay, final @NotNull Set<Flag> flags) {
+  static BossBar bossBar(final ComponentLike name, final float progress, final Color color, final Overlay overlay, final Set<Flag> flags) {
     BossBarImpl.checkProgress(progress);
     return bossBar(name.asComponent(), progress, color, overlay, flags);
   }
@@ -146,7 +147,7 @@ public interface BossBar extends Examinable {
    * @throws IllegalArgumentException if progress is less than 0 or greater than 1
    * @since 4.0.0
    */
-  static @NotNull BossBar bossBar(final @NotNull Component name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay, final @NotNull Set<Flag> flags) {
+  static BossBar bossBar(final Component name, final float progress, final Color color, final Overlay overlay, final Set<Flag> flags) {
     BossBarImpl.checkProgress(progress);
     return new BossBarImpl(name, progress, color, overlay, flags);
   }
@@ -157,7 +158,7 @@ public interface BossBar extends Examinable {
    * @return the name
    * @since 4.0.0
    */
-  @NotNull Component name();
+  Component name();
 
   /**
    * Sets the name.
@@ -167,7 +168,7 @@ public interface BossBar extends Examinable {
    * @since 4.3.0
    */
   @Contract("_ -> this")
-  default @NotNull BossBar name(final @NotNull ComponentLike name) {
+  default BossBar name(final ComponentLike name) {
     return this.name(name.asComponent());
   }
 
@@ -179,7 +180,7 @@ public interface BossBar extends Examinable {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar name(final @NotNull Component name);
+  BossBar name(final Component name);
 
   /**
    * Gets the progress.
@@ -202,7 +203,7 @@ public interface BossBar extends Examinable {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar progress(final float progress);
+  BossBar progress(final float progress);
 
   /**
    * Gets the progress.
@@ -233,7 +234,7 @@ default float percent() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract("_ -> this")
   @Deprecated
-  default @NotNull BossBar percent(final float progress) {
+  default BossBar percent(final float progress) {
     return this.progress(progress);
   }
 
@@ -243,7 +244,7 @@ default float percent() {
    * @return the color
    * @since 4.0.0
    */
-  @NotNull Color color();
+  Color color();
 
   /**
    * Sets the color.
@@ -253,7 +254,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar color(final @NotNull Color color);
+  BossBar color(final Color color);
 
   /**
    * Gets the overlay.
@@ -261,7 +262,7 @@ default float percent() {
    * @return the overlay
    * @since 4.0.0
    */
-  @NotNull Overlay overlay();
+  Overlay overlay();
 
   /**
    * Sets the overlay.
@@ -271,7 +272,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar overlay(final @NotNull Overlay overlay);
+  BossBar overlay(final Overlay overlay);
 
   /**
    * Gets the flags.
@@ -279,7 +280,7 @@ default float percent() {
    * @return the flags
    * @since 4.0.0
    */
-  @UnmodifiableView @NotNull Set<Flag> flags();
+  @UnmodifiableView Set<Flag> flags();
 
   /**
    * Sets the flags.
@@ -289,7 +290,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar flags(final @NotNull Set<Flag> flags);
+  BossBar flags(final Set<Flag> flags);
 
   /**
    * Checks if this bossbar has a flag.
@@ -298,7 +299,7 @@ default float percent() {
    * @return {@code true} if this bossbar has the flag, {@code false} otherwise
    * @since 4.0.0
    */
-  boolean hasFlag(final @NotNull Flag flag);
+  boolean hasFlag(final Flag flag);
 
   /**
    * Adds a flag to this bossbar.
@@ -308,7 +309,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar addFlag(final @NotNull Flag flag);
+  BossBar addFlag(final Flag flag);
 
   /**
    * Removes a flag from this bossbar.
@@ -318,7 +319,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar removeFlag(final @NotNull Flag flag);
+  BossBar removeFlag(final Flag flag);
 
   /**
    * Adds flags to this bossbar.
@@ -328,7 +329,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar addFlags(final @NotNull Flag@NotNull... flags);
+  BossBar addFlags(final Flag... flags);
 
   /**
    * Removes flags from this bossbar.
@@ -338,7 +339,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar removeFlags(final @NotNull Flag@NotNull... flags);
+  BossBar removeFlags(final Flag... flags);
 
   /**
    * Adds flags to this bossbar.
@@ -348,7 +349,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar addFlags(final @NotNull Iterable<Flag> flags);
+  BossBar addFlags(final Iterable<Flag> flags);
 
   /**
    * Removes flags from this bossbar.
@@ -358,7 +359,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar removeFlags(final @NotNull Iterable<Flag> flags);
+  BossBar removeFlags(final Iterable<Flag> flags);
 
   /**
    * Adds a listener.
@@ -368,7 +369,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract(value = "_ -> this")
-  @NotNull BossBar addListener(final @NotNull Listener listener);
+  BossBar addListener(final Listener listener);
 
   /**
    * Removes a listener.
@@ -378,7 +379,7 @@ default float percent() {
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull BossBar removeListener(final @NotNull Listener listener);
+  BossBar removeListener(final Listener listener);
 
   /**
    * Gets an unmodifiable view of the viewers of this bossbar.
@@ -389,7 +390,7 @@ default float percent() {
    * @since 4.14.0
    */
   @UnmodifiableView
-  @NotNull Iterable<? extends BossBarViewer> viewers();
+  Iterable<? extends BossBarViewer> viewers();
 
   /**
    * Show this bossbar to {@code viewer}.
@@ -399,7 +400,7 @@ default float percent() {
    * @see Audience#showBossBar(BossBar)
    * @since 4.14.0
    */
-  default @NotNull BossBar addViewer(final @NotNull Audience viewer) {
+  default BossBar addViewer(final Audience viewer) {
     viewer.showBossBar(this);
     return this;
   }
@@ -412,7 +413,7 @@ default float percent() {
    * @see Audience#hideBossBar(BossBar)
    * @since 4.14.0
    */
-  default @NotNull BossBar removeViewer(final @NotNull Audience viewer) {
+  default BossBar removeViewer(final Audience viewer) {
     viewer.hideBossBar(this);
     return this;
   }
@@ -432,7 +433,7 @@ interface Listener {
      * @param newName the new name
      * @since 4.0.0
      */
-    default void bossBarNameChanged(final @NotNull BossBar bar, final @NotNull Component oldName, final @NotNull Component newName) {
+    default void bossBarNameChanged(final BossBar bar, final Component oldName, final Component newName) {
     }
 
     /**
@@ -443,7 +444,7 @@ default void bossBarNameChanged(final @NotNull BossBar bar, final @NotNull Compo
      * @param newProgress the new progress
      * @since 4.0.0
      */
-    default void bossBarProgressChanged(final @NotNull BossBar bar, final float oldProgress, final float newProgress) {
+    default void bossBarProgressChanged(final BossBar bar, final float oldProgress, final float newProgress) {
       this.bossBarPercentChanged(bar, oldProgress, newProgress);
     }
 
@@ -459,7 +460,7 @@ default void bossBarProgressChanged(final @NotNull BossBar bar, final float oldP
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
     @Deprecated
     @SuppressWarnings("DeprecatedIsStillUsed")
-    default void bossBarPercentChanged(final @NotNull BossBar bar, final float oldProgress, final float newProgress) {
+    default void bossBarPercentChanged(final BossBar bar, final float oldProgress, final float newProgress) {
     }
 
     /**
@@ -470,7 +471,7 @@ default void bossBarPercentChanged(final @NotNull BossBar bar, final float oldPr
      * @param newColor the new color
      * @since 4.0.0
      */
-    default void bossBarColorChanged(final @NotNull BossBar bar, final @NotNull Color oldColor, final @NotNull Color newColor) {
+    default void bossBarColorChanged(final BossBar bar, final Color oldColor, final Color newColor) {
     }
 
     /**
@@ -481,7 +482,7 @@ default void bossBarColorChanged(final @NotNull BossBar bar, final @NotNull Colo
      * @param newOverlay the new overlay
      * @since 4.0.0
      */
-    default void bossBarOverlayChanged(final @NotNull BossBar bar, final @NotNull Overlay oldOverlay, final @NotNull Overlay newOverlay) {
+    default void bossBarOverlayChanged(final BossBar bar, final Overlay oldOverlay, final Overlay newOverlay) {
     }
 
     /**
@@ -492,7 +493,7 @@ default void bossBarOverlayChanged(final @NotNull BossBar bar, final @NotNull Ov
      * @param flagsRemoved the flags removed from the bossbar
      * @since 4.0.0
      */
-    default void bossBarFlagsChanged(final @NotNull BossBar bar, final @NotNull Set<Flag> flagsAdded, final @NotNull Set<Flag> flagsRemoved) {
+    default void bossBarFlagsChanged(final BossBar bar, final Set<Flag> flagsAdded, final Set<Flag> flagsRemoved) {
     }
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/bossbar/BossBarImpl.java b/api/src/main/java/net/kyori/adventure/bossbar/BossBarImpl.java
index f460d4c576..649e685cd7 100644
--- a/api/src/main/java/net/kyori/adventure/bossbar/BossBarImpl.java
+++ b/api/src/main/java/net/kyori/adventure/bossbar/BossBarImpl.java
@@ -39,12 +39,13 @@
 import net.kyori.adventure.util.Services;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
 @SuppressWarnings("deprecation")
+@NullMarked
 final class BossBarImpl extends HackyBossBarPlatformBridge implements BossBar {
   private final List<Listener> listeners = new CopyOnWriteArrayList<>();
   private Component name;
@@ -63,7 +64,7 @@ private ImplementationAccessor() {
     }
 
     @SuppressWarnings("OptionalGetWithoutIsPresent")
-    static @NotNull <I extends BossBarImplementation> I get(final @NotNull BossBar bar, final @NotNull Class<I> type) {
+    static <I extends BossBarImplementation> I get(final BossBar bar, final Class<I> type) {
       @Nullable BossBarImplementation implementation = ((BossBarImpl) bar).implementation;
       if (implementation == null) {
         implementation = SERVICE.get().create(bar);
@@ -73,25 +74,25 @@ private ImplementationAccessor() {
     }
   }
 
-  BossBarImpl(final @NotNull Component name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay) {
+  BossBarImpl(final Component name, final float progress, final Color color, final Overlay overlay) {
     this.name = requireNonNull(name, "name");
     this.progress = progress;
     this.color = requireNonNull(color, "color");
     this.overlay = requireNonNull(overlay, "overlay");
   }
 
-  BossBarImpl(final @NotNull Component name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay, final @NotNull Set<Flag> flags) {
+  BossBarImpl(final Component name, final float progress, final Color color, final Overlay overlay, final Set<Flag> flags) {
     this(name, progress, color, overlay);
     this.flags.addAll(flags);
   }
 
   @Override
-  public @NotNull Component name() {
+  public Component name() {
     return this.name;
   }
 
   @Override
-  public @NotNull BossBar name(final @NotNull Component newName) {
+  public BossBar name(final Component newName) {
     requireNonNull(newName, "name");
     final Component oldName = this.name;
     if (!Objects.equals(newName, oldName)) {
@@ -107,7 +108,7 @@ public float progress() {
   }
 
   @Override
-  public @NotNull BossBar progress(final float newProgress) {
+  public BossBar progress(final float newProgress) {
     checkProgress(newProgress);
     final float oldProgress = this.progress;
     if (newProgress != oldProgress) {
@@ -124,12 +125,12 @@ static void checkProgress(final float progress) {
   }
 
   @Override
-  public @NotNull Color color() {
+  public Color color() {
     return this.color;
   }
 
   @Override
-  public @NotNull BossBar color(final @NotNull Color newColor) {
+  public BossBar color(final Color newColor) {
     requireNonNull(newColor, "color");
     final Color oldColor = this.color;
     if (newColor != oldColor) {
@@ -140,12 +141,12 @@ static void checkProgress(final float progress) {
   }
 
   @Override
-  public @NotNull Overlay overlay() {
+  public Overlay overlay() {
     return this.overlay;
   }
 
   @Override
-  public @NotNull BossBar overlay(final @NotNull Overlay newOverlay) {
+  public BossBar overlay(final Overlay newOverlay) {
     requireNonNull(newOverlay, "overlay");
     final Overlay oldOverlay = this.overlay;
     if (newOverlay != oldOverlay) {
@@ -156,12 +157,12 @@ static void checkProgress(final float progress) {
   }
 
   @Override
-  public @NotNull Set<Flag> flags() {
+  public Set<Flag> flags() {
     return Collections.unmodifiableSet(this.flags);
   }
 
   @Override
-  public @NotNull BossBar flags(final @NotNull Set<Flag> newFlags) {
+  public BossBar flags(final Set<Flag> newFlags) {
     if (newFlags.isEmpty()) {
       final Set<Flag> oldFlags = EnumSet.copyOf(this.flags);
       this.flags.clear();
@@ -180,21 +181,21 @@ static void checkProgress(final float progress) {
   }
 
   @Override
-  public boolean hasFlag(final @NotNull Flag flag) {
+  public boolean hasFlag(final Flag flag) {
     return this.flags.contains(flag);
   }
 
   @Override
-  public @NotNull BossBar addFlag(final @NotNull Flag flag) {
+  public BossBar addFlag(final Flag flag) {
     return this.editFlags(flag, Set::add, BossBarImpl::onFlagsAdded);
   }
 
   @Override
-  public @NotNull BossBar removeFlag(final @NotNull Flag flag) {
+  public BossBar removeFlag(final Flag flag) {
     return this.editFlags(flag, Set::remove, BossBarImpl::onFlagsRemoved);
   }
 
-  private @NotNull BossBar editFlags(final @NotNull Flag flag, final @NotNull BiPredicate<Set<Flag>, Flag> predicate, final BiConsumer<BossBarImpl, Set<Flag>> onChange) {
+  private BossBar editFlags(final Flag flag, final BiPredicate<Set<Flag>, Flag> predicate, final BiConsumer<BossBarImpl, Set<Flag>> onChange) {
     if (predicate.test(this.flags, flag)) {
       onChange.accept(this, Collections.singleton(flag));
     }
@@ -202,16 +203,16 @@ public boolean hasFlag(final @NotNull Flag flag) {
   }
 
   @Override
-  public @NotNull BossBar addFlags(final @NotNull Flag@NotNull... flags) {
+  public BossBar addFlags(final Flag... flags) {
     return this.editFlags(flags, Set::add, BossBarImpl::onFlagsAdded);
   }
 
   @Override
-  public @NotNull BossBar removeFlags(final @NotNull Flag@NotNull... flags) {
+  public BossBar removeFlags(final Flag... flags) {
     return this.editFlags(flags, Set::remove, BossBarImpl::onFlagsRemoved);
   }
 
-  private @NotNull BossBar editFlags(final Flag[] flags, final BiPredicate<Set<Flag>, Flag> predicate, final BiConsumer<BossBarImpl, Set<Flag>> onChange) {
+  private BossBar editFlags(final Flag[] flags, final BiPredicate<Set<Flag>, Flag> predicate, final BiConsumer<BossBarImpl, Set<Flag>> onChange) {
     if (flags.length == 0) return this;
     Set<Flag> changes = null;
     for (int i = 0, length = flags.length; i < length; i++) {
@@ -229,16 +230,16 @@ public boolean hasFlag(final @NotNull Flag flag) {
   }
 
   @Override
-  public @NotNull BossBar addFlags(final @NotNull Iterable<Flag> flags) {
+  public BossBar addFlags(final Iterable<Flag> flags) {
     return this.editFlags(flags, Set::add, BossBarImpl::onFlagsAdded);
   }
 
   @Override
-  public @NotNull BossBar removeFlags(final @NotNull Iterable<Flag> flags) {
+  public BossBar removeFlags(final Iterable<Flag> flags) {
     return this.editFlags(flags, Set::remove, BossBarImpl::onFlagsRemoved);
   }
 
-  private @NotNull BossBar editFlags(final Iterable<Flag> flags, final BiPredicate<Set<Flag>, Flag> predicate, final BiConsumer<BossBarImpl, Set<Flag>> onChange) {
+  private BossBar editFlags(final Iterable<Flag> flags, final BiPredicate<Set<Flag>, Flag> predicate, final BiConsumer<BossBarImpl, Set<Flag>> onChange) {
     Set<Flag> changes = null;
     for (final Flag flag : flags) {
       if (predicate.test(this.flags, flag)) {
@@ -255,26 +256,26 @@ public boolean hasFlag(final @NotNull Flag flag) {
   }
 
   @Override
-  public @NotNull BossBar addListener(final @NotNull Listener listener) {
+  public BossBar addListener(final Listener listener) {
     this.listeners.add(listener);
     return this;
   }
 
   @Override
-  public @NotNull BossBar removeListener(final @NotNull Listener listener) {
+  public BossBar removeListener(final Listener listener) {
     this.listeners.remove(listener);
     return this;
   }
 
   @Override
-  public @NotNull Iterable<? extends BossBarViewer> viewers() {
+  public Iterable<? extends BossBarViewer> viewers() {
     if (this.implementation != null) {
       return this.implementation.viewers();
     }
     return Collections.emptyList();
   }
 
-  private void forEachListener(final @NotNull Consumer<Listener> consumer) {
+  private void forEachListener(final Consumer<Listener> consumer) {
     for (final Listener listener : this.listeners) {
       consumer.accept(listener);
     }
@@ -289,7 +290,7 @@ private static void onFlagsRemoved(final BossBarImpl bar, final Set<Flag> flagsR
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("name", this.name),
       ExaminableProperty.of("progress", this.progress),
diff --git a/api/src/main/java/net/kyori/adventure/bossbar/BossBarImplementation.java b/api/src/main/java/net/kyori/adventure/bossbar/BossBarImplementation.java
index 3a3428ba75..d9113a9f06 100644
--- a/api/src/main/java/net/kyori/adventure/bossbar/BossBarImplementation.java
+++ b/api/src/main/java/net/kyori/adventure/bossbar/BossBarImplementation.java
@@ -25,7 +25,7 @@
 
 import java.util.Collections;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * {@link BossBar} internal implementation.
@@ -33,6 +33,7 @@
  * @since 4.12.0
  */
 @ApiStatus.Internal
+@NullMarked
 public interface BossBarImplementation {
   /**
    * Gets an implementation, and casts it to {@code type}.
@@ -44,7 +45,7 @@ public interface BossBarImplementation {
    * @since 4.12.0
    */
   @ApiStatus.Internal
-  static <I extends BossBarImplementation> @NotNull I get(final @NotNull BossBar bar, final @NotNull Class<I> type) {
+  static <I extends BossBarImplementation> I get(final BossBar bar, final Class<I> type) {
     return BossBarImpl.ImplementationAccessor.get(bar, type);
   }
 
@@ -55,7 +56,7 @@ public interface BossBarImplementation {
    * @since 4.14.0
    */
   @ApiStatus.Internal
-  default @NotNull Iterable<? extends BossBarViewer> viewers() {
+  default Iterable<? extends BossBarViewer> viewers() {
     return Collections.emptyList();
   }
 
@@ -74,6 +75,6 @@ interface Provider {
      * @since 4.12.0
      */
     @ApiStatus.Internal
-    @NotNull BossBarImplementation create(final @NotNull BossBar bar);
+    BossBarImplementation create(final BossBar bar);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/bossbar/BossBarViewer.java b/api/src/main/java/net/kyori/adventure/bossbar/BossBarViewer.java
index ffb5a98d53..0382f22629 100644
--- a/api/src/main/java/net/kyori/adventure/bossbar/BossBarViewer.java
+++ b/api/src/main/java/net/kyori/adventure/bossbar/BossBarViewer.java
@@ -23,14 +23,15 @@
  */
 package net.kyori.adventure.bossbar;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.UnmodifiableView;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that can view a {@link BossBar}.
  *
  * @since 4.14.0
  */
+@NullMarked
 public interface BossBarViewer {
   /**
    * Gets an unmodifiable view of all known currently active bossbars.
@@ -39,5 +40,5 @@ public interface BossBarViewer {
    * @since 4.14.0
    */
   @UnmodifiableView
-  @NotNull Iterable<? extends BossBar> activeBossBars();
+  Iterable<? extends BossBar> activeBossBars();
 }
diff --git a/api/src/main/java/net/kyori/adventure/builder/AbstractBuilder.java b/api/src/main/java/net/kyori/adventure/builder/AbstractBuilder.java
index cecf2e7259..7d4d9fee05 100644
--- a/api/src/main/java/net/kyori/adventure/builder/AbstractBuilder.java
+++ b/api/src/main/java/net/kyori/adventure/builder/AbstractBuilder.java
@@ -25,8 +25,8 @@
 
 import java.util.function.Consumer;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A builder.
@@ -35,6 +35,7 @@
  * @since 4.10.0
  */
 @FunctionalInterface
+@NullMarked
 public interface AbstractBuilder<R> {
   /**
    * Configures {@code builder} using {@code consumer} and then builds.
@@ -47,7 +48,7 @@ public interface AbstractBuilder<R> {
    * @since 4.10.0
    */
   @Contract(mutates = "param1")
-  static <R, B extends AbstractBuilder<R>> @NotNull R configureAndBuild(final @NotNull B builder, final @Nullable Consumer<? super B> consumer) {
+  static <R, B extends AbstractBuilder<R>> R configureAndBuild(final B builder, final @Nullable Consumer<? super B> consumer) {
     if (consumer != null) {
       consumer.accept(builder);
     }
@@ -61,5 +62,5 @@ public interface AbstractBuilder<R> {
    * @since 4.10.0
    */
   @Contract(value = "-> new", pure = true)
-  @NotNull R build();
+  R build();
 }
diff --git a/api/src/main/java/net/kyori/adventure/chat/ChatType.java b/api/src/main/java/net/kyori/adventure/chat/ChatType.java
index 8d93477373..fe37224ea3 100644
--- a/api/src/main/java/net/kyori/adventure/chat/ChatType.java
+++ b/api/src/main/java/net/kyori/adventure/chat/ChatType.java
@@ -31,8 +31,8 @@
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -42,6 +42,7 @@
  * @since 4.12.0
  * @sinceMinecraft 1.19
  */
+@NullMarked
 public interface ChatType extends Examinable, Keyed {
   /**
    * A chat message from a player.
@@ -106,7 +107,7 @@ public interface ChatType extends Examinable, Keyed {
    * @return the chat type
    * @since 4.12.0
    */
-  static @NotNull ChatType chatType(final @NotNull Keyed key) {
+  static ChatType chatType(final Keyed key) {
     return key instanceof ChatType ? (ChatType) key : new ChatTypeImpl(requireNonNull(key, "key").key());
   }
 
@@ -119,7 +120,7 @@ public interface ChatType extends Examinable, Keyed {
    * @sinceMinecraft 1.19
    */
   @Contract(value = "_ -> new", pure = true)
-  default ChatType.@NotNull Bound bind(final @NotNull ComponentLike name) {
+  default ChatType.Bound bind(final ComponentLike name) {
     return this.bind(name, null);
   }
 
@@ -133,12 +134,12 @@ public interface ChatType extends Examinable, Keyed {
    * @sinceMinecraft 1.19
    */
   @Contract(value = "_, _ -> new", pure = true)
-  default ChatType.@NotNull Bound bind(final @NotNull ComponentLike name, final @Nullable ComponentLike target) {
+  default ChatType.Bound bind(final ComponentLike name, final @Nullable ComponentLike target) {
     return new ChatTypeImpl.BoundImpl(this, requireNonNull(name.asComponent(), "name"), ComponentLike.unbox(target));
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("key", this.key()));
   }
 
@@ -158,7 +159,7 @@ interface Bound extends Examinable {
      * @sinceMinecraft 1.19
      */
     @Contract(pure = true)
-    @NotNull ChatType type();
+    ChatType type();
 
     /**
      * Get the name component.
@@ -168,7 +169,7 @@ interface Bound extends Examinable {
      * @sinceMinecraft 1.19
      */
     @Contract(pure = true)
-    @NotNull Component name();
+    Component name();
 
     /**
      * Get the target component.
@@ -181,7 +182,7 @@ interface Bound extends Examinable {
     @Nullable Component target();
 
     @Override
-    default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    default Stream<? extends ExaminableProperty> examinableProperties() {
       return Stream.of(
         ExaminableProperty.of("type", this.type()),
         ExaminableProperty.of("name", this.name()),
diff --git a/api/src/main/java/net/kyori/adventure/chat/ChatTypeImpl.java b/api/src/main/java/net/kyori/adventure/chat/ChatTypeImpl.java
index bed3c2dde8..9605525b45 100644
--- a/api/src/main/java/net/kyori/adventure/chat/ChatTypeImpl.java
+++ b/api/src/main/java/net/kyori/adventure/chat/ChatTypeImpl.java
@@ -26,18 +26,19 @@
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class ChatTypeImpl implements ChatType {
   private final Key key;
 
-  ChatTypeImpl(final @NotNull Key key) {
+  ChatTypeImpl(final Key key) {
     this.key = key;
   }
 
   @Override
-  public @NotNull Key key() {
+  public Key key() {
     return this.key;
   }
 
@@ -58,12 +59,12 @@ static final class BoundImpl implements ChatType.Bound {
     }
 
     @Override
-    public @NotNull ChatType type() {
+    public ChatType type() {
       return this.chatType;
     }
 
     @Override
-    public @NotNull Component name() {
+    public Component name() {
       return this.name;
     }
 
diff --git a/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java b/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java
index 96d9316920..7bc6a2e5f4 100644
--- a/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java
+++ b/api/src/main/java/net/kyori/adventure/chat/SignedMessage.java
@@ -33,8 +33,8 @@
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A signed chat message.
@@ -43,6 +43,7 @@
  * @sinceMinecraft 1.19
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface SignedMessage extends Identified, Examinable {
 
   /**
@@ -54,7 +55,7 @@ public interface SignedMessage extends Identified, Examinable {
    * @sinceMinecraft 1.19
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull Signature signature(final byte[] signature) {
+  static Signature signature(final byte[] signature) {
     return new SignedMessageImpl.SignatureImpl(signature);
   }
 
@@ -68,7 +69,7 @@ public interface SignedMessage extends Identified, Examinable {
    * @sinceMinecraft 1.19
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull SignedMessage system(final @NotNull String message, final @Nullable ComponentLike unsignedContent) {
+  static SignedMessage system(final String message, final @Nullable ComponentLike unsignedContent) {
     return new SignedMessageImpl(message, ComponentLike.unbox(unsignedContent));
   }
 
@@ -80,7 +81,7 @@ public interface SignedMessage extends Identified, Examinable {
    * @sinceMinecraft 1.19
    */
   @Contract(pure = true)
-  @NotNull Instant timestamp();
+  Instant timestamp();
 
   /**
    * The salt.
@@ -120,7 +121,7 @@ public interface SignedMessage extends Identified, Examinable {
    * @sinceMinecraft 1.19
    */
   @Contract(pure = true)
-  @NotNull String message();
+  String message();
 
   /**
    * Checks if this message is a system message.
@@ -147,7 +148,7 @@ default boolean canDelete() {
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("timestamp", this.timestamp()),
       ExaminableProperty.of("salt", this.salt()),
@@ -177,7 +178,7 @@ interface Signature extends Examinable {
     byte[] bytes();
 
     @Override
-    default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    default Stream<? extends ExaminableProperty> examinableProperties() {
       return Stream.of(ExaminableProperty.of("bytes", this.bytes()));
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/chat/SignedMessageImpl.java b/api/src/main/java/net/kyori/adventure/chat/SignedMessageImpl.java
index 98e1b87648..73f6f20b94 100644
--- a/api/src/main/java/net/kyori/adventure/chat/SignedMessageImpl.java
+++ b/api/src/main/java/net/kyori/adventure/chat/SignedMessageImpl.java
@@ -27,10 +27,11 @@
 import java.time.Instant;
 import net.kyori.adventure.identity.Identity;
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 // Used for system messages ONLY
+@NullMarked
 final class SignedMessageImpl implements SignedMessage {
   static final SecureRandom RANDOM = new SecureRandom();
 
@@ -47,7 +48,7 @@ final class SignedMessageImpl implements SignedMessage {
   }
 
   @Override
-  public @NotNull Instant timestamp() {
+  public Instant timestamp() {
     return this.instant;
   }
 
@@ -67,12 +68,12 @@ public Signature signature() {
   }
 
   @Override
-  public @NotNull String message() {
+  public String message() {
     return this.message;
   }
 
   @Override
-  public @NotNull Identity identity() {
+  public Identity identity() {
     return Identity.nil();
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/identity/Identified.java b/api/src/main/java/net/kyori/adventure/identity/Identified.java
index 5f2f186fbb..8efeeba2e1 100644
--- a/api/src/main/java/net/kyori/adventure/identity/Identified.java
+++ b/api/src/main/java/net/kyori/adventure/identity/Identified.java
@@ -23,13 +23,14 @@
  */
 package net.kyori.adventure.identity;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that can be identified by an {@link Identity}.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface Identified {
   /**
    * Gets the identity.
@@ -37,5 +38,5 @@ public interface Identified {
    * @return the identity
    * @since 4.0.0
    */
-  @NotNull Identity identity();
+  Identity identity();
 }
diff --git a/api/src/main/java/net/kyori/adventure/identity/Identity.java b/api/src/main/java/net/kyori/adventure/identity/Identity.java
index 433eb10ce8..7cc1239f25 100644
--- a/api/src/main/java/net/kyori/adventure/identity/Identity.java
+++ b/api/src/main/java/net/kyori/adventure/identity/Identity.java
@@ -32,7 +32,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An identity used to track the sender of messages for the social interaction features
@@ -41,6 +41,7 @@
  * @since 4.0.0
  * @sinceMinecraft 1.16
  */
+@NullMarked
 public interface Identity extends Examinable, Identified {
   /**
    * A pointer to a name.
@@ -75,7 +76,7 @@ public interface Identity extends Examinable, Identified {
    * @return the {@code null} identity
    * @since 4.0.0
    */
-  static @NotNull Identity nil() {
+  static Identity nil() {
     return NilIdentity.INSTANCE;
   }
 
@@ -86,7 +87,7 @@ public interface Identity extends Examinable, Identified {
    * @return an identity
    * @since 4.0.0
    */
-  static @NotNull Identity identity(final @NotNull UUID uuid) {
+  static Identity identity(final UUID uuid) {
     if (uuid.equals(NilIdentity.NIL_UUID)) return NilIdentity.INSTANCE;
     return new IdentityImpl(uuid);
   }
@@ -97,15 +98,15 @@ public interface Identity extends Examinable, Identified {
    * @return the uuid
    * @since 4.0.0
    */
-  @NotNull UUID uuid();
+  UUID uuid();
 
   @Override
-  default @NotNull Identity identity() {
+  default Identity identity() {
     return this;
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("uuid", this.uuid()));
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/identity/IdentityImpl.java b/api/src/main/java/net/kyori/adventure/identity/IdentityImpl.java
index a7a10d969e..f110a13db5 100644
--- a/api/src/main/java/net/kyori/adventure/identity/IdentityImpl.java
+++ b/api/src/main/java/net/kyori/adventure/identity/IdentityImpl.java
@@ -26,9 +26,10 @@
 import java.util.UUID;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.examination.Examinable;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class IdentityImpl implements Examinable, Identity {
   private final UUID uuid;
 
@@ -37,7 +38,7 @@ final class IdentityImpl implements Examinable, Identity {
   }
 
   @Override
-  public @NotNull UUID uuid() {
+  public UUID uuid() {
     return this.uuid;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/identity/NilIdentity.java b/api/src/main/java/net/kyori/adventure/identity/NilIdentity.java
index 1fe26b3550..887209d5ea 100644
--- a/api/src/main/java/net/kyori/adventure/identity/NilIdentity.java
+++ b/api/src/main/java/net/kyori/adventure/identity/NilIdentity.java
@@ -24,15 +24,16 @@
 package net.kyori.adventure.identity;
 
 import java.util.UUID;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class NilIdentity implements Identity {
   static final UUID NIL_UUID = new UUID(0, 0);
   static final Identity INSTANCE = new NilIdentity();
 
   @Override
-  public @NotNull UUID uuid() {
+  public UUID uuid() {
     return NIL_UUID;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/internal/Internals.java b/api/src/main/java/net/kyori/adventure/internal/Internals.java
index 9dc0246191..69bf600757 100644
--- a/api/src/main/java/net/kyori/adventure/internal/Internals.java
+++ b/api/src/main/java/net/kyori/adventure/internal/Internals.java
@@ -26,12 +26,13 @@
 import net.kyori.examination.Examinable;
 import net.kyori.examination.string.StringExaminer;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Utilities internal to Adventure.
  */
 @ApiStatus.Internal
+@NullMarked
 public final class Internals {
   private Internals() {
   }
@@ -43,7 +44,7 @@ private Internals() {
    * @return the result from examining
    * @since 4.10.0
    */
-  public static @NotNull String toString(final @NotNull Examinable examinable) {
+  public static String toString(final Examinable examinable) {
     return examinable.examine(StringExaminer.simpleEscaping());
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/internal/properties/AdventureProperties.java b/api/src/main/java/net/kyori/adventure/internal/properties/AdventureProperties.java
index fb27ab9115..32307701fd 100644
--- a/api/src/main/java/net/kyori/adventure/internal/properties/AdventureProperties.java
+++ b/api/src/main/java/net/kyori/adventure/internal/properties/AdventureProperties.java
@@ -25,8 +25,8 @@
 
 import java.util.function.Function;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Adventure properties.
@@ -34,6 +34,7 @@
  * @since 4.10.0
  */
 @ApiStatus.Internal
+@NullMarked
 public final class AdventureProperties {
   /**
    * Property for specifying whether debug mode is enabled.
@@ -73,7 +74,7 @@ private AdventureProperties() {
    * @return a property
    * @since 4.10.0
    */
-  public static <T> @NotNull Property<T> property(final @NotNull String name, final @NotNull Function<String, T> parser, final @Nullable T defaultValue) {
+  public static <T> Property<T> property(final String name, final Function<String, T> parser, final @Nullable T defaultValue) {
     return AdventurePropertiesImpl.property(name, parser, defaultValue);
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/internal/properties/AdventurePropertiesImpl.java b/api/src/main/java/net/kyori/adventure/internal/properties/AdventurePropertiesImpl.java
index a279efcac9..6006e2a8ff 100644
--- a/api/src/main/java/net/kyori/adventure/internal/properties/AdventurePropertiesImpl.java
+++ b/api/src/main/java/net/kyori/adventure/internal/properties/AdventurePropertiesImpl.java
@@ -31,10 +31,11 @@
 import java.util.Optional;
 import java.util.Properties;
 import java.util.function.Function;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class AdventurePropertiesImpl {
   private static final String FILESYSTEM_DIRECTORY_NAME = "config";
   private static final String FILESYSTEM_FILE_NAME = "adventure.properties";
@@ -63,11 +64,11 @@ private AdventurePropertiesImpl() {
   }
 
   @VisibleForTesting
-  static @NotNull String systemPropertyName(final String name) {
+  static String systemPropertyName(final String name) {
     return String.join(".", "net", "kyori", "adventure", name);
   }
 
-  static <T> AdventureProperties.@NotNull Property<T> property(final @NotNull String name, final @NotNull Function<String, T> parser, final @Nullable T defaultValue) {
+  static <T> AdventureProperties.Property<T> property(final String name, final Function<String, T> parser, final @Nullable T defaultValue) {
     return new PropertyImpl<>(name, parser, defaultValue);
   }
 
@@ -78,7 +79,7 @@ private static final class PropertyImpl<T> implements AdventureProperties.Proper
     private boolean valueCalculated;
     private @Nullable T value;
 
-    PropertyImpl(final @NotNull String name, final @NotNull Function<String, T> parser, final @Nullable T defaultValue) {
+    PropertyImpl(final String name, final Function<String, T> parser, final @Nullable T defaultValue) {
       this.name = name;
       this.parser = parser;
       this.defaultValue = defaultValue;
diff --git a/api/src/main/java/net/kyori/adventure/inventory/Book.java b/api/src/main/java/net/kyori/adventure/inventory/Book.java
index 98c60fd7b1..096c0ad0fc 100644
--- a/api/src/main/java/net/kyori/adventure/inventory/Book.java
+++ b/api/src/main/java/net/kyori/adventure/inventory/Book.java
@@ -34,8 +34,8 @@
 import net.kyori.examination.Examinable;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Represents the in-game interface of a book.
@@ -48,6 +48,7 @@
  * @since 4.0.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface Book extends Buildable<Book, Book.Builder>, Examinable {
   /**
    * Creates a book.
@@ -58,7 +59,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @return a book
    * @since 4.0.0
    */
-  static @NotNull Book book(final @NotNull Component title, final @NotNull Component author, final @NotNull Collection<Component> pages) {
+  static Book book(final Component title, final Component author, final Collection<Component> pages) {
     return new BookImpl(title, author, new ArrayList<>(pages));
   }
 
@@ -71,7 +72,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @return a book
    * @since 4.0.0
    */
-  static @NotNull Book book(final @NotNull Component title, final @NotNull Component author, final @NotNull Component@NotNull... pages) {
+  static Book book(final Component title, final Component author, final Component... pages) {
     return book(title, author, Arrays.asList(pages));
   }
 
@@ -81,7 +82,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @return a builder
    * @since 4.0.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new BookImpl.BuilderImpl();
   }
 
@@ -91,7 +92,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @return the title
    * @since 4.0.0
    */
-  @NotNull Component title();
+  Component title();
 
   /**
    * Changes the book's title.
@@ -101,7 +102,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  @NotNull Book title(final @NotNull Component title);
+  Book title(final Component title);
 
   /**
    * Gets the author.
@@ -109,7 +110,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @return the author
    * @since 4.0.0
    */
-  @NotNull Component author();
+  Component author();
 
   /**
    * Changes the book's author.
@@ -119,7 +120,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  @NotNull Book author(final @NotNull Component author);
+  Book author(final Component author);
 
   /**
    * Gets the list of pages.
@@ -129,7 +130,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @return the list of pages
    * @since 4.0.0
    */
-  @Unmodifiable @NotNull List<Component> pages();
+  @Unmodifiable List<Component> pages();
 
   /**
    * Returns an updated book with the provided pages.
@@ -139,7 +140,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  default @NotNull Book pages(final @NotNull Component@NotNull... pages) {
+  default Book pages(final Component... pages) {
     return this.pages(Arrays.asList(pages));
   }
 
@@ -151,7 +152,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  @NotNull Book pages(final @NotNull List<Component> pages);
+  Book pages(final List<Component> pages);
 
   /**
    * Create a new builder initialized with the attributes of this book.
@@ -159,7 +160,7 @@ public interface Book extends Buildable<Book, Book.Builder>, Examinable {
    * @return the builder
    */
   @Override
-  default @NotNull Builder toBuilder() {
+  default Builder toBuilder() {
     return builder()
       .title(this.title())
       .author(this.author())
@@ -180,7 +181,7 @@ interface Builder extends AbstractBuilder<Book>, Buildable.Builder<Book> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder title(final @NotNull Component title);
+    Builder title(final Component title);
 
     /**
      * Set the author.
@@ -190,7 +191,7 @@ interface Builder extends AbstractBuilder<Book>, Buildable.Builder<Book> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder author(final @NotNull Component author);
+    Builder author(final Component author);
 
     /**
      * Add a page to the book.
@@ -203,7 +204,7 @@ interface Builder extends AbstractBuilder<Book>, Buildable.Builder<Book> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder addPage(final @NotNull Component page);
+    Builder addPage(final Component page);
 
     /**
      * Add pages to the book.
@@ -214,7 +215,7 @@ interface Builder extends AbstractBuilder<Book>, Buildable.Builder<Book> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder pages(final @NotNull Component@NotNull... pages);
+    Builder pages(final Component... pages);
 
     /**
      * Add pages to the book.
@@ -225,7 +226,7 @@ interface Builder extends AbstractBuilder<Book>, Buildable.Builder<Book> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder pages(final @NotNull Collection<Component> pages);
+    Builder pages(final Collection<Component> pages);
 
     /**
      * Builds.
@@ -233,6 +234,6 @@ interface Builder extends AbstractBuilder<Book>, Buildable.Builder<Book> {
      * @return a new book
      */
     @Override
-    @NotNull Book build();
+    Book build();
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/inventory/BookImpl.java b/api/src/main/java/net/kyori/adventure/inventory/BookImpl.java
index a8650cb2a4..ec62637ca7 100644
--- a/api/src/main/java/net/kyori/adventure/inventory/BookImpl.java
+++ b/api/src/main/java/net/kyori/adventure/inventory/BookImpl.java
@@ -31,53 +31,54 @@
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.text.Component;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class BookImpl implements Book {
   private final Component title;
   private final Component author;
   private final List<Component> pages;
 
-  BookImpl(final @NotNull Component title, final @NotNull Component author, final @NotNull List<Component> pages) {
+  BookImpl(final Component title, final Component author, final List<Component> pages) {
     this.title = requireNonNull(title, "title");
     this.author = requireNonNull(author, "author");
     this.pages = Collections.unmodifiableList(requireNonNull(pages, "pages"));
   }
 
   @Override
-  public @NotNull Component title() {
+  public Component title() {
     return this.title;
   }
 
   @Override
-  public @NotNull Book title(final @NotNull Component title) {
+  public Book title(final Component title) {
     return new BookImpl(requireNonNull(title, "title"), this.author, this.pages);
   }
 
   @Override
-  public @NotNull Component author() {
+  public Component author() {
     return this.author;
   }
 
   @Override
-  public @NotNull Book author(final @NotNull Component author) {
+  public Book author(final Component author) {
     return new BookImpl(this.title, requireNonNull(author, "author"), this.pages);
   }
 
   @Override
-  public @NotNull List<Component> pages() {
+  public List<Component> pages() {
     return this.pages;
   }
 
   @Override
-  public @NotNull Book pages(final @NotNull List<Component> pages) {
+  public Book pages(final List<Component> pages) {
     return new BookImpl(this.title, this.author, new ArrayList<>(requireNonNull(pages, "pages")));
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("title", this.title),
       ExaminableProperty.of("author", this.author),
@@ -114,37 +115,37 @@ static final class BuilderImpl implements Book.Builder {
     private final List<Component> pages = new ArrayList<>();
 
     @Override
-    public @NotNull Builder title(final @NotNull Component title) {
+    public Builder title(final Component title) {
       this.title = requireNonNull(title, "title");
       return this;
     }
 
     @Override
-    public @NotNull Builder author(final @NotNull Component author) {
+    public Builder author(final Component author) {
       this.author = requireNonNull(author, "author");
       return this;
     }
 
     @Override
-    public @NotNull Builder addPage(final @NotNull Component page) {
+    public Builder addPage(final Component page) {
       this.pages.add(requireNonNull(page, "page"));
       return this;
     }
 
     @Override
-    public @NotNull Builder pages(final @NotNull Collection<Component> pages) {
+    public Builder pages(final Collection<Component> pages) {
       this.pages.addAll(requireNonNull(pages, "pages"));
       return this;
     }
 
     @Override
-    public @NotNull Builder pages(final @NotNull Component@NotNull... pages) {
+    public Builder pages(final Component... pages) {
       Collections.addAll(this.pages, pages);
       return this;
     }
 
     @Override
-    public @NotNull Book build() {
+    public Book build() {
       return new BookImpl(this.title, this.author, new ArrayList<>(this.pages));
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/nbt/api/BinaryTagHolder.java b/api/src/main/java/net/kyori/adventure/nbt/api/BinaryTagHolder.java
index 798943eabc..25b79a3b91 100644
--- a/api/src/main/java/net/kyori/adventure/nbt/api/BinaryTagHolder.java
+++ b/api/src/main/java/net/kyori/adventure/nbt/api/BinaryTagHolder.java
@@ -25,7 +25,7 @@
 
 import net.kyori.adventure.util.Codec;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds a compound binary tag.
@@ -37,6 +37,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface BinaryTagHolder {
   /**
    * Encodes {@code nbt} using {@code codec}.
@@ -49,7 +50,7 @@ public interface BinaryTagHolder {
    * @throws EX if an error occurred while encoding the binary tag
    * @since 4.0.0
    */
-  static <T, EX extends Exception> @NotNull BinaryTagHolder encode(final @NotNull T nbt, final @NotNull Codec<? super T, String, ?, EX> codec) throws EX {
+  static <T, EX extends Exception> BinaryTagHolder encode(final T nbt, final Codec<? super T, String, ?, EX> codec) throws EX {
     return new BinaryTagHolderImpl(codec.encode(nbt));
   }
 
@@ -60,7 +61,7 @@ public interface BinaryTagHolder {
    * @return the encoded binary tag
    * @since 4.10.0
    */
-  static @NotNull BinaryTagHolder binaryTagHolder(final @NotNull String string) {
+  static BinaryTagHolder binaryTagHolder(final String string) {
     return new BinaryTagHolderImpl(string);
   }
 
@@ -74,7 +75,7 @@ public interface BinaryTagHolder {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull BinaryTagHolder of(final @NotNull String string) {
+  static BinaryTagHolder of(final String string) {
     return new BinaryTagHolderImpl(string);
   }
 
@@ -84,7 +85,7 @@ public interface BinaryTagHolder {
    * @return the raw string value
    * @since 4.0.0
    */
-  @NotNull String string();
+  String string();
 
   /**
    * Gets the held value as a binary tag.
@@ -96,5 +97,5 @@ public interface BinaryTagHolder {
    * @throws DX if an error occurred while retrieving the binary tag
    * @since 4.0.0
    */
-  <T, DX extends Exception> @NotNull T get(final @NotNull Codec<T, String, DX, ?> codec) throws DX;
+  <T, DX extends Exception> T get(final Codec<T, String, DX, ?> codec) throws DX;
 }
diff --git a/api/src/main/java/net/kyori/adventure/nbt/api/BinaryTagHolderImpl.java b/api/src/main/java/net/kyori/adventure/nbt/api/BinaryTagHolderImpl.java
index 7223cdc87a..f7443e16e6 100644
--- a/api/src/main/java/net/kyori/adventure/nbt/api/BinaryTagHolderImpl.java
+++ b/api/src/main/java/net/kyori/adventure/nbt/api/BinaryTagHolderImpl.java
@@ -24,10 +24,11 @@
 package net.kyori.adventure.nbt.api;
 
 import net.kyori.adventure.util.Codec;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class BinaryTagHolderImpl implements BinaryTagHolder {
   private final String string;
 
@@ -36,12 +37,12 @@ final class BinaryTagHolderImpl implements BinaryTagHolder {
   }
 
   @Override
-  public @NotNull String string() {
+  public String string() {
     return this.string;
   }
 
   @Override
-  public <T, DX extends Exception> @NotNull T get(final @NotNull Codec<T, String, DX, ?> codec) throws DX {
+  public <T, DX extends Exception> T get(final Codec<T, String, DX, ?> codec) throws DX {
     return codec.decode(this.string);
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/permission/PermissionChecker.java b/api/src/main/java/net/kyori/adventure/permission/PermissionChecker.java
index 58338bf750..20eed2ee5c 100644
--- a/api/src/main/java/net/kyori/adventure/permission/PermissionChecker.java
+++ b/api/src/main/java/net/kyori/adventure/permission/PermissionChecker.java
@@ -28,7 +28,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.pointer.Pointer;
 import net.kyori.adventure.util.TriState;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
@@ -37,6 +37,7 @@
  *
  * @since 4.8.0
  */
+@NullMarked
 public interface PermissionChecker extends Predicate<String> {
   /**
    * A pointer to a permission predicate.
@@ -52,7 +53,7 @@ public interface PermissionChecker extends Predicate<String> {
    * @return a {@link PermissionChecker}
    * @since 4.8.0
    */
-  static @NotNull PermissionChecker always(final @NotNull TriState state) {
+  static PermissionChecker always(final TriState state) {
     requireNonNull(state);
     if (state == TriState.TRUE) return PermissionCheckers.TRUE;
     if (state == TriState.FALSE) return PermissionCheckers.FALSE;
@@ -66,10 +67,10 @@ public interface PermissionChecker extends Predicate<String> {
    * @return a tri-state result
    * @since 4.8.0
    */
-  @NotNull TriState value(final @NotNull String permission);
+  TriState value(final String permission);
 
   @Override
-  default boolean test(final @NotNull String permission) {
+  default boolean test(final String permission) {
     return this.value(permission) == TriState.TRUE;
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/permission/PermissionCheckers.java b/api/src/main/java/net/kyori/adventure/permission/PermissionCheckers.java
index 8bfc6fbe57..d9920f5594 100644
--- a/api/src/main/java/net/kyori/adventure/permission/PermissionCheckers.java
+++ b/api/src/main/java/net/kyori/adventure/permission/PermissionCheckers.java
@@ -24,9 +24,10 @@
 package net.kyori.adventure.permission;
 
 import net.kyori.adventure.util.TriState;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class PermissionCheckers {
   static final PermissionChecker NOT_SET = new Always(TriState.NOT_SET);
   static final PermissionChecker FALSE = new Always(TriState.FALSE);
@@ -43,7 +44,7 @@ private Always(final TriState value) {
     }
 
     @Override
-    public @NotNull TriState value(final @NotNull String permission) {
+    public TriState value(final String permission) {
       return this.value;
     }
 
diff --git a/api/src/main/java/net/kyori/adventure/pointer/Pointer.java b/api/src/main/java/net/kyori/adventure/pointer/Pointer.java
index 51ccd7c29c..b493c53249 100644
--- a/api/src/main/java/net/kyori/adventure/pointer/Pointer.java
+++ b/api/src/main/java/net/kyori/adventure/pointer/Pointer.java
@@ -27,7 +27,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A pointer to a resource.
@@ -35,6 +35,7 @@
  * @param <V> the value type
  * @since 4.8.0
  */
+@NullMarked
 public interface Pointer<V> extends Examinable {
   /**
    * Creates a pointer.
@@ -45,7 +46,7 @@ public interface Pointer<V> extends Examinable {
    * @return the pointer
    * @since 4.8.0
    */
-  static <V> @NotNull Pointer<V> pointer(final @NotNull Class<V> type, final @NotNull Key key) {
+  static <V> Pointer<V> pointer(final Class<V> type, final Key key) {
     return new PointerImpl<>(type, key);
   }
 
@@ -55,7 +56,7 @@ public interface Pointer<V> extends Examinable {
    * @return the value type
    * @since 4.8.0
    */
-  @NotNull Class<V> type();
+  Class<V> type();
 
   /**
    * Gets the key.
@@ -63,10 +64,10 @@ public interface Pointer<V> extends Examinable {
    * @return the key
    * @since 4.8.0
    */
-  @NotNull Key key();
+  Key key();
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("type", this.type()),
       ExaminableProperty.of("key", this.key())
diff --git a/api/src/main/java/net/kyori/adventure/pointer/PointerImpl.java b/api/src/main/java/net/kyori/adventure/pointer/PointerImpl.java
index 61197c34b2..cb35a3a44a 100644
--- a/api/src/main/java/net/kyori/adventure/pointer/PointerImpl.java
+++ b/api/src/main/java/net/kyori/adventure/pointer/PointerImpl.java
@@ -25,9 +25,10 @@
 
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.key.Key;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class PointerImpl<T> implements Pointer<T> {
   private final Class<T> type;
   private final Key key;
@@ -38,12 +39,12 @@ final class PointerImpl<T> implements Pointer<T> {
   }
 
   @Override
-  public @NotNull Class<T> type() {
+  public Class<T> type() {
     return this.type;
   }
 
   @Override
-  public @NotNull Key key() {
+  public Key key() {
     return this.key;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/pointer/Pointered.java b/api/src/main/java/net/kyori/adventure/pointer/Pointered.java
index ea9f7c4a6e..0d0d6ee6f0 100644
--- a/api/src/main/java/net/kyori/adventure/pointer/Pointered.java
+++ b/api/src/main/java/net/kyori/adventure/pointer/Pointered.java
@@ -26,15 +26,15 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Something that can retrieve values based on a given {@link Pointer}.
  *
  * @since 4.8.0
  */
+@NullMarked
 public interface Pointered {
   /**
    * Gets the value of {@code pointer}.
@@ -44,7 +44,7 @@ public interface Pointered {
    * @return the value
    * @since 4.8.0
    */
-  default <T> @NotNull Optional<T> get(final @NotNull Pointer<T> pointer) {
+  default <T> Optional<T> get(final Pointer<T> pointer) {
     return this.pointers().get(pointer);
   }
 
@@ -61,7 +61,7 @@ public interface Pointered {
    */
   @Contract("_, null -> _; _, !null -> !null")
   @SuppressWarnings("checkstyle:MethodName")
-  default <T> @Nullable T getOrDefault(final @NotNull Pointer<T> pointer, final @Nullable T defaultValue) {
+  default <T> @Nullable T getOrDefault(final Pointer<T> pointer, final @Nullable T defaultValue) {
     return this.pointers().getOrDefault(pointer, defaultValue);
   }
 
@@ -77,7 +77,7 @@ public interface Pointered {
    * @since 4.8.0
    */
   @SuppressWarnings("checkstyle:MethodName")
-  default <T> @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer<T> pointer, final @NotNull Supplier<? extends T> defaultValue) {
+  default <T> @Nullable T getOrDefaultFrom(final Pointer<T> pointer, final Supplier<? extends T> defaultValue) {
     return this.pointers().getOrDefaultFrom(pointer, defaultValue);
   }
 
@@ -87,7 +87,7 @@ public interface Pointered {
    * @return the pointers
    * @since 4.8.0
    */
-  default @NotNull Pointers pointers() {
+  default Pointers pointers() {
     return Pointers.empty();
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/pointer/Pointers.java b/api/src/main/java/net/kyori/adventure/pointer/Pointers.java
index c022fd1022..38e615015f 100644
--- a/api/src/main/java/net/kyori/adventure/pointer/Pointers.java
+++ b/api/src/main/java/net/kyori/adventure/pointer/Pointers.java
@@ -28,15 +28,15 @@
 import net.kyori.adventure.builder.AbstractBuilder;
 import net.kyori.adventure.util.Buildable;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A collection of {@link Pointer pointers}.
  *
  * @since 4.8.0
  */
+@NullMarked
 public interface Pointers extends Buildable<Pointers, Pointers.Builder> {
   /**
    * Gets an empty pointers collection.
@@ -45,7 +45,7 @@ public interface Pointers extends Buildable<Pointers, Pointers.Builder> {
    * @since 4.8.0
    */
   @Contract(pure = true)
-  static @NotNull Pointers empty() {
+  static Pointers empty() {
     return PointersImpl.EMPTY;
   }
 
@@ -57,7 +57,7 @@ public interface Pointers extends Buildable<Pointers, Pointers.Builder> {
    * @since 4.8.0
    */
   @Contract(pure = true)
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new PointersImpl.BuilderImpl();
   }
 
@@ -69,7 +69,7 @@ public interface Pointers extends Buildable<Pointers, Pointers.Builder> {
    * @return the value
    * @since 4.8.0
    */
-  <T> @NotNull Optional<T> get(final @NotNull Pointer<T> pointer);
+  <T> Optional<T> get(final Pointer<T> pointer);
 
   /**
    * Gets the value of {@code pointer}.
@@ -84,7 +84,7 @@ public interface Pointers extends Buildable<Pointers, Pointers.Builder> {
    */
   @Contract("_, null -> _; _, !null -> !null")
   @SuppressWarnings("checkstyle:MethodName")
-  default <T> @Nullable T getOrDefault(final @NotNull Pointer<T> pointer, final @Nullable T defaultValue) {
+  default <T> @Nullable T getOrDefault(final Pointer<T> pointer, final @Nullable T defaultValue) {
     return this.get(pointer).orElse(defaultValue);
   }
 
@@ -100,7 +100,7 @@ public interface Pointers extends Buildable<Pointers, Pointers.Builder> {
    * @since 4.8.0
    */
   @SuppressWarnings("checkstyle:MethodName")
-  default <T> @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer<T> pointer, final @NotNull Supplier<? extends T> defaultValue) {
+  default <T> @Nullable T getOrDefaultFrom(final Pointer<T> pointer, final Supplier<? extends T> defaultValue) {
     return this.get(pointer).orElseGet(defaultValue);
   }
 
@@ -114,7 +114,7 @@ public interface Pointers extends Buildable<Pointers, Pointers.Builder> {
    * @return if the pointer is supported
    * @since 4.8.0
    */
-  <T> boolean supports(final @NotNull Pointer<T> pointer);
+  <T> boolean supports(final Pointer<T> pointer);
 
   /**
    * A builder of pointers.
@@ -133,7 +133,7 @@ interface Builder extends AbstractBuilder<Pointers>, Buildable.Builder<Pointers>
      * @since 4.8.0
      */
     @Contract("_, _ -> this")
-    default <T> @NotNull Builder withStatic(final @NotNull Pointer<T> pointer, final @Nullable T value) {
+    default <T> Builder withStatic(final Pointer<T> pointer, final @Nullable T value) {
       return this.withDynamic(pointer, () -> value);
     }
 
@@ -147,6 +147,6 @@ interface Builder extends AbstractBuilder<Pointers>, Buildable.Builder<Pointers>
      * @since 4.8.0
      */
     @Contract("_, _ -> this")
-    <T> @NotNull Builder withDynamic(final @NotNull Pointer<T> pointer, @NotNull Supplier<@Nullable T> value);
+    <T> Builder withDynamic(final Pointer<T> pointer, Supplier<@Nullable T> value);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/pointer/PointersImpl.java b/api/src/main/java/net/kyori/adventure/pointer/PointersImpl.java
index 985d07b71c..af27ad1eb3 100644
--- a/api/src/main/java/net/kyori/adventure/pointer/PointersImpl.java
+++ b/api/src/main/java/net/kyori/adventure/pointer/PointersImpl.java
@@ -28,23 +28,24 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class PointersImpl implements Pointers {
   static final Pointers EMPTY = new Pointers() {
     @Override
-    public @NotNull <T> Optional<T> get(final @NotNull Pointer<T> pointer) {
+    public <T> Optional<T> get(final Pointer<T> pointer) {
       return Optional.empty();
     }
 
     @Override
-    public <T> boolean supports(final @NotNull Pointer<T> pointer) {
+    public <T> boolean supports(final Pointer<T> pointer) {
       return false;
     }
 
     @Override
-    public Pointers.@NotNull Builder toBuilder() {
+    public Pointers.Builder toBuilder() {
       return new PointersImpl.BuilderImpl();
     }
 
@@ -56,13 +57,13 @@ public String toString() {
 
   private final Map<Pointer<?>, Supplier<?>> pointers;
 
-  PointersImpl(final @NotNull BuilderImpl builder) {
+  PointersImpl(final BuilderImpl builder) {
     this.pointers = new HashMap<>(builder.pointers);
   }
 
   @Override
   @SuppressWarnings("unchecked") // all values are checked on entry
-  public @NotNull <T> Optional<T> get(final @NotNull Pointer<T> pointer) {
+  public <T> Optional<T> get(final Pointer<T> pointer) {
     Objects.requireNonNull(pointer, "pointer");
     final Supplier<?> supplier = this.pointers.get(pointer);
     if (supplier == null) {
@@ -73,13 +74,13 @@ public String toString() {
   }
 
   @Override
-  public <T> boolean supports(final @NotNull Pointer<T> pointer) {
+  public <T> boolean supports(final Pointer<T> pointer) {
     Objects.requireNonNull(pointer, "pointer");
     return this.pointers.containsKey(pointer);
   }
 
   @Override
-  public Pointers.@NotNull Builder toBuilder() {
+  public Pointers.Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -90,18 +91,18 @@ static final class BuilderImpl implements Builder {
       this.pointers = new HashMap<>();
     }
 
-    BuilderImpl(final @NotNull PointersImpl pointers) {
+    BuilderImpl(final PointersImpl pointers) {
       this.pointers = new HashMap<>(pointers.pointers);
     }
 
     @Override
-    public @NotNull <T> Builder withDynamic(final @NotNull Pointer<T> pointer, final @NotNull Supplier<@Nullable T> value) {
+    public <T> Builder withDynamic(final Pointer<T> pointer, final Supplier<@Nullable T> value) {
       this.pointers.put(Objects.requireNonNull(pointer, "pointer"), Objects.requireNonNull(value, "value"));
       return this;
     }
 
     @Override
-    public @NotNull Pointers build() {
+    public Pointers build() {
       return new PointersImpl(this);
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/sound/Sound.java b/api/src/main/java/net/kyori/adventure/sound/Sound.java
index 5229772c14..73aa09da52 100644
--- a/api/src/main/java/net/kyori/adventure/sound/Sound.java
+++ b/api/src/main/java/net/kyori/adventure/sound/Sound.java
@@ -32,8 +32,8 @@
 import net.kyori.adventure.util.Index;
 import net.kyori.examination.Examinable;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
@@ -58,6 +58,7 @@
  * @since 4.0.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface Sound extends Examinable {
   /**
    * Create a new builder for {@link Sound} instances.
@@ -65,7 +66,7 @@ public interface Sound extends Examinable {
    * @return a new builder
    * @since 4.12.0
    */
-  static @NotNull Builder sound() {
+  static Builder sound() {
     return new SoundImpl.BuilderImpl();
   }
 
@@ -76,7 +77,7 @@ public interface Sound extends Examinable {
    * @return a new builder
    * @since 4.12.0
    */
-  static @NotNull Builder sound(final @NotNull Sound existing) {
+  static Builder sound(final Sound existing) {
     return new SoundImpl.BuilderImpl(existing);
   }
 
@@ -87,7 +88,7 @@ public interface Sound extends Examinable {
    * @return a new builder
    * @since 4.12.0
    */
-  static @NotNull Sound sound(final @NotNull Consumer<Sound.Builder> configurer) {
+  static Sound sound(final Consumer<Sound.Builder> configurer) {
     return AbstractBuilder.configureAndBuild(sound(), configurer);
   }
 
@@ -101,7 +102,7 @@ public interface Sound extends Examinable {
    * @return the sound
    * @since 4.0.0
    */
-  static @NotNull Sound sound(final @NotNull Key name, final @NotNull Source source, final float volume, final float pitch) {
+  static Sound sound(final Key name, final Source source, final float volume, final float pitch) {
     return sound().type(name).source(source).volume(volume).pitch(pitch).build();
   }
 
@@ -115,7 +116,7 @@ public interface Sound extends Examinable {
    * @return the sound
    * @since 4.0.0
    */
-  static @NotNull Sound sound(final @NotNull Type type, final @NotNull Source source, final float volume, final float pitch) {
+  static Sound sound(final Type type, final Source source, final float volume, final float pitch) {
     requireNonNull(type, "type");
     return sound(type.key(), source, volume, pitch);
   }
@@ -130,7 +131,7 @@ public interface Sound extends Examinable {
    * @return the sound
    * @since 4.0.0
    */
-  static @NotNull Sound sound(final @NotNull Supplier<? extends Type> type, final @NotNull Source source, final float volume, final float pitch) {
+  static Sound sound(final Supplier<? extends Type> type, final Source source, final float volume, final float pitch) {
     return sound().type(type).source(source).volume(volume).pitch(pitch).build();
   }
 
@@ -144,7 +145,7 @@ public interface Sound extends Examinable {
    * @return the sound
    * @since 4.8.0
    */
-  static @NotNull Sound sound(final @NotNull Key name, final Source.@NotNull Provider source, final float volume, final float pitch) {
+  static Sound sound(final Key name, final Source.Provider source, final float volume, final float pitch) {
     return sound(name, source.soundSource(), volume, pitch);
   }
 
@@ -158,7 +159,7 @@ public interface Sound extends Examinable {
    * @return the sound
    * @since 4.8.0
    */
-  static @NotNull Sound sound(final @NotNull Type type, final Source.@NotNull Provider source, final float volume, final float pitch) {
+  static Sound sound(final Type type, final Source.Provider source, final float volume, final float pitch) {
     return sound(type, source.soundSource(), volume, pitch);
   }
 
@@ -172,7 +173,7 @@ public interface Sound extends Examinable {
    * @return the sound
    * @since 4.8.0
    */
-  static @NotNull Sound sound(final @NotNull Supplier<? extends Type> type, final Source.@NotNull Provider source, final float volume, final float pitch) {
+  static Sound sound(final Supplier<? extends Type> type, final Source.Provider source, final float volume, final float pitch) {
     return sound(type, source.soundSource(), volume, pitch);
   }
 
@@ -182,7 +183,7 @@ public interface Sound extends Examinable {
    * @return the name
    * @since 4.0.0
    */
-  @NotNull Key name();
+  Key name();
 
   /**
    * Gets the source.
@@ -190,7 +191,7 @@ public interface Sound extends Examinable {
    * @return the source
    * @since 4.0.0
    */
-  @NotNull Source source();
+  Source source();
 
   /**
    * Gets the volume.
@@ -216,7 +217,7 @@ public interface Sound extends Examinable {
    * @return the seed to use
    * @since 4.12.0
    */
-  @NotNull OptionalLong seed();
+  OptionalLong seed();
 
   /**
    * Gets the {@link SoundStop} that will stop this specific sound.
@@ -224,7 +225,7 @@ public interface Sound extends Examinable {
    * @return the sound stop
    * @since 4.8.0
    */
-  @NotNull SoundStop asStop();
+  SoundStop asStop();
 
   /**
    * The sound source.
@@ -267,7 +268,7 @@ public interface Provider {
        * @return the source
        * @since 4.8.0
        */
-      @NotNull Source soundSource();
+      Source soundSource();
     }
   }
 
@@ -284,7 +285,7 @@ interface Type extends Keyed {
      * @since 4.0.0
      */
     @Override
-    @NotNull Key key();
+    Key key();
   }
 
   /**
@@ -302,7 +303,7 @@ interface Emitter {
      * @return the emitter
      * @since 4.8.0
      */
-    static @NotNull Emitter self() {
+    static Emitter self() {
       return SoundImpl.EMITTER_SELF;
     }
   }
@@ -324,7 +325,7 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder type(final @NotNull Key type);
+    Builder type(final Key type);
 
     /**
      * Set the type of this sound.
@@ -335,7 +336,7 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder type(final @NotNull Type type);
+    Builder type(final Type type);
 
     /**
      * Set the type of this sound.
@@ -346,7 +347,7 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder type(final @NotNull Supplier<? extends Type> typeSupplier);
+    Builder type(final Supplier<? extends Type> typeSupplier);
 
     /**
      * A {@link Source} to tell the game where the sound is coming from.
@@ -357,7 +358,7 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder source(final @NotNull Source source);
+    Builder source(final Source source);
 
     /**
      * A {@link Source} to tell the game where the sound is coming from.
@@ -368,7 +369,7 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder source(final Source.@NotNull Provider source);
+    Builder source(final Source.Provider source);
 
     /**
      * The volume for this sound, indicating how far away it can be heard.
@@ -379,7 +380,7 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder volume(final @Range(from = 0, to = Integer.MAX_VALUE) float volume);
+    Builder volume(final @Range(from = 0, to = Integer.MAX_VALUE) float volume);
 
     /**
      * The pitch for this sound, indicating how high or low the sound can be heard.
@@ -390,7 +391,7 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder pitch(final @Range(from = -1, to = 1) float pitch);
+    Builder pitch(final @Range(from = -1, to = 1) float pitch);
 
     /**
      * The seed for this sound, used for weighted choices.
@@ -401,7 +402,7 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder seed(final long seed);
+    Builder seed(final long seed);
 
     /**
      * The seed for this sound, used for weighted choices.
@@ -412,6 +413,6 @@ interface Builder extends AbstractBuilder<Sound> {
      * @return this builder
      * @since 4.12.0
      */
-    @NotNull Builder seed(final @NotNull OptionalLong seed);
+    Builder seed(final OptionalLong seed);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java b/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java
index f8de4a2536..fc908592c7 100644
--- a/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java
+++ b/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java
@@ -30,12 +30,13 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.util.ShadyPines;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 abstract class SoundImpl implements Sound {
   static final Emitter EMITTER_SELF = new Emitter() {
     @Override
@@ -50,7 +51,7 @@ public String toString() {
   private final OptionalLong seed;
   private SoundStop stop;
 
-  SoundImpl(final @NotNull Source source, final float volume, final float pitch, final OptionalLong seed) {
+  SoundImpl(final Source source, final float volume, final float pitch, final OptionalLong seed) {
     this.source = source;
     this.volume = volume;
     this.pitch = pitch;
@@ -58,7 +59,7 @@ public String toString() {
   }
 
   @Override
-  public @NotNull Source source() {
+  public Source source() {
     return this.source;
   }
 
@@ -78,7 +79,7 @@ public OptionalLong seed() {
   }
 
   @Override
-  public @NotNull SoundStop asStop() {
+  public SoundStop asStop() {
     if (this.stop == null) this.stop = SoundStop.namedOnSource(this.name(), this.source());
     return this.stop;
   }
@@ -106,7 +107,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("name", this.name()),
       ExaminableProperty.of("source", this.source),
@@ -134,7 +135,7 @@ static final class BuilderImpl implements Builder {
     BuilderImpl() {
     }
 
-    BuilderImpl(final @NotNull Sound existing) {
+    BuilderImpl(final Sound existing) {
       if (existing instanceof Eager) {
         this.type(((Eager) existing).name);
       } else if (existing instanceof Lazy) {
@@ -150,63 +151,63 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder type(final @NotNull Key type) {
+    public Builder type(final Key type) {
       this.eagerType = requireNonNull(type, "type");
       this.lazyType = null;
       return this;
     }
 
     @Override
-    public @NotNull Builder type(final @NotNull Type type) {
+    public Builder type(final Type type) {
       this.eagerType = requireNonNull(requireNonNull(type, "type").key(), "type.key()");
       this.lazyType = null;
       return this;
     }
 
     @Override
-    public @NotNull Builder type(final @NotNull Supplier<? extends Type> typeSupplier) {
+    public Builder type(final Supplier<? extends Type> typeSupplier) {
       this.lazyType = requireNonNull(typeSupplier, "typeSupplier");
       this.eagerType = null;
       return this;
     }
 
     @Override
-    public @NotNull Builder source(final @NotNull Source source) {
+    public Builder source(final Source source) {
       this.source = requireNonNull(source, "source");
       return this;
     }
 
     @Override
-    public @NotNull Builder source(final Source.@NotNull Provider source) {
+    public Builder source(final Source.Provider source) {
       return this.source(source.soundSource());
     }
 
     @Override
-    public @NotNull Builder volume(final @Range(from = 0, to = Integer.MAX_VALUE) float volume) {
+    public Builder volume(final @Range(from = 0, to = Integer.MAX_VALUE) float volume) {
       this.volume = volume;
       return this;
     }
 
     @Override
-    public @NotNull Builder pitch(final @Range(from = -1, to = 1) float pitch) {
+    public Builder pitch(final @Range(from = -1, to = 1) float pitch) {
       this.pitch = pitch;
       return this;
     }
 
     @Override
-    public @NotNull Builder seed(final long seed) {
+    public Builder seed(final long seed) {
       this.seed = OptionalLong.of(seed);
       return this;
     }
 
     @Override
-    public @NotNull Builder seed(final @NotNull OptionalLong seed) {
+    public Builder seed(final OptionalLong seed) {
       this.seed = requireNonNull(seed, "seed");
       return this;
     }
 
     @Override
-    public @NotNull Sound build() {
+    public Sound build() {
       if (this.eagerType != null) {
         return new Eager(this.eagerType, this.source, this.volume, this.pitch, this.seed);
       } else if (this.lazyType != null) {
@@ -220,13 +221,13 @@ static final class BuilderImpl implements Builder {
   static final class Eager extends SoundImpl {
     final Key name;
 
-    Eager(final @NotNull Key name, final @NotNull Source source, final float volume, final float pitch, final OptionalLong seed) {
+    Eager(final Key name, final Source source, final float volume, final float pitch, final OptionalLong seed) {
       super(source, volume, pitch, seed);
       this.name = name;
     }
 
     @Override
-    public @NotNull Key name() {
+    public Key name() {
       return this.name;
     }
   }
@@ -234,13 +235,13 @@ static final class Eager extends SoundImpl {
   static final class Lazy extends SoundImpl {
     final Supplier<? extends Type> supplier;
 
-    Lazy(final @NotNull Supplier<? extends Type> supplier, final @NotNull Source source, final float volume, final float pitch, final OptionalLong seed) {
+    Lazy(final Supplier<? extends Type> supplier, final Source source, final float volume, final float pitch, final OptionalLong seed) {
       super(source, volume, pitch, seed);
       this.supplier = supplier;
     }
 
     @Override
-    public @NotNull Key name() {
+    public Key name() {
       return this.supplier.get().key();
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/sound/SoundStop.java b/api/src/main/java/net/kyori/adventure/sound/SoundStop.java
index 2cbe7aac10..1f870526af 100644
--- a/api/src/main/java/net/kyori/adventure/sound/SoundStop.java
+++ b/api/src/main/java/net/kyori/adventure/sound/SoundStop.java
@@ -28,8 +28,8 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.examination.Examinable;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -45,6 +45,7 @@
  * @since 4.0.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface SoundStop extends Examinable {
   /**
    * Stops all sounds.
@@ -52,7 +53,7 @@ public interface SoundStop extends Examinable {
    * @return a sound stopper
    * @since 4.0.0
    */
-  static @NotNull SoundStop all() {
+  static SoundStop all() {
     return SoundStopImpl.ALL;
   }
 
@@ -63,11 +64,11 @@ public interface SoundStop extends Examinable {
    * @return a sound stopper
    * @since 4.0.0
    */
-  static @NotNull SoundStop named(final @NotNull Key sound) {
+  static SoundStop named(final Key sound) {
     requireNonNull(sound, "sound");
     return new SoundStopImpl(null) {
       @Override
-      public @NotNull Key sound() {
+      public Key sound() {
         return sound;
       }
     };
@@ -80,11 +81,11 @@ public interface SoundStop extends Examinable {
    * @return a sound stopper
    * @since 4.0.0
    */
-  static @NotNull SoundStop named(final Sound.@NotNull Type sound) {
+  static SoundStop named(final Sound.Type sound) {
     requireNonNull(sound, "sound");
     return new SoundStopImpl(null) {
       @Override
-      public @NotNull Key sound() {
+      public Key sound() {
         return sound.key();
       }
     };
@@ -97,11 +98,11 @@ public interface SoundStop extends Examinable {
    * @return a sound stopper
    * @since 4.0.0
    */
-  static @NotNull SoundStop named(final @NotNull Supplier<? extends Sound.Type> sound) {
+  static SoundStop named(final Supplier<? extends Sound.Type> sound) {
     requireNonNull(sound, "sound");
     return new SoundStopImpl(null) {
       @Override
-      public @NotNull Key sound() {
+      public Key sound() {
         return sound.get().key();
       }
     };
@@ -114,7 +115,7 @@ public interface SoundStop extends Examinable {
    * @return a sound stopper
    * @since 4.0.0
    */
-  static @NotNull SoundStop source(final Sound.@NotNull Source source) {
+  static SoundStop source(final Sound.Source source) {
     requireNonNull(source, "source");
     return new SoundStopImpl(source) {
       @Override
@@ -132,12 +133,12 @@ public interface SoundStop extends Examinable {
    * @return a sound stopper
    * @since 4.0.0
    */
-  static @NotNull SoundStop namedOnSource(final @NotNull Key sound, final Sound.@NotNull Source source) {
+  static SoundStop namedOnSource(final Key sound, final Sound.Source source) {
     requireNonNull(sound, "sound");
     requireNonNull(source, "source");
     return new SoundStopImpl(source) {
       @Override
-      public @NotNull Key sound() {
+      public Key sound() {
         return sound;
       }
     };
@@ -151,7 +152,7 @@ public interface SoundStop extends Examinable {
    * @return a sound stopper
    * @since 4.0.0
    */
-  static @NotNull SoundStop namedOnSource(final Sound.@NotNull Type sound, final Sound.@NotNull Source source) {
+  static SoundStop namedOnSource(final Sound.Type sound, final Sound.Source source) {
     requireNonNull(sound, "sound");
     return namedOnSource(sound.key(), source);
   }
@@ -164,12 +165,12 @@ public interface SoundStop extends Examinable {
    * @return a sound stopper
    * @since 4.0.0
    */
-  static @NotNull SoundStop namedOnSource(final @NotNull Supplier<? extends Sound.Type> sound, final Sound.@NotNull Source source) {
+  static SoundStop namedOnSource(final Supplier<? extends Sound.Type> sound, final Sound.Source source) {
     requireNonNull(sound, "sound");
     requireNonNull(source, "source");
     return new SoundStopImpl(source) {
       @Override
-      public @NotNull Key sound() {
+      public Key sound() {
         return sound.get().key();
       }
     };
diff --git a/api/src/main/java/net/kyori/adventure/sound/SoundStopImpl.java b/api/src/main/java/net/kyori/adventure/sound/SoundStopImpl.java
index de76b9e14a..561a1fdeed 100644
--- a/api/src/main/java/net/kyori/adventure/sound/SoundStopImpl.java
+++ b/api/src/main/java/net/kyori/adventure/sound/SoundStopImpl.java
@@ -28,9 +28,10 @@
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.key.Key;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 abstract class SoundStopImpl implements SoundStop {
   static final SoundStop ALL = new SoundStopImpl(null) {
     @Override
@@ -66,7 +67,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("name", this.sound()),
       ExaminableProperty.of("source", this.source)
diff --git a/api/src/main/java/net/kyori/adventure/text/AbstractComponent.java b/api/src/main/java/net/kyori/adventure/text/AbstractComponent.java
index b2245732d8..76747fc085 100644
--- a/api/src/main/java/net/kyori/adventure/text/AbstractComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/AbstractComponent.java
@@ -31,8 +31,8 @@
 import net.kyori.examination.string.StringExaminer;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * An abstract implementation of a text component.
@@ -43,22 +43,23 @@
 @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
 @Debug.Renderer(text = "this.debuggerString()", childrenArray = "this.children().toArray()", hasChildren = "!this.children().isEmpty()")
 @Deprecated
+@NullMarked
 public abstract class AbstractComponent implements Component {
   protected final List<Component> children;
   protected final Style style;
 
-  protected AbstractComponent(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style) {
+  protected AbstractComponent(final List<? extends ComponentLike> children, final Style style) {
     this.children = ComponentLike.asComponents(children, IS_NOT_EMPTY);
     this.style = style;
   }
 
   @Override
-  public final @NotNull List<Component> children() {
+  public final List<Component> children() {
     return this.children;
   }
 
   @Override
-  public final @NotNull Style style() {
+  public final Style style() {
     return this.style;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
index d7efecbbed..e95ca1cdd1 100644
--- a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
+++ b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
@@ -36,8 +36,8 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -47,6 +47,7 @@
  * @param <C> the component type
  * @param <B> the builder type
  */
+@NullMarked
 abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B extends ComponentBuilder<C, B>> implements ComponentBuilder<C, B> {
   // We use an empty list by default to prevent unnecessary list creation for components with no children
   protected List<Component> children = Collections.emptyList();
@@ -61,7 +62,7 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex
   protected AbstractComponentBuilder() {
   }
 
-  protected AbstractComponentBuilder(final @NotNull C component) {
+  protected AbstractComponentBuilder(final C component) {
     final List<Component> children = component.children();
     if (!children.isEmpty()) {
       this.children = new ArrayList<>(children);
@@ -73,7 +74,7 @@ protected AbstractComponentBuilder(final @NotNull C component) {
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B append(final @NotNull Component component) {
+  public B append(final Component component) {
     if (component == Component.empty()) return (B) this;
     this.prepareChildren();
     this.children.add(requireNonNull(component, "component"));
@@ -81,13 +82,13 @@ protected AbstractComponentBuilder(final @NotNull C component) {
   }
 
   @Override
-  public @NotNull B append(final @NotNull Component@NotNull... components) {
+  public B append(final Component... components) {
     return this.append((ComponentLike[]) components);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B append(final @NotNull ComponentLike@NotNull... components) {
+  public B append(final ComponentLike... components) {
     requireNonNull(components, "components");
     boolean prepared = false;
     for (int i = 0, length = components.length; i < length; i++) {
@@ -105,7 +106,7 @@ protected AbstractComponentBuilder(final @NotNull C component) {
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B append(final @NotNull Iterable<? extends ComponentLike> components) {
+  public B append(final Iterable<? extends ComponentLike> components) {
     requireNonNull(components, "components");
     boolean prepared = false;
     for (final ComponentLike like : components) {
@@ -129,7 +130,7 @@ private void prepareChildren() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B applyDeep(final @NotNull Consumer<? super ComponentBuilder<?, ?>> consumer) {
+  public B applyDeep(final Consumer<? super ComponentBuilder<?, ?>> consumer) {
     this.apply(consumer);
     if (this.children == Collections.<Component>emptyList()) {
       return (B) this;
@@ -149,7 +150,7 @@ private void prepareChildren() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B mapChildren(final @NotNull Function<BuildableComponent<?, ?>, ? extends BuildableComponent<?, ?>> function) {
+  public B mapChildren(final Function<BuildableComponent<?, ?>, ? extends BuildableComponent<?, ?>> function) {
     if (this.children == Collections.<Component>emptyList()) {
       return (B) this;
     }
@@ -170,7 +171,7 @@ private void prepareChildren() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B mapChildrenDeep(final @NotNull Function<BuildableComponent<?, ?>, ? extends BuildableComponent<?, ?>> function) {
+  public B mapChildrenDeep(final Function<BuildableComponent<?, ?>, ? extends BuildableComponent<?, ?>> function) {
     if (this.children == Collections.<Component>emptyList()) {
       return (B) this;
     }
@@ -196,13 +197,13 @@ private void prepareChildren() {
   }
 
   @Override
-  public @NotNull List<Component> children() {
+  public List<Component> children() {
     return Collections.unmodifiableList(this.children);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B style(final @NotNull Style style) {
+  public B style(final Style style) {
     this.style = style;
     this.styleBuilder = null;
     return (B) this;
@@ -210,83 +211,83 @@ private void prepareChildren() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B style(final @NotNull Consumer<Style.Builder> consumer) {
+  public B style(final Consumer<Style.Builder> consumer) {
     consumer.accept(this.styleBuilder());
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B font(final @Nullable Key font) {
+  public B font(final @Nullable Key font) {
     this.styleBuilder().font(font);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B color(final @Nullable TextColor color) {
+  public B color(final @Nullable TextColor color) {
     this.styleBuilder().color(color);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B colorIfAbsent(final @Nullable TextColor color) {
+  public B colorIfAbsent(final @Nullable TextColor color) {
     this.styleBuilder().colorIfAbsent(color);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+  public B decoration(final TextDecoration decoration, final TextDecoration.State state) {
     this.styleBuilder().decoration(decoration, state);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B decorationIfAbsent(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+  public B decorationIfAbsent(final TextDecoration decoration, final TextDecoration.State state) {
     this.styleBuilder().decorationIfAbsent(decoration, state);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B clickEvent(final @Nullable ClickEvent event) {
+  public B clickEvent(final @Nullable ClickEvent event) {
     this.styleBuilder().clickEvent(event);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B hoverEvent(final @Nullable HoverEventSource<?> source) {
+  public B hoverEvent(final @Nullable HoverEventSource<?> source) {
     this.styleBuilder().hoverEvent(source);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B insertion(final @Nullable String insertion) {
+  public B insertion(final @Nullable String insertion) {
     this.styleBuilder().insertion(insertion);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B mergeStyle(final @NotNull Component that, final @NotNull Set<Style.Merge> merges) {
+  public B mergeStyle(final Component that, final Set<Style.Merge> merges) {
     this.styleBuilder().merge(requireNonNull(that, "component").style(), merges);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B resetStyle() {
+  public B resetStyle() {
     this.style = null;
     this.styleBuilder = null;
     return (B) this;
   }
 
-  private Style.@NotNull Builder styleBuilder() {
+  private Style.Builder styleBuilder() {
     if (this.styleBuilder == null) {
       if (this.style != null) {
         this.styleBuilder = this.style.toBuilder();
@@ -302,7 +303,7 @@ protected final boolean hasStyle() {
     return this.styleBuilder != null || this.style != null;
   }
 
-  protected @NotNull Style buildStyle() {
+  protected Style buildStyle() {
     if (this.styleBuilder != null) {
       return this.styleBuilder.build();
     } else if (this.style != null) {
diff --git a/api/src/main/java/net/kyori/adventure/text/AbstractNBTComponentBuilder.java b/api/src/main/java/net/kyori/adventure/text/AbstractNBTComponentBuilder.java
index 806728ec48..1c4bf98358 100644
--- a/api/src/main/java/net/kyori/adventure/text/AbstractNBTComponentBuilder.java
+++ b/api/src/main/java/net/kyori/adventure/text/AbstractNBTComponentBuilder.java
@@ -23,11 +23,12 @@
  */
 package net.kyori.adventure.text;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 abstract class AbstractNBTComponentBuilder<C extends NBTComponent<C, B>, B extends NBTComponentBuilder<C, B>> extends AbstractComponentBuilder<C, B> implements NBTComponentBuilder<C, B> {
   protected @Nullable String nbtPath;
   protected boolean interpret = NBTComponentImpl.INTERPRET_DEFAULT;
@@ -36,7 +37,7 @@ abstract class AbstractNBTComponentBuilder<C extends NBTComponent<C, B>, B exten
   AbstractNBTComponentBuilder() {
   }
 
-  AbstractNBTComponentBuilder(final @NotNull C component) {
+  AbstractNBTComponentBuilder(final C component) {
     super(component);
     this.nbtPath = component.nbtPath();
     this.interpret = component.interpret();
@@ -45,21 +46,21 @@ abstract class AbstractNBTComponentBuilder<C extends NBTComponent<C, B>, B exten
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B nbtPath(final @NotNull String nbtPath) {
+  public B nbtPath(final String nbtPath) {
     this.nbtPath = requireNonNull(nbtPath, "nbtPath");
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B interpret(final boolean interpret) {
+  public B interpret(final boolean interpret) {
     this.interpret = interpret;
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B separator(final @Nullable ComponentLike separator) {
+  public B separator(final @Nullable ComponentLike separator) {
     this.separator = ComponentLike.unbox(separator);
     return (B) this;
   }
diff --git a/api/src/main/java/net/kyori/adventure/text/BlockNBTComponent.java b/api/src/main/java/net/kyori/adventure/text/BlockNBTComponent.java
index 76aaa7ad08..16ac365879 100644
--- a/api/src/main/java/net/kyori/adventure/text/BlockNBTComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/BlockNBTComponent.java
@@ -29,7 +29,7 @@
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Given an in-game position, this component reads the NBT of the associated block and displays that information.
@@ -46,6 +46,7 @@
  * @since 4.0.0
  * @sinceMinecraft 1.14
  */
+@NullMarked
 public interface BlockNBTComponent extends NBTComponent<BlockNBTComponent, BlockNBTComponent.Builder>, ScopedComponent<BlockNBTComponent> {
   /**
    * Gets the block position.
@@ -53,7 +54,7 @@ public interface BlockNBTComponent extends NBTComponent<BlockNBTComponent, Block
    * @return the block position
    * @since 4.0.0
    */
-  @NotNull Pos pos();
+  Pos pos();
 
   /**
    * Sets the block position.
@@ -63,7 +64,7 @@ public interface BlockNBTComponent extends NBTComponent<BlockNBTComponent, Block
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull BlockNBTComponent pos(final @NotNull Pos pos);
+  BlockNBTComponent pos(final Pos pos);
 
   /**
    * Sets the block position to a {@link LocalPos} with the given coordinates.
@@ -75,7 +76,7 @@ public interface BlockNBTComponent extends NBTComponent<BlockNBTComponent, Block
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull BlockNBTComponent localPos(final double left, final double up, final double forwards) {
+  default BlockNBTComponent localPos(final double left, final double up, final double forwards) {
     return this.pos(LocalPos.localPos(left, up, forwards));
   }
 
@@ -89,7 +90,7 @@ public interface BlockNBTComponent extends NBTComponent<BlockNBTComponent, Block
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull BlockNBTComponent worldPos(final WorldPos.@NotNull Coordinate x, final WorldPos.@NotNull Coordinate y, final WorldPos.@NotNull Coordinate z) {
+  default BlockNBTComponent worldPos(final WorldPos.Coordinate x, final WorldPos.Coordinate y, final WorldPos.Coordinate z) {
     return this.pos(WorldPos.worldPos(x, y, z));
   }
 
@@ -103,7 +104,7 @@ public interface BlockNBTComponent extends NBTComponent<BlockNBTComponent, Block
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull BlockNBTComponent absoluteWorldPos(final int x, final int y, final int z) {
+  default BlockNBTComponent absoluteWorldPos(final int x, final int y, final int z) {
     return this.worldPos(WorldPos.Coordinate.absolute(x), WorldPos.Coordinate.absolute(y), WorldPos.Coordinate.absolute(z));
   }
 
@@ -117,12 +118,12 @@ public interface BlockNBTComponent extends NBTComponent<BlockNBTComponent, Block
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull BlockNBTComponent relativeWorldPos(final int x, final int y, final int z) {
+  default BlockNBTComponent relativeWorldPos(final int x, final int y, final int z) {
     return this.worldPos(WorldPos.Coordinate.relative(x), WorldPos.Coordinate.relative(y), WorldPos.Coordinate.relative(z));
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("pos", this.pos())
@@ -145,7 +146,7 @@ interface Builder extends NBTComponentBuilder<BlockNBTComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder pos(final @NotNull Pos pos);
+    Builder pos(final Pos pos);
 
     /**
      * Sets the block position to a {@link LocalPos} with the given values.
@@ -157,7 +158,7 @@ interface Builder extends NBTComponentBuilder<BlockNBTComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_, _, _ -> this")
-    default @NotNull Builder localPos(final double left, final double up, final double forwards) {
+    default Builder localPos(final double left, final double up, final double forwards) {
       return this.pos(LocalPos.localPos(left, up, forwards));
     }
 
@@ -171,7 +172,7 @@ interface Builder extends NBTComponentBuilder<BlockNBTComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_, _, _ -> this")
-    default @NotNull Builder worldPos(final WorldPos.@NotNull Coordinate x, final WorldPos.@NotNull Coordinate y, final WorldPos.@NotNull Coordinate z) {
+    default Builder worldPos(final WorldPos.Coordinate x, final WorldPos.Coordinate y, final WorldPos.Coordinate z) {
       return this.pos(WorldPos.worldPos(x, y, z));
     }
 
@@ -185,7 +186,7 @@ interface Builder extends NBTComponentBuilder<BlockNBTComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_, _, _ -> this")
-    default @NotNull Builder absoluteWorldPos(final int x, final int y, final int z) {
+    default Builder absoluteWorldPos(final int x, final int y, final int z) {
       return this.worldPos(WorldPos.Coordinate.absolute(x), WorldPos.Coordinate.absolute(y), WorldPos.Coordinate.absolute(z));
     }
 
@@ -199,7 +200,7 @@ interface Builder extends NBTComponentBuilder<BlockNBTComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_, _, _ -> this")
-    default @NotNull Builder relativeWorldPos(final int x, final int y, final int z) {
+    default Builder relativeWorldPos(final int x, final int y, final int z) {
       return this.worldPos(WorldPos.Coordinate.relative(x), WorldPos.Coordinate.relative(y), WorldPos.Coordinate.relative(z));
     }
   }
@@ -222,7 +223,7 @@ interface Pos extends Examinable {
      * @throws IllegalArgumentException if the position was in an invalid format
      * @since 4.0.0
      */
-    static @NotNull Pos fromString(final @NotNull String input) throws IllegalArgumentException {
+    static Pos fromString(final String input) throws IllegalArgumentException {
       final Matcher localMatch = BlockNBTComponentImpl.Tokens.LOCAL_PATTERN.matcher(input);
       if (localMatch.matches()) {
         return BlockNBTComponent.LocalPos.localPos(
@@ -251,7 +252,7 @@ interface Pos extends Examinable {
      * @see #fromString(String)
      * @since 4.0.0
      */
-    @NotNull String asString();
+    String asString();
   }
 
   /**
@@ -269,7 +270,7 @@ interface LocalPos extends Pos {
      * @return a local position
      * @since 4.10.0
      */
-    static @NotNull LocalPos localPos(final double left, final double up, final double forwards) {
+    static LocalPos localPos(final double left, final double up, final double forwards) {
       return new BlockNBTComponentImpl.LocalPosImpl(left, up, forwards);
     }
 
@@ -285,7 +286,7 @@ interface LocalPos extends Pos {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    static @NotNull LocalPos of(final double left, final double up, final double forwards) {
+    static LocalPos of(final double left, final double up, final double forwards) {
       return new BlockNBTComponentImpl.LocalPosImpl(left, up, forwards);
     }
 
@@ -329,7 +330,7 @@ interface WorldPos extends Pos {
      * @return a world position
      * @since 4.10.0
      */
-    static @NotNull WorldPos worldPos(final @NotNull Coordinate x, final @NotNull Coordinate y, final @NotNull Coordinate z) {
+    static WorldPos worldPos(final Coordinate x, final Coordinate y, final Coordinate z) {
       return new BlockNBTComponentImpl.WorldPosImpl(x, y, z);
     }
 
@@ -345,7 +346,7 @@ interface WorldPos extends Pos {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    static @NotNull WorldPos of(final @NotNull Coordinate x, final @NotNull Coordinate y, final @NotNull Coordinate z) {
+    static WorldPos of(final Coordinate x, final Coordinate y, final Coordinate z) {
       return new BlockNBTComponentImpl.WorldPosImpl(x, y, z);
     }
 
@@ -355,7 +356,7 @@ interface WorldPos extends Pos {
      * @return the x coordinate
      * @since 4.0.0
      */
-    @NotNull Coordinate x();
+    Coordinate x();
 
     /**
      * Gets the y coordinate.
@@ -363,7 +364,7 @@ interface WorldPos extends Pos {
      * @return the y coordinate
      * @since 4.0.0
      */
-    @NotNull Coordinate y();
+    Coordinate y();
 
     /**
      * Gets the z coordinate.
@@ -371,7 +372,7 @@ interface WorldPos extends Pos {
      * @return the z coordinate
      * @since 4.0.0
      */
-    @NotNull Coordinate z();
+    Coordinate z();
 
     /**
      * A coordinate component within a {@link WorldPos}.
@@ -386,7 +387,7 @@ interface Coordinate extends Examinable {
        * @return a coordinate
        * @since 4.0.0
        */
-      static @NotNull Coordinate absolute(final int value) {
+      static Coordinate absolute(final int value) {
         return coordinate(value, Type.ABSOLUTE);
       }
 
@@ -397,7 +398,7 @@ interface Coordinate extends Examinable {
        * @return a coordinate
        * @since 4.0.0
        */
-      static @NotNull Coordinate relative(final int value) {
+      static Coordinate relative(final int value) {
         return coordinate(value, Type.RELATIVE);
       }
 
@@ -409,7 +410,7 @@ interface Coordinate extends Examinable {
        * @return a coordinate
        * @since 4.10.0
        */
-      static @NotNull Coordinate coordinate(final int value, final @NotNull Type type) {
+      static Coordinate coordinate(final int value, final Type type) {
         return new BlockNBTComponentImpl.WorldPosImpl.CoordinateImpl(value, type);
       }
 
@@ -424,7 +425,7 @@ interface Coordinate extends Examinable {
        */
       @Deprecated
       @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-      static @NotNull Coordinate of(final int value, final @NotNull Type type) {
+      static Coordinate of(final int value, final Type type) {
         return new BlockNBTComponentImpl.WorldPosImpl.CoordinateImpl(value, type);
       }
 
@@ -442,7 +443,7 @@ interface Coordinate extends Examinable {
        * @return the type
        * @since 4.0.0
        */
-      @NotNull Type type();
+      Type type();
 
       /**
        * The type of a coordinate.
diff --git a/api/src/main/java/net/kyori/adventure/text/BlockNBTComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/BlockNBTComponentImpl.java
index e653f27de3..14124cbe2c 100644
--- a/api/src/main/java/net/kyori/adventure/text/BlockNBTComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/BlockNBTComponentImpl.java
@@ -31,15 +31,16 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.util.ShadyPines;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class BlockNBTComponentImpl extends NBTComponentImpl<BlockNBTComponent, BlockNBTComponent.Builder> implements BlockNBTComponent {
   private final Pos pos;
 
-  static BlockNBTComponent create(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style, final String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final @NotNull Pos pos) {
+  static BlockNBTComponent create(final List<? extends ComponentLike> children, final Style style, final String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final Pos pos) {
     return new BlockNBTComponentImpl(
       ComponentLike.asComponents(children, IS_NOT_EMPTY),
       requireNonNull(style, "style"),
@@ -50,19 +51,19 @@ static BlockNBTComponent create(final @NotNull List<? extends ComponentLike> chi
     );
   }
 
-  BlockNBTComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final String nbtPath, final boolean interpret, final @Nullable Component separator, final @NotNull Pos pos) {
+  BlockNBTComponentImpl(final List<Component> children, final Style style, final String nbtPath, final boolean interpret, final @Nullable Component separator, final Pos pos) {
     super(children, style, nbtPath, interpret, separator);
     this.pos = pos;
   }
 
   @Override
-  public @NotNull BlockNBTComponent nbtPath(final @NotNull String nbtPath) {
+  public BlockNBTComponent nbtPath(final String nbtPath) {
     if (Objects.equals(this.nbtPath, nbtPath)) return this;
     return create(this.children, this.style, nbtPath, this.interpret, this.separator, this.pos);
   }
 
   @Override
-  public @NotNull BlockNBTComponent interpret(final boolean interpret) {
+  public BlockNBTComponent interpret(final boolean interpret) {
     if (this.interpret == interpret) return this;
     return create(this.children, this.style, this.nbtPath, interpret, this.separator, this.pos);
   }
@@ -73,27 +74,27 @@ static BlockNBTComponent create(final @NotNull List<? extends ComponentLike> chi
   }
 
   @Override
-  public @NotNull BlockNBTComponent separator(final @Nullable ComponentLike separator) {
+  public BlockNBTComponent separator(final @Nullable ComponentLike separator) {
     return create(this.children, this.style, this.nbtPath, this.interpret, separator, this.pos);
   }
 
   @Override
-  public @NotNull Pos pos() {
+  public Pos pos() {
     return this.pos;
   }
 
   @Override
-  public @NotNull BlockNBTComponent pos(final @NotNull Pos pos) {
+  public BlockNBTComponent pos(final Pos pos) {
     return create(this.children, this.style, this.nbtPath, this.interpret, this.separator, pos);
   }
 
   @Override
-  public @NotNull BlockNBTComponent children(final @NotNull List<? extends ComponentLike> children) {
+  public BlockNBTComponent children(final List<? extends ComponentLike> children) {
     return create(children, this.style, this.nbtPath, this.interpret, this.separator, this.pos);
   }
 
   @Override
-  public @NotNull BlockNBTComponent style(final @NotNull Style style) {
+  public BlockNBTComponent style(final Style style) {
     return create(this.children, style, this.nbtPath, this.interpret, this.separator, this.pos);
   }
 
@@ -119,7 +120,7 @@ public String toString() {
   }
 
   @Override
-  public BlockNBTComponent.@NotNull Builder toBuilder() {
+  public BlockNBTComponent.Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -129,19 +130,19 @@ static final class BuilderImpl extends AbstractNBTComponentBuilder<BlockNBTCompo
     BuilderImpl() {
     }
 
-    BuilderImpl(final @NotNull BlockNBTComponent component) {
+    BuilderImpl(final BlockNBTComponent component) {
       super(component);
       this.pos = component.pos();
     }
 
     @Override
-    public BlockNBTComponent.@NotNull Builder pos(final @NotNull Pos pos) {
+    public BlockNBTComponent.Builder pos(final Pos pos) {
       this.pos = requireNonNull(pos, "pos");
       return this;
     }
 
     @Override
-    public @NotNull BlockNBTComponent build() {
+    public BlockNBTComponent build() {
       if (this.nbtPath == null) throw new IllegalStateException("nbt path must be set");
       if (this.pos == null) throw new IllegalStateException("pos must be set");
       return create(this.children, this.buildStyle(), this.nbtPath, this.interpret, this.separator, this.pos);
@@ -175,7 +176,7 @@ public double forwards() {
     }
 
     @Override
-    public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    public Stream<? extends ExaminableProperty> examinableProperties() {
       return Stream.of(
         ExaminableProperty.of("left", this.left),
         ExaminableProperty.of("up", this.up),
@@ -207,7 +208,7 @@ public String toString() {
     }
 
     @Override
-    public @NotNull String asString() {
+    public String asString() {
       return Tokens.serializeLocal(this.left) + ' ' + Tokens.serializeLocal(this.up) + ' ' + Tokens.serializeLocal(this.forwards);
     }
   }
@@ -224,22 +225,22 @@ static final class WorldPosImpl implements WorldPos {
     }
 
     @Override
-    public @NotNull Coordinate x() {
+    public Coordinate x() {
       return this.x;
     }
 
     @Override
-    public @NotNull Coordinate y() {
+    public Coordinate y() {
       return this.y;
     }
 
     @Override
-    public @NotNull Coordinate z() {
+    public Coordinate z() {
       return this.z;
     }
 
     @Override
-    public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    public Stream<? extends ExaminableProperty> examinableProperties() {
       return Stream.of(
         ExaminableProperty.of("x", this.x),
         ExaminableProperty.of("y", this.y),
@@ -271,7 +272,7 @@ public String toString() {
     }
 
     @Override
-    public @NotNull String asString() {
+    public String asString() {
       return Tokens.serializeCoordinate(this.x()) + ' ' + Tokens.serializeCoordinate(this.y()) + ' ' + Tokens.serializeCoordinate(this.z());
     }
 
@@ -279,7 +280,7 @@ static final class CoordinateImpl implements Coordinate {
       private final int value;
       private final Type type;
 
-      CoordinateImpl(final int value, final @NotNull Type type) {
+      CoordinateImpl(final int value, final Type type) {
         this.value = value;
         this.type = requireNonNull(type, "type");
       }
@@ -290,12 +291,12 @@ public int value() {
       }
 
       @Override
-      public @NotNull Type type() {
+      public Type type() {
         return this.type;
       }
 
       @Override
-      public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+      public Stream<? extends ExaminableProperty> examinableProperties() {
         return Stream.of(
           ExaminableProperty.of("value", this.value),
           ExaminableProperty.of("type", this.type)
diff --git a/api/src/main/java/net/kyori/adventure/text/BuildableComponent.java b/api/src/main/java/net/kyori/adventure/text/BuildableComponent.java
index 9198a9d801..4c8ee906c8 100644
--- a/api/src/main/java/net/kyori/adventure/text/BuildableComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/BuildableComponent.java
@@ -24,7 +24,7 @@
 package net.kyori.adventure.text;
 
 import net.kyori.adventure.util.Buildable;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A component which may be built.
@@ -33,6 +33,7 @@
  * @param <B> the builder type
  * @since 4.0.0
  */
+@NullMarked
 public interface BuildableComponent<C extends BuildableComponent<C, B>, B extends ComponentBuilder<C, B>> extends Buildable<C, B>, Component {
   /**
    * Create a builder from this component.
@@ -40,5 +41,5 @@ public interface BuildableComponent<C extends BuildableComponent<C, B>, B extend
    * @return the builder
    */
   @Override
-  @NotNull B toBuilder();
+  B toBuilder();
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/Component.java b/api/src/main/java/net/kyori/adventure/text/Component.java
index dd7e5d0622..5c7cdd5295 100644
--- a/api/src/main/java/net/kyori/adventure/text/Component.java
+++ b/api/src/main/java/net/kyori/adventure/text/Component.java
@@ -60,9 +60,9 @@
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -107,6 +107,7 @@
  * @since 4.0.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface Component extends ComponentBuilderApplicable, ComponentLike, Examinable, HoverEventSource<Component>, StyleGetter, StyleSetter<Component> {
   /**
    * A predicate that checks equality of two {@code Component}s using {@link Objects#equals(Object, Object)}.
@@ -133,7 +134,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @return an empty component
    * @since 4.0.0
    */
-  static @NotNull TextComponent empty() {
+  static TextComponent empty() {
     return TextComponentImpl.EMPTY;
   }
 
@@ -143,7 +144,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @return a text component with a new line character as the content
    * @since 4.0.0
    */
-  static @NotNull TextComponent newline() {
+  static TextComponent newline() {
     return TextComponentImpl.NEWLINE;
   }
 
@@ -153,7 +154,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @return a text component with a single space as the content
    * @since 4.0.0
    */
-  static @NotNull TextComponent space() {
+  static TextComponent space() {
     return TextComponentImpl.SPACE;
   }
 
@@ -169,7 +170,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent join(final @NotNull ComponentLike separator, final @NotNull ComponentLike@NotNull... components) {
+  static TextComponent join(final ComponentLike separator, final ComponentLike... components) {
     return join(separator, Arrays.asList(components));
   }
 
@@ -185,7 +186,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent join(final @NotNull ComponentLike separator, final Iterable<? extends ComponentLike> components) {
+  static TextComponent join(final ComponentLike separator, final Iterable<? extends ComponentLike> components) {
     final Component component = join(JoinConfiguration.separator(separator), components);
 
     if (component instanceof TextComponent) return (TextComponent) component;
@@ -204,7 +205,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.14.0
    */
   @Contract(pure = true)
-  static @NotNull Component join(final JoinConfiguration.@NotNull Builder configBuilder, final @NotNull ComponentLike@NotNull... components) {
+  static Component join(final JoinConfiguration.Builder configBuilder, final ComponentLike... components) {
     return join(configBuilder, Arrays.asList(components));
   }
 
@@ -220,7 +221,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.14.0
    */
   @Contract(pure = true)
-  static @NotNull Component join(final JoinConfiguration.@NotNull Builder configBuilder, final @NotNull Iterable<? extends ComponentLike> components) {
+  static Component join(final JoinConfiguration.Builder configBuilder, final Iterable<? extends ComponentLike> components) {
     return JoinConfigurationImpl.join(configBuilder.build(), components);
   }
 
@@ -236,7 +237,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.9.0
    */
   @Contract(pure = true)
-  static @NotNull Component join(final @NotNull JoinConfiguration config, final @NotNull ComponentLike@NotNull... components) {
+  static Component join(final JoinConfiguration config, final ComponentLike... components) {
     return join(config, Arrays.asList(components));
   }
 
@@ -252,7 +253,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.9.0
    */
   @Contract(pure = true)
-  static @NotNull Component join(final @NotNull JoinConfiguration config, final @NotNull Iterable<? extends ComponentLike> components) {
+  static Component join(final JoinConfiguration config, final Iterable<? extends ComponentLike> components) {
     return JoinConfigurationImpl.join(config, components);
   }
 
@@ -262,7 +263,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @return a collector that can join components
    * @since 4.6.0
    */
-  static @NotNull Collector<Component, ? extends ComponentBuilder<?, ?>, Component> toComponent() {
+  static Collector<Component, ? extends ComponentBuilder<?, ?>, Component> toComponent() {
     return toComponent(Component.empty());
   }
 
@@ -273,7 +274,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @return a collector that can join components
    * @since 4.6.0
    */
-  static @NotNull Collector<Component, ? extends ComponentBuilder<?, ?>, Component> toComponent(final @NotNull Component separator) {
+  static Collector<Component, ? extends ComponentBuilder<?, ?>, Component> toComponent(final Component separator) {
     return Collector.of(
       Component::text,
       (builder, add) -> {
@@ -307,7 +308,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static BlockNBTComponent.@NotNull Builder blockNBT() {
+  static BlockNBTComponent.Builder blockNBT() {
     return new BlockNBTComponentImpl.BuilderImpl();
   }
 
@@ -319,7 +320,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_ -> new")
-  static @NotNull BlockNBTComponent blockNBT(final @NotNull Consumer<? super BlockNBTComponent.Builder> consumer) {
+  static BlockNBTComponent blockNBT(final Consumer<? super BlockNBTComponent.Builder> consumer) {
     return AbstractBuilder.configureAndBuild(blockNBT(), consumer);
   }
 
@@ -332,7 +333,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull BlockNBTComponent blockNBT(final @NotNull String nbtPath, final BlockNBTComponent.@NotNull Pos pos) {
+  static BlockNBTComponent blockNBT(final String nbtPath, final BlockNBTComponent.Pos pos) {
     return blockNBT(nbtPath, NBTComponentImpl.INTERPRET_DEFAULT, pos);
   }
 
@@ -346,7 +347,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull BlockNBTComponent blockNBT(final @NotNull String nbtPath, final boolean interpret, final BlockNBTComponent.@NotNull Pos pos) {
+  static BlockNBTComponent blockNBT(final String nbtPath, final boolean interpret, final BlockNBTComponent.Pos pos) {
     return blockNBT(nbtPath, interpret, null, pos);
   }
 
@@ -361,7 +362,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull BlockNBTComponent blockNBT(final @NotNull String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final BlockNBTComponent.@NotNull Pos pos) {
+  static BlockNBTComponent blockNBT(final String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final BlockNBTComponent.Pos pos) {
     return BlockNBTComponentImpl.create(Collections.emptyList(), Style.empty(), nbtPath, interpret, separator, pos);
   }
 
@@ -378,7 +379,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static EntityNBTComponent.@NotNull Builder entityNBT() {
+  static EntityNBTComponent.Builder entityNBT() {
     return new EntityNBTComponentImpl.BuilderImpl();
   }
 
@@ -390,7 +391,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_ -> new")
-  static @NotNull EntityNBTComponent entityNBT(final @NotNull Consumer<? super EntityNBTComponent.Builder> consumer) {
+  static EntityNBTComponent entityNBT(final Consumer<? super EntityNBTComponent.Builder> consumer) {
     return AbstractBuilder.configureAndBuild(entityNBT(), consumer);
   }
 
@@ -403,7 +404,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_, _ -> new")
-  static @NotNull EntityNBTComponent entityNBT(final @NotNull String nbtPath, final @NotNull String selector) {
+  static EntityNBTComponent entityNBT(final String nbtPath, final String selector) {
     return entityNBT().nbtPath(nbtPath).selector(selector).build();
   }
 
@@ -420,7 +421,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static KeybindComponent.@NotNull Builder keybind() {
+  static KeybindComponent.Builder keybind() {
     return new KeybindComponentImpl.BuilderImpl();
   }
 
@@ -432,7 +433,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_ -> new")
-  static @NotNull KeybindComponent keybind(final @NotNull Consumer<? super KeybindComponent.Builder> consumer) {
+  static KeybindComponent keybind(final Consumer<? super KeybindComponent.Builder> consumer) {
     return AbstractBuilder.configureAndBuild(keybind(), consumer);
   }
 
@@ -444,7 +445,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final @NotNull String keybind) {
+  static KeybindComponent keybind(final String keybind) {
     return keybind(keybind, Style.empty());
   }
 
@@ -456,7 +457,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.9.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final KeybindComponent.@NotNull KeybindLike keybind) {
+  static KeybindComponent keybind(final KeybindComponent.KeybindLike keybind) {
     return keybind(requireNonNull(keybind, "keybind").asKeybind(), Style.empty());
   }
 
@@ -469,7 +470,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final @NotNull String keybind, final @NotNull Style style) {
+  static KeybindComponent keybind(final String keybind, final Style style) {
     return KeybindComponentImpl.create(Collections.emptyList(), requireNonNull(style, "style"), keybind);
   }
 
@@ -482,7 +483,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.9.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final KeybindComponent.@NotNull KeybindLike keybind, final @NotNull Style style) {
+  static KeybindComponent keybind(final KeybindComponent.KeybindLike keybind, final Style style) {
     return KeybindComponentImpl.create(Collections.emptyList(), requireNonNull(style, "style"), requireNonNull(keybind, "keybind").asKeybind());
   }
 
@@ -495,7 +496,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final @NotNull String keybind, final @Nullable TextColor color) {
+  static KeybindComponent keybind(final String keybind, final @Nullable TextColor color) {
     return keybind(keybind, Style.style(color));
   }
 
@@ -508,7 +509,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.9.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final KeybindComponent.@NotNull KeybindLike keybind, final @Nullable TextColor color) {
+  static KeybindComponent keybind(final KeybindComponent.KeybindLike keybind, final @Nullable TextColor color) {
     return keybind(requireNonNull(keybind, "keybind").asKeybind(), Style.style(color));
   }
 
@@ -522,7 +523,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final @NotNull String keybind, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static KeybindComponent keybind(final String keybind, final @Nullable TextColor color, final TextDecoration... decorations) {
     return keybind(keybind, Style.style(color, decorations));
   }
 
@@ -536,7 +537,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.9.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final KeybindComponent.@NotNull KeybindLike keybind, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static KeybindComponent keybind(final KeybindComponent.KeybindLike keybind, final @Nullable TextColor color, final TextDecoration... decorations) {
     return keybind(requireNonNull(keybind, "keybind").asKeybind(), Style.style(color, decorations));
   }
 
@@ -550,7 +551,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final @NotNull String keybind, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static KeybindComponent keybind(final String keybind, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return keybind(keybind, Style.style(color, decorations));
   }
 
@@ -564,7 +565,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.9.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull KeybindComponent keybind(final KeybindComponent.@NotNull KeybindLike keybind, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static KeybindComponent keybind(final KeybindComponent.KeybindLike keybind, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return keybind(requireNonNull(keybind, "keybind").asKeybind(), Style.style(color, decorations));
   }
 
@@ -581,7 +582,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static ScoreComponent.@NotNull Builder score() {
+  static ScoreComponent.Builder score() {
     return new ScoreComponentImpl.BuilderImpl();
   }
 
@@ -593,7 +594,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_ -> new")
-  static @NotNull ScoreComponent score(final @NotNull Consumer<? super ScoreComponent.Builder> consumer) {
+  static ScoreComponent score(final Consumer<? super ScoreComponent.Builder> consumer) {
     return AbstractBuilder.configureAndBuild(score(), consumer);
   }
 
@@ -606,7 +607,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull ScoreComponent score(final @NotNull String name, final @NotNull String objective) {
+  static ScoreComponent score(final String name, final String objective) {
     return score(name, objective, null);
   }
 
@@ -622,7 +623,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    */
   @Contract(value = "_, _, _ -> new", pure = true)
   @Deprecated
-  static @NotNull ScoreComponent score(final @NotNull String name, final @NotNull String objective, final @Nullable String value) {
+  static ScoreComponent score(final String name, final String objective, final @Nullable String value) {
     return ScoreComponentImpl.create(Collections.emptyList(), Style.empty(), name, objective, value);
   }
 
@@ -639,7 +640,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static SelectorComponent.@NotNull Builder selector() {
+  static SelectorComponent.Builder selector() {
     return new SelectorComponentImpl.BuilderImpl();
   }
 
@@ -651,7 +652,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_ -> new")
-  static @NotNull SelectorComponent selector(final @NotNull Consumer<? super SelectorComponent.Builder> consumer) {
+  static SelectorComponent selector(final Consumer<? super SelectorComponent.Builder> consumer) {
     return AbstractBuilder.configureAndBuild(selector(), consumer);
   }
 
@@ -663,7 +664,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull SelectorComponent selector(final @NotNull String pattern) {
+  static SelectorComponent selector(final String pattern) {
     return selector(pattern, null);
   }
 
@@ -676,7 +677,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull SelectorComponent selector(final @NotNull String pattern, final @Nullable ComponentLike separator) {
+  static SelectorComponent selector(final String pattern, final @Nullable ComponentLike separator) {
     return SelectorComponentImpl.create(Collections.emptyList(), Style.empty(), pattern, separator);
   }
 
@@ -693,7 +694,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static StorageNBTComponent.@NotNull Builder storageNBT() {
+  static StorageNBTComponent.Builder storageNBT() {
     return new StorageNBTComponentImpl.BuilderImpl();
   }
 
@@ -705,7 +706,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_ -> new")
-  static @NotNull StorageNBTComponent storageNBT(final @NotNull Consumer<? super StorageNBTComponent.Builder> consumer) {
+  static StorageNBTComponent storageNBT(final Consumer<? super StorageNBTComponent.Builder> consumer) {
     return AbstractBuilder.configureAndBuild(storageNBT(), consumer);
   }
 
@@ -718,7 +719,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull StorageNBTComponent storageNBT(final @NotNull String nbtPath, final @NotNull Key storage) {
+  static StorageNBTComponent storageNBT(final String nbtPath, final Key storage) {
     return storageNBT(nbtPath, NBTComponentImpl.INTERPRET_DEFAULT, storage);
   }
 
@@ -732,7 +733,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull StorageNBTComponent storageNBT(final @NotNull String nbtPath, final boolean interpret, final @NotNull Key storage) {
+  static StorageNBTComponent storageNBT(final String nbtPath, final boolean interpret, final Key storage) {
     return storageNBT(nbtPath, interpret, null, storage);
   }
 
@@ -747,7 +748,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull StorageNBTComponent storageNBT(final @NotNull String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final @NotNull Key storage) {
+  static StorageNBTComponent storageNBT(final String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final Key storage) {
     return StorageNBTComponentImpl.create(Collections.emptyList(), Style.empty(), nbtPath, interpret, separator, storage);
   }
 
@@ -764,7 +765,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static TextComponent.@NotNull Builder text() {
+  static TextComponent.Builder text() {
     return new TextComponentImpl.BuilderImpl();
   }
 
@@ -775,7 +776,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @return a text component
    * @since 4.10.0
    */
-  static @NotNull TextComponent textOfChildren(final @NotNull ComponentLike@NotNull... components) {
+  static TextComponent textOfChildren(final ComponentLike... components) {
     if (components.length == 0) return empty();
     return TextComponentImpl.create(Arrays.asList(components), Style.empty(), "");
   }
@@ -788,7 +789,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_ -> new")
-  static @NotNull TextComponent text(final @NotNull Consumer<? super TextComponent.Builder> consumer) {
+  static TextComponent text(final Consumer<? super TextComponent.Builder> consumer) {
     return AbstractBuilder.configureAndBuild(text(), consumer);
   }
 
@@ -800,7 +801,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull TextComponent text(final @NotNull String content) {
+  static TextComponent text(final String content) {
     if (content.isEmpty()) return empty();
     return text(content, Style.empty());
   }
@@ -814,7 +815,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final @NotNull String content, final @NotNull Style style) {
+  static TextComponent text(final String content, final Style style) {
     return TextComponentImpl.create(Collections.emptyList(), requireNonNull(style, "style"), content);
   }
 
@@ -827,7 +828,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final @NotNull String content, final @Nullable TextColor color) {
+  static TextComponent text(final String content, final @Nullable TextColor color) {
     return text(content, Style.style(color));
   }
 
@@ -841,7 +842,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final @NotNull String content, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TextComponent text(final String content, final @Nullable TextColor color, final TextDecoration... decorations) {
     return text(content, Style.style(color, decorations));
   }
 
@@ -855,7 +856,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final @NotNull String content, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TextComponent text(final String content, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return text(content, Style.style(color, decorations));
   }
 
@@ -867,7 +868,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull TextComponent text(final boolean value) {
+  static TextComponent text(final boolean value) {
     return text(String.valueOf(value));
   }
 
@@ -880,7 +881,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final boolean value, final @NotNull Style style) {
+  static TextComponent text(final boolean value, final Style style) {
     return text(String.valueOf(value), style);
   }
 
@@ -893,7 +894,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final boolean value, final @Nullable TextColor color) {
+  static TextComponent text(final boolean value, final @Nullable TextColor color) {
     return text(String.valueOf(value), color);
   }
 
@@ -907,7 +908,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final boolean value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TextComponent text(final boolean value, final @Nullable TextColor color, final TextDecoration... decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -921,7 +922,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final boolean value, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TextComponent text(final boolean value, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -933,7 +934,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static @NotNull TextComponent text(final char value) {
+  static TextComponent text(final char value) {
     if (value == '\n') return newline();
     if (value == ' ') return space();
     return text(String.valueOf(value));
@@ -948,7 +949,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final char value, final @NotNull Style style) {
+  static TextComponent text(final char value, final Style style) {
     return text(String.valueOf(value), style);
   }
 
@@ -961,7 +962,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final char value, final @Nullable TextColor color) {
+  static TextComponent text(final char value, final @Nullable TextColor color) {
     return text(String.valueOf(value), color);
   }
 
@@ -975,7 +976,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final char value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TextComponent text(final char value, final @Nullable TextColor color, final TextDecoration... decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -989,7 +990,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final char value, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TextComponent text(final char value, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1001,7 +1002,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull TextComponent text(final double value) {
+  static TextComponent text(final double value) {
     return text(String.valueOf(value));
   }
 
@@ -1014,7 +1015,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final double value, final @NotNull Style style) {
+  static TextComponent text(final double value, final Style style) {
     return text(String.valueOf(value), style);
   }
 
@@ -1027,7 +1028,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final double value, final @Nullable TextColor color) {
+  static TextComponent text(final double value, final @Nullable TextColor color) {
     return text(String.valueOf(value), color);
   }
 
@@ -1041,7 +1042,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final double value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TextComponent text(final double value, final @Nullable TextColor color, final TextDecoration... decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1055,7 +1056,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final double value, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TextComponent text(final double value, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1067,7 +1068,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull TextComponent text(final float value) {
+  static TextComponent text(final float value) {
     return text(String.valueOf(value));
   }
 
@@ -1080,7 +1081,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final float value, final @NotNull Style style) {
+  static TextComponent text(final float value, final Style style) {
     return text(String.valueOf(value), style);
   }
 
@@ -1093,7 +1094,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final float value, final @Nullable TextColor color) {
+  static TextComponent text(final float value, final @Nullable TextColor color) {
     return text(String.valueOf(value), color);
   }
 
@@ -1107,7 +1108,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final float value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TextComponent text(final float value, final @Nullable TextColor color, final TextDecoration... decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1121,7 +1122,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final float value, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TextComponent text(final float value, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1133,7 +1134,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull TextComponent text(final int value) {
+  static TextComponent text(final int value) {
     return text(String.valueOf(value));
   }
 
@@ -1146,7 +1147,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final int value, final @NotNull Style style) {
+  static TextComponent text(final int value, final Style style) {
     return text(String.valueOf(value), style);
   }
 
@@ -1159,7 +1160,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final int value, final @Nullable TextColor color) {
+  static TextComponent text(final int value, final @Nullable TextColor color) {
     return text(String.valueOf(value), color);
   }
 
@@ -1173,7 +1174,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final int value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TextComponent text(final int value, final @Nullable TextColor color, final TextDecoration... decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1187,7 +1188,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final int value, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TextComponent text(final int value, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1199,7 +1200,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull TextComponent text(final long value) {
+  static TextComponent text(final long value) {
     return text(String.valueOf(value));
   }
 
@@ -1212,7 +1213,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final long value, final @NotNull Style style) {
+  static TextComponent text(final long value, final Style style) {
     return text(String.valueOf(value), style);
   }
 
@@ -1225,7 +1226,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TextComponent text(final long value, final @Nullable TextColor color) {
+  static TextComponent text(final long value, final @Nullable TextColor color) {
     return text(String.valueOf(value), color);
   }
 
@@ -1239,7 +1240,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final long value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TextComponent text(final long value, final @Nullable TextColor color, final TextDecoration... decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1253,7 +1254,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TextComponent text(final long value, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TextComponent text(final long value, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return text(String.valueOf(value), color, decorations);
   }
 
@@ -1270,7 +1271,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(pure = true)
-  static TranslatableComponent.@NotNull Builder translatable() {
+  static TranslatableComponent.Builder translatable() {
     return new TranslatableComponentImpl.BuilderImpl();
   }
 
@@ -1282,7 +1283,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract("_ -> new")
-  static @NotNull TranslatableComponent translatable(final @NotNull Consumer<? super TranslatableComponent.Builder> consumer) {
+  static TranslatableComponent translatable(final Consumer<? super TranslatableComponent.Builder> consumer) {
     return AbstractBuilder.configureAndBuild(translatable(), consumer);
   }
 
@@ -1294,7 +1295,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key) {
+  static TranslatableComponent translatable(final String key) {
     return translatable(key, Style.empty());
   }
 
@@ -1306,7 +1307,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable) {
+  static TranslatableComponent translatable(final Translatable translatable) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), Style.empty());
   }
 
@@ -1320,7 +1321,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable String fallback) {
+  static TranslatableComponent translatable(final String key, final @Nullable String fallback) {
     return translatable(key, fallback, Style.empty());
   }
 
@@ -1334,7 +1335,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable String fallback) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable String fallback) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), fallback, Style.empty());
   }
 
@@ -1347,7 +1348,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull Style style) {
+  static TranslatableComponent translatable(final String key, final Style style) {
     return TranslatableComponentImpl.create(Collections.emptyList(), requireNonNull(style, "style"), key, null, Collections.emptyList());
   }
 
@@ -1360,7 +1361,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull Style style) {
+  static TranslatableComponent translatable(final Translatable translatable, final Style style) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), style);
   }
 
@@ -1375,7 +1376,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable String fallback, final @NotNull Style style) {
+  static TranslatableComponent translatable(final String key, final @Nullable String fallback, final Style style) {
     return TranslatableComponentImpl.create(Collections.emptyList(), requireNonNull(style, "style"), key, fallback, Collections.emptyList());
   }
 
@@ -1390,7 +1391,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable String fallback, final @NotNull Style style) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable String fallback, final Style style) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), fallback, style);
   }
 
@@ -1405,7 +1406,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable String fallback, final @NotNull StyleBuilderApplicable... style) {
+  static TranslatableComponent translatable(final String key, final @Nullable String fallback, final StyleBuilderApplicable... style) {
     return translatable(requireNonNull(key, "key"), fallback, Style.style(style));
   }
 
@@ -1420,7 +1421,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable String fallback, final @NotNull Iterable<StyleBuilderApplicable> style) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable String fallback, final Iterable<StyleBuilderApplicable> style) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), fallback, Style.style(style));
   }
 
@@ -1435,7 +1436,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable String fallback, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final String key, final @Nullable String fallback, final ComponentLike... args) {
     return translatable(key, fallback, Style.empty(), args);
   }
 
@@ -1450,7 +1451,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable String fallback, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable String fallback, final ComponentLike... args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), fallback, args);
   }
 
@@ -1466,7 +1467,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable String fallback, final @NotNull Style style, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final String key, final @Nullable String fallback, final Style style, final ComponentLike... args) {
     return TranslatableComponentImpl.create(Collections.emptyList(), requireNonNull(style, "style"), key, fallback, requireNonNull(args, "args"));
   }
 
@@ -1482,7 +1483,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable String fallback, final @NotNull Style style, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable String fallback, final Style style, final ComponentLike... args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), fallback, style, args);
   }
 
@@ -1498,7 +1499,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable String fallback, final @NotNull Style style, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final String key, final @Nullable String fallback, final Style style, final List<? extends ComponentLike> args) {
     return TranslatableComponentImpl.create(Collections.emptyList(), style, key, fallback, requireNonNull(args, "args"));
   }
 
@@ -1514,7 +1515,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable String fallback, final @NotNull Style style, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable String fallback, final Style style, final List<? extends ComponentLike> args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), fallback, style, args);
   }
 
@@ -1530,7 +1531,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable String fallback, final @NotNull List<? extends ComponentLike> args, final @NotNull Iterable<StyleBuilderApplicable> style) {
+  static TranslatableComponent translatable(final String key, final @Nullable String fallback, final List<? extends ComponentLike> args, final Iterable<StyleBuilderApplicable> style) {
     return TranslatableComponentImpl.create(Collections.emptyList(), Style.style(style), key, fallback, requireNonNull(args, "args"));
   }
 
@@ -1546,7 +1547,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable String fallback, final @NotNull List<? extends ComponentLike> args, final @NotNull Iterable<StyleBuilderApplicable> style) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable String fallback, final List<? extends ComponentLike> args, final Iterable<StyleBuilderApplicable> style) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), fallback, args, style);
   }
 
@@ -1562,7 +1563,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable String fallback, final @NotNull List<? extends ComponentLike> args, final @NotNull StyleBuilderApplicable... style) {
+  static TranslatableComponent translatable(final String key, final @Nullable String fallback, final List<? extends ComponentLike> args, final StyleBuilderApplicable... style) {
     return TranslatableComponentImpl.create(Collections.emptyList(), Style.style(style), key, fallback, requireNonNull(args, "args"));
   }
 
@@ -1578,7 +1579,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @sinceMinecraft 1.19.4
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable String fallback, final @NotNull List<? extends ComponentLike> args, final @NotNull StyleBuilderApplicable... style) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable String fallback, final List<? extends ComponentLike> args, final StyleBuilderApplicable... style) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), fallback, args, style);
   }
 
@@ -1591,7 +1592,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color) {
+  static TranslatableComponent translatable(final String key, final @Nullable TextColor color) {
     return translatable(key, Style.style(color));
   }
 
@@ -1604,7 +1605,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable TextColor color) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), color);
   }
 
@@ -1618,7 +1619,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TranslatableComponent translatable(final String key, final @Nullable TextColor color, final TextDecoration... decorations) {
     return translatable(key, Style.style(color, decorations));
   }
 
@@ -1632,7 +1633,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable TextColor color, final TextDecoration... decorations) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), color, decorations);
   }
 
@@ -1646,7 +1647,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TranslatableComponent translatable(final String key, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return translatable(key, Style.style(color, decorations));
   }
 
@@ -1660,7 +1661,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), color, decorations);
   }
 
@@ -1673,7 +1674,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final String key, final ComponentLike... args) {
     return translatable(key, Style.empty(), args);
   }
 
@@ -1686,7 +1687,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final Translatable translatable, final ComponentLike... args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), args);
   }
 
@@ -1700,7 +1701,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull Style style, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final String key, final Style style, final ComponentLike... args) {
     return TranslatableComponentImpl.create(Collections.emptyList(), requireNonNull(style, "style"), key, null, requireNonNull(args, "args"));
   }
 
@@ -1714,7 +1715,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull Style style, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final Translatable translatable, final Style style, final ComponentLike... args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), style, args);
   }
 
@@ -1728,7 +1729,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final String key, final @Nullable TextColor color, final ComponentLike... args) {
     return translatable(key, Style.style(color), args);
   }
 
@@ -1742,7 +1743,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable TextColor color, final ComponentLike... args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), color, args);
   }
 
@@ -1757,7 +1758,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final String key, final @Nullable TextColor color, final Set<TextDecoration> decorations, final ComponentLike... args) {
     return translatable(key, Style.style(color, decorations), args);
   }
 
@@ -1772,7 +1773,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations, final @NotNull ComponentLike@NotNull... args) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable TextColor color, final Set<TextDecoration> decorations, final ComponentLike... args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), color, decorations, args);
   }
 
@@ -1785,7 +1786,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final String key, final List<? extends ComponentLike> args) {
     return TranslatableComponentImpl.create(Collections.emptyList(), Style.empty(), key, null, requireNonNull(args, "args"));
   }
 
@@ -1798,7 +1799,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final Translatable translatable, final List<? extends ComponentLike> args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), args);
   }
 
@@ -1812,7 +1813,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull Style style, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final String key, final Style style, final List<? extends ComponentLike> args) {
     return TranslatableComponentImpl.create(Collections.emptyList(), requireNonNull(style, "style"), key, null, requireNonNull(args, "args"));
   }
 
@@ -1826,7 +1827,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.8.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull Style style, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final Translatable translatable, final Style style, final List<? extends ComponentLike> args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), style, args);
   }
 
@@ -1840,7 +1841,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex
    * @since 4.0.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final String key, final @Nullable TextColor color, final List<? extends ComponentLike> args) {
     return translatable(key, Style.style(color), args);
   }
 
@@ -1854,7 +1855,7 @@ static TranslatableComponent translatable(final @NotNull String key, final @Null
    * @since 4.8.0
    */
   @Contract(value = "_, _, _ -> new", pure = true)
-  static TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable TextColor color, final List<? extends ComponentLike> args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), color, args);
   }
 
@@ -1869,7 +1870,7 @@ static TranslatableComponent translatable(final @NotNull Translatable translatab
    * @since 4.0.0
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final String key, final @Nullable TextColor color, final Set<TextDecoration> decorations, final List<? extends ComponentLike> args) {
     return translatable(key, Style.style(color, decorations), args);
   }
 
@@ -1884,7 +1885,7 @@ static TranslatableComponent translatable(final @NotNull Translatable translatab
    * @since 4.8.0
    */
   @Contract(value = "_, _, _, _ -> new", pure = true)
-  static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull Set<TextDecoration> decorations, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent translatable(final Translatable translatable, final @Nullable TextColor color, final Set<TextDecoration> decorations, final List<? extends ComponentLike> args) {
     return translatable(requireNonNull(translatable, "translatable").translationKey(), color, decorations, args);
   }
 
@@ -1894,7 +1895,7 @@ static TranslatableComponent translatable(final @NotNull Translatable translatab
    * @return the unmodifiable list of children
    * @since 4.0.0
    */
-  @Unmodifiable @NotNull List<Component> children();
+  @Unmodifiable List<Component> children();
 
   /**
    * Sets the list of children.
@@ -1906,7 +1907,7 @@ static TranslatableComponent translatable(final @NotNull Translatable translatab
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull Component children(final @NotNull List<? extends ComponentLike> children);
+  Component children(final List<? extends ComponentLike> children);
 
   /**
    * Checks if this component contains a component.
@@ -1919,7 +1920,7 @@ static TranslatableComponent translatable(final @NotNull Translatable translatab
    *     component, {@code false} otherwise
    * @since 4.0.0
    */
-  default boolean contains(final @NotNull Component that) {
+  default boolean contains(final Component that) {
     return this.contains(that, EQUALS_IDENTITY);
   }
 
@@ -1932,7 +1933,7 @@ default boolean contains(final @NotNull Component that) {
    *     component, {@code false} otherwise
    * @since 4.8.0
    */
-  default boolean contains(final @NotNull Component that, final @NotNull BiPredicate<? super Component, ? super Component> equals) {
+  default boolean contains(final Component that, final BiPredicate<? super Component, ? super Component> equals) {
     if (equals.test(this, that)) return true;
     for (final Component child : this.children()) {
       if (child.contains(that, equals)) return true;
@@ -1965,7 +1966,7 @@ default boolean contains(final @NotNull Component that, final @NotNull BiPredica
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
-  default void detectCycle(final @NotNull Component that) {
+  default void detectCycle(final Component that) {
     if (that.contains(this)) {
       throw new IllegalStateException("Component cycle detected between " + this + " and " + that);
     }
@@ -1979,7 +1980,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull Component append(final @NotNull Component component) {
+  default Component append(final Component component) {
     return this.append((ComponentLike) component);
   }
 
@@ -1990,7 +1991,7 @@ default void detectCycle(final @NotNull Component that) {
    * @return a component with the component added
    * @since 4.0.0
    */
-  default @NotNull Component append(final @NotNull ComponentLike like) {
+  default Component append(final ComponentLike like) {
     requireNonNull(like, "like");
     final Component component = like.asComponent();
     requireNonNull(component, "component");
@@ -2007,7 +2008,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull Component append(final @NotNull ComponentBuilder<?, ?> builder) {
+  default Component append(final ComponentBuilder<?, ?> builder) {
     return this.append(builder.build());
   }
 
@@ -2018,7 +2019,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.12.0
    */
   @Contract(pure = true)
-  default @NotNull Component appendNewline() {
+  default Component appendNewline() {
     return this.append(newline());
   }
 
@@ -2029,7 +2030,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.12.0
    */
   @Contract(pure = true)
-  default @NotNull Component appendSpace() {
+  default Component appendSpace() {
     return this.append(space());
   }
 
@@ -2043,7 +2044,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.10.0
    */
   @Contract(pure = true)
-  default @NotNull Component applyFallbackStyle(final @NotNull Style style) {
+  default Component applyFallbackStyle(final Style style) {
     Objects.requireNonNull(style, "style");
     return this.style(this.style().merge(style, Style.Merge.Strategy.IF_ABSENT_ON_TARGET));
   }
@@ -2058,7 +2059,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.10.0
    */
   @Contract(pure = true)
-  default @NotNull Component applyFallbackStyle(final @NotNull StyleBuilderApplicable@NotNull... style) {
+  default Component applyFallbackStyle(final StyleBuilderApplicable... style) {
     return this.applyFallbackStyle(Style.style(style));
   }
 
@@ -2068,7 +2069,7 @@ default void detectCycle(final @NotNull Component that) {
    * @return the style of this component
    * @since 4.0.0
    */
-  @NotNull Style style();
+  Style style();
 
   /**
    * Sets the style of this component.
@@ -2078,7 +2079,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull Component style(final @NotNull Style style);
+  Component style(final Style style);
 
   /**
    * Sets the style of this component.
@@ -2088,7 +2089,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull Component style(final @NotNull Consumer<Style.Builder> consumer) {
+  default Component style(final Consumer<Style.Builder> consumer) {
     return this.style(this.style().edit(consumer));
   }
 
@@ -2101,7 +2102,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull Component style(final @NotNull Consumer<Style.Builder> consumer, final Style.Merge.@NotNull Strategy strategy) {
+  default Component style(final Consumer<Style.Builder> consumer, final Style.Merge.Strategy strategy) {
     return this.style(this.style().edit(consumer, strategy));
   }
 
@@ -2113,7 +2114,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull Component style(final Style.@NotNull Builder style) {
+  default Component style(final Style.Builder style) {
     return this.style(style.build());
   }
 
@@ -2125,7 +2126,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull Component mergeStyle(final @NotNull Component that) {
+  default Component mergeStyle(final Component that) {
     return this.mergeStyle(that, Style.Merge.all());
   }
 
@@ -2138,7 +2139,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull Component mergeStyle(final @NotNull Component that, final Style.@NotNull Merge@NotNull... merges) {
+  default Component mergeStyle(final Component that, final Style.Merge... merges) {
     return this.mergeStyle(that, Style.Merge.merges(merges));
   }
 
@@ -2151,7 +2152,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  default @NotNull Component mergeStyle(final @NotNull Component that, final @NotNull Set<Style.Merge> merges) {
+  default Component mergeStyle(final Component that, final Set<Style.Merge> merges) {
     return this.style(this.style().merge(that.style(), merges));
   }
 
@@ -2174,7 +2175,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.10.0
    */
   @Override
-  default @NotNull Component font(final @Nullable Key key) {
+  default Component font(final @Nullable Key key) {
     return this.style(this.style().font(key));
   }
 
@@ -2198,7 +2199,7 @@ default void detectCycle(final @NotNull Component that) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component color(final @Nullable TextColor color) {
+  default Component color(final @Nullable TextColor color) {
     return this.style(this.style().color(color));
   }
 
@@ -2211,7 +2212,7 @@ default void detectCycle(final @NotNull Component that) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component colorIfAbsent(final @Nullable TextColor color) {
+  default Component colorIfAbsent(final @Nullable TextColor color) {
     if (this.color() == null) return this.color(color);
     return this;
   }
@@ -2225,7 +2226,7 @@ default void detectCycle(final @NotNull Component that) {
    * @since 4.0.0
    */
   @Override
-  default boolean hasDecoration(final @NotNull TextDecoration decoration) {
+  default boolean hasDecoration(final TextDecoration decoration) {
     return StyleGetter.super.hasDecoration(decoration);
   }
 
@@ -2238,7 +2239,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component decorate(final @NotNull TextDecoration decoration) {
+  default Component decorate(final TextDecoration decoration) {
     return StyleSetter.super.decorate(decoration);
   }
 
@@ -2252,7 +2253,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  default TextDecoration.@NotNull State decoration(final @NotNull TextDecoration decoration) {
+  default TextDecoration.State decoration(final TextDecoration decoration) {
     return this.style().decoration(decoration);
   }
 
@@ -2267,7 +2268,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component decoration(final @NotNull TextDecoration decoration, final boolean flag) {
+  default Component decoration(final TextDecoration decoration, final boolean flag) {
     return StyleSetter.super.decoration(decoration, flag);
   }
 
@@ -2284,7 +2285,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+  default Component decoration(final TextDecoration decoration, final TextDecoration.State state) {
     return this.style(this.style().decoration(decoration, state));
   }
 
@@ -2298,10 +2299,10 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.12.0
    */
   @Override
-  default @NotNull Component decorationIfAbsent(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+  default Component decorationIfAbsent(final TextDecoration decoration, final TextDecoration.State state) {
     requireNonNull(state, "state");
     // Not delegating this method prevents object creation if decoration is NOT absent
-    final TextDecoration.@NotNull State oldState = this.decoration(decoration);
+    final TextDecoration.State oldState = this.decoration(decoration);
     if (oldState == TextDecoration.State.NOT_SET) {
       return this.style(this.style().decoration(decoration, state));
     }
@@ -2315,7 +2316,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  default @NotNull Map<TextDecoration, TextDecoration.State> decorations() {
+  default Map<TextDecoration, TextDecoration.State> decorations() {
     return this.style().decorations();
   }
 
@@ -2330,7 +2331,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component decorations(final @NotNull Map<TextDecoration, TextDecoration.State> decorations) {
+  default Component decorations(final Map<TextDecoration, TextDecoration.State> decorations) {
     return this.style(this.style().decorations(decorations));
   }
 
@@ -2354,7 +2355,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component clickEvent(final @Nullable ClickEvent event) {
+  default Component clickEvent(final @Nullable ClickEvent event) {
     return this.style(this.style().clickEvent(event));
   }
 
@@ -2378,7 +2379,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component hoverEvent(final @Nullable HoverEventSource<?> source) {
+  default Component hoverEvent(final @Nullable HoverEventSource<?> source) {
     return this.style(this.style().hoverEvent(source));
   }
 
@@ -2402,7 +2403,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component insertion(final @Nullable String insertion) {
+  default Component insertion(final @Nullable String insertion) {
     return this.style(this.style().insertion(insertion));
   }
 
@@ -2425,7 +2426,7 @@ default boolean hasStyling() {
    * @since 4.2.0
    */
   @Contract(pure = true)
-  default @NotNull Component replaceText(final @NotNull Consumer<TextReplacementConfig.Builder> configurer) {
+  default Component replaceText(final Consumer<TextReplacementConfig.Builder> configurer) {
     requireNonNull(configurer, "configurer");
     return this.replaceText(AbstractBuilder.configureAndBuild(TextReplacementConfig.builder(), configurer));
   }
@@ -2438,7 +2439,7 @@ default boolean hasStyling() {
    * @since 4.2.0
    */
   @Contract(pure = true)
-  default @NotNull Component replaceText(final @NotNull TextReplacementConfig config) {
+  default Component replaceText(final TextReplacementConfig config) {
     requireNonNull(config, "replacement");
     if (!(config instanceof TextReplacementConfigImpl)) {
       throw new IllegalArgumentException("Provided replacement was a custom TextReplacementConfig implementation, which is not supported.");
@@ -2452,7 +2453,7 @@ default boolean hasStyling() {
    * @return the optimized component
    * @since 4.9.0
    */
-  default @NotNull Component compact() {
+  default Component compact() {
     return ComponentCompaction.compact(this, null);
   }
 
@@ -2464,7 +2465,7 @@ default boolean hasStyling() {
    * @return the iterable
    * @since 4.9.0
    */
-  default @NotNull Iterable<Component> iterable(final @NotNull ComponentIteratorType type, final @NotNull ComponentIteratorFlag@Nullable... flags) {
+  default Iterable<Component> iterable(final ComponentIteratorType type, final ComponentIteratorFlag@Nullable... flags) {
     return this.iterable(type, flags == null ? Collections.emptySet() : MonkeyBars.enumSet(ComponentIteratorFlag.class, flags));
   }
 
@@ -2476,7 +2477,7 @@ default boolean hasStyling() {
    * @return the iterable
    * @since 4.9.0
    */
-  default @NotNull Iterable<Component> iterable(final @NotNull ComponentIteratorType type, final @NotNull Set<ComponentIteratorFlag> flags) {
+  default Iterable<Component> iterable(final ComponentIteratorType type, final Set<ComponentIteratorFlag> flags) {
     requireNonNull(type, "type");
     requireNonNull(flags, "flags");
     return new ForwardingIterator<>(() -> this.iterator(type, flags), () -> this.spliterator(type, flags));
@@ -2492,7 +2493,7 @@ default boolean hasStyling() {
    * @return the iterator
    * @since 4.9.0
    */
-  default @NotNull Iterator<Component> iterator(final @NotNull ComponentIteratorType type, final @NotNull ComponentIteratorFlag@Nullable... flags) {
+  default Iterator<Component> iterator(final ComponentIteratorType type, final ComponentIteratorFlag@Nullable... flags) {
     return this.iterator(type, flags == null ? Collections.emptySet() : MonkeyBars.enumSet(ComponentIteratorFlag.class, flags));
   }
 
@@ -2506,7 +2507,7 @@ default boolean hasStyling() {
    * @return the iterator
    * @since 4.9.0
    */
-  default @NotNull Iterator<Component> iterator(final @NotNull ComponentIteratorType type, final @NotNull Set<ComponentIteratorFlag> flags) {
+  default Iterator<Component> iterator(final ComponentIteratorType type, final Set<ComponentIteratorFlag> flags) {
     return new ComponentIterator(this, requireNonNull(type, "type"), requireNonNull(flags, "flags"));
   }
 
@@ -2520,7 +2521,7 @@ default boolean hasStyling() {
    * @return the spliterator
    * @since 4.9.0
    */
-  default @NotNull Spliterator<Component> spliterator(final @NotNull ComponentIteratorType type, final @NotNull ComponentIteratorFlag@Nullable... flags) {
+  default Spliterator<Component> spliterator(final ComponentIteratorType type, final ComponentIteratorFlag@Nullable... flags) {
     return this.spliterator(type, flags == null ? Collections.emptySet() : MonkeyBars.enumSet(ComponentIteratorFlag.class, flags));
   }
 
@@ -2534,7 +2535,7 @@ default boolean hasStyling() {
    * @return the spliterator
    * @since 4.9.0
    */
-  default @NotNull Spliterator<Component> spliterator(final @NotNull ComponentIteratorType type, final @NotNull Set<ComponentIteratorFlag> flags) {
+  default Spliterator<Component> spliterator(final ComponentIteratorType type, final Set<ComponentIteratorFlag> flags) {
     return Spliterators.spliteratorUnknownSize(this.iterator(type, flags), Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.ORDERED);
   }
 
@@ -2550,7 +2551,7 @@ default boolean hasStyling() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract(pure = true)
   @Deprecated
-  default @NotNull Component replaceText(final @NotNull String search, final @Nullable ComponentLike replacement) {
+  default Component replaceText(final String search, final @Nullable ComponentLike replacement) {
     return this.replaceText(b -> b.matchLiteral(search).replacement(replacement));
   }
 
@@ -2566,7 +2567,7 @@ default boolean hasStyling() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract(pure = true)
   @Deprecated
-  default @NotNull Component replaceText(final @NotNull Pattern pattern, final @NotNull Function<TextComponent.Builder, @Nullable ComponentLike> replacement) {
+  default Component replaceText(final Pattern pattern, final Function<TextComponent.Builder, @Nullable ComponentLike> replacement) {
     return this.replaceText(b -> b.match(pattern).replacement(replacement));
   }
 
@@ -2582,7 +2583,7 @@ default boolean hasStyling() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract(pure = true)
   @Deprecated
-  default @NotNull Component replaceFirstText(final @NotNull String search, final @Nullable ComponentLike replacement) {
+  default Component replaceFirstText(final String search, final @Nullable ComponentLike replacement) {
     return this.replaceText(b -> b.matchLiteral(search).once().replacement(replacement));
   }
 
@@ -2598,7 +2599,7 @@ default boolean hasStyling() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract(pure = true)
   @Deprecated
-  default @NotNull Component replaceFirstText(final @NotNull Pattern pattern, final @NotNull Function<TextComponent.Builder, @Nullable ComponentLike> replacement) {
+  default Component replaceFirstText(final Pattern pattern, final Function<TextComponent.Builder, @Nullable ComponentLike> replacement) {
     return this.replaceText(b -> b.match(pattern).once().replacement(replacement));
   }
 
@@ -2615,7 +2616,7 @@ default boolean hasStyling() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract(pure = true)
   @Deprecated
-  default @NotNull Component replaceText(final @NotNull String search, final @Nullable ComponentLike replacement, final int numberOfReplacements) {
+  default Component replaceText(final String search, final @Nullable ComponentLike replacement, final int numberOfReplacements) {
     return this.replaceText(b -> b.matchLiteral(search).times(numberOfReplacements).replacement(replacement));
   }
 
@@ -2632,7 +2633,7 @@ default boolean hasStyling() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract(pure = true)
   @Deprecated
-  default @NotNull Component replaceText(final @NotNull Pattern pattern, final @NotNull Function<TextComponent.Builder, @Nullable ComponentLike> replacement, final int numberOfReplacements) {
+  default Component replaceText(final Pattern pattern, final Function<TextComponent.Builder, @Nullable ComponentLike> replacement, final int numberOfReplacements) {
     return this.replaceText(b -> b.match(pattern).times(numberOfReplacements).replacement(replacement));
   }
 
@@ -2651,7 +2652,7 @@ default boolean hasStyling() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract(pure = true)
   @Deprecated
-  default @NotNull Component replaceText(final @NotNull String search, final @Nullable ComponentLike replacement, final @NotNull IntFunction2<PatternReplacementResult> fn) {
+  default Component replaceText(final String search, final @Nullable ComponentLike replacement, final IntFunction2<PatternReplacementResult> fn) {
     return this.replaceText(b -> b.matchLiteral(search).replacement(replacement).condition(fn));
   }
 
@@ -2670,27 +2671,27 @@ default boolean hasStyling() {
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract(pure = true)
   @Deprecated
-  default @NotNull Component replaceText(final @NotNull Pattern pattern, final @NotNull Function<TextComponent.Builder, @Nullable ComponentLike> replacement, final @NotNull IntFunction2<PatternReplacementResult> fn) {
+  default Component replaceText(final Pattern pattern, final Function<TextComponent.Builder, @Nullable ComponentLike> replacement, final IntFunction2<PatternReplacementResult> fn) {
     return this.replaceText(b -> b.match(pattern).replacement(replacement).condition(fn));
   }
 
   @Override
-  default void componentBuilderApply(final @NotNull ComponentBuilder<?, ?> component) {
+  default void componentBuilderApply(final ComponentBuilder<?, ?> component) {
     component.append(this);
   }
 
   @Override
-  default @NotNull Component asComponent() {
+  default Component asComponent() {
     return this;
   }
 
   @Override
-  default @NotNull HoverEvent<Component> asHoverEvent(final @NotNull UnaryOperator<Component> op) {
+  default HoverEvent<Component> asHoverEvent(final UnaryOperator<Component> op) {
     return HoverEvent.showText(op.apply(this));
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("style", this.style()),
       ExaminableProperty.of(ComponentInternals.CHILDREN_PROPERTY, this.children())
diff --git a/api/src/main/java/net/kyori/adventure/text/ComponentApplicable.java b/api/src/main/java/net/kyori/adventure/text/ComponentApplicable.java
index ed831c642b..98da6d2304 100644
--- a/api/src/main/java/net/kyori/adventure/text/ComponentApplicable.java
+++ b/api/src/main/java/net/kyori/adventure/text/ComponentApplicable.java
@@ -23,7 +23,7 @@
  */
 package net.kyori.adventure.text;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that can be applied to a {@link Component}.
@@ -31,6 +31,7 @@
  * @since 4.0.0
  */
 @FunctionalInterface
+@NullMarked
 public interface ComponentApplicable {
   /**
    * Applies to {@code component}.
@@ -39,5 +40,5 @@ public interface ComponentApplicable {
    * @return a component with something applied.
    * @since 4.0.0
    */
-  @NotNull Component componentApply(final @NotNull Component component);
+  Component componentApply(final Component component);
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/ComponentBuilder.java b/api/src/main/java/net/kyori/adventure/text/ComponentBuilder.java
index ccd7429a3f..5fb88cdd44 100644
--- a/api/src/main/java/net/kyori/adventure/text/ComponentBuilder.java
+++ b/api/src/main/java/net/kyori/adventure/text/ComponentBuilder.java
@@ -39,8 +39,8 @@
 import net.kyori.adventure.util.Buildable;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A component builder.
@@ -50,6 +50,7 @@
  * @since 4.0.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends ComponentBuilder<C, B>> extends AbstractBuilder<C>, Buildable.Builder<C>, ComponentBuilderApplicable, ComponentLike, MutableStyleSetter<B> {
   /**
    * Appends a component to this component.
@@ -59,7 +60,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B append(final @NotNull Component component);
+  B append(final Component component);
 
   /**
    * Appends a component to this component.
@@ -69,7 +70,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  default @NotNull B append(final @NotNull ComponentLike component) {
+  default B append(final ComponentLike component) {
     return this.append(component.asComponent());
   }
 
@@ -81,7 +82,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  default @NotNull B append(final @NotNull ComponentBuilder<?, ?> builder) {
+  default B append(final ComponentBuilder<?, ?> builder) {
     return this.append(builder.build());
   }
 
@@ -93,7 +94,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B append(final @NotNull Component@NotNull... components);
+  B append(final Component... components);
 
   /**
    * Appends components to this component.
@@ -103,7 +104,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B append(final @NotNull ComponentLike@NotNull... components);
+  B append(final ComponentLike... components);
 
   /**
    * Appends components to this component.
@@ -113,7 +114,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B append(final @NotNull Iterable<? extends ComponentLike> components);
+  B append(final Iterable<? extends ComponentLike> components);
 
   /**
    * Appends a newline to this component.
@@ -121,7 +122,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @return this builder
    * @since 4.12.0
    */
-  default @NotNull B appendNewline() {
+  default B appendNewline() {
     return this.append(Component.newline());
   }
 
@@ -131,7 +132,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @return this builder
    * @since 4.12.0
    */
-  default @NotNull B appendSpace() {
+  default B appendSpace() {
     return this.append(Component.space());
   }
 
@@ -144,7 +145,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @SuppressWarnings("unchecked")
-  default @NotNull B apply(final @NotNull Consumer<? super ComponentBuilder<?, ?>> consumer) {
+  default B apply(final Consumer<? super ComponentBuilder<?, ?>> consumer) {
     consumer.accept(this);
     return (B) this;
   }
@@ -158,7 +159,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B applyDeep(final @NotNull Consumer<? super ComponentBuilder<?, ?>> action);
+  B applyDeep(final Consumer<? super ComponentBuilder<?, ?>> action);
 
   /**
    * Replaces each child of this component with the resultant component from the function.
@@ -168,7 +169,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B mapChildren(final @NotNull Function<BuildableComponent<?, ?>, ? extends BuildableComponent<?, ?>> function);
+  B mapChildren(final Function<BuildableComponent<?, ?>, ? extends BuildableComponent<?, ?>> function);
 
   /**
    * Replaces each child and sub-child of this component with the resultant
@@ -179,7 +180,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B mapChildrenDeep(final @NotNull Function<BuildableComponent<?, ?>, ? extends BuildableComponent<?, ?>> function);
+  B mapChildrenDeep(final Function<BuildableComponent<?, ?>, ? extends BuildableComponent<?, ?>> function);
 
   /**
    * Get an unmodifiable list containing all children currently in this builder.
@@ -187,7 +188,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @return the list of children
    * @since 4.6.0
    */
-  @NotNull List<Component> children();
+  List<Component> children();
 
   /**
    * Sets the style.
@@ -197,7 +198,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B style(final @NotNull Style style);
+  B style(final Style style);
 
   /**
    * Configures the style.
@@ -207,7 +208,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B style(final @NotNull Consumer<Style.Builder> consumer);
+  B style(final Consumer<Style.Builder> consumer);
 
   /**
    * Sets the font of this component.
@@ -218,7 +219,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  @NotNull B font(final @Nullable Key font);
+  B font(final @Nullable Key font);
 
   /**
    * Sets the color of this component.
@@ -229,7 +230,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  @NotNull B color(final @Nullable TextColor color);
+  B color(final @Nullable TextColor color);
 
   /**
    * Sets the color of this component if there isn't one set already.
@@ -240,7 +241,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  @NotNull B colorIfAbsent(final @Nullable TextColor color);
+  B colorIfAbsent(final @Nullable TextColor color);
 
   /**
    * Sets the state of a set of decorations to {@code flag} on this component.
@@ -253,7 +254,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_, _ -> this")
   @Override
-  default @NotNull B decorations(final @NotNull Set<TextDecoration> decorations, final boolean flag) {
+  default B decorations(final Set<TextDecoration> decorations, final boolean flag) {
     return MutableStyleSetter.super.decorations(decorations, flag);
   }
 
@@ -266,7 +267,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  default @NotNull B decorate(final @NotNull TextDecoration decoration) {
+  default B decorate(final TextDecoration decoration) {
     return this.decoration(decoration, TextDecoration.State.TRUE);
   }
 
@@ -279,7 +280,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  default @NotNull B decorate(final @NotNull TextDecoration@NotNull... decorations) {
+  default B decorate(final TextDecoration... decorations) {
     return MutableStyleSetter.super.decorate(decorations);
   }
 
@@ -294,7 +295,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_, _ -> this")
   @Override
-  default @NotNull B decoration(final @NotNull TextDecoration decoration, final boolean flag) {
+  default B decoration(final TextDecoration decoration, final boolean flag) {
     return this.decoration(decoration, TextDecoration.State.byBoolean(flag));
   }
 
@@ -309,7 +310,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  default @NotNull B decorations(final @NotNull Map<TextDecoration, TextDecoration.State> decorations) {
+  default B decorations(final Map<TextDecoration, TextDecoration.State> decorations) {
     return MutableStyleSetter.super.decorations(decorations);
   }
 
@@ -326,7 +327,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_, _ -> this")
   @Override
-  @NotNull B decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state);
+  B decoration(final TextDecoration decoration, final TextDecoration.State state);
 
   /**
    * Sets the state of a decoration on this component to {@code state} if the current state of
@@ -339,7 +340,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_, _ -> this")
   @Override
-  @NotNull B decorationIfAbsent(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state);
+  B decorationIfAbsent(final TextDecoration decoration, final TextDecoration.State state);
 
   /**
    * Sets the click event of this component.
@@ -350,7 +351,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  @NotNull B clickEvent(final @Nullable ClickEvent event);
+  B clickEvent(final @Nullable ClickEvent event);
 
   /**
    * Sets the hover event of this component.
@@ -361,7 +362,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  @NotNull B hoverEvent(final @Nullable HoverEventSource<?> source);
+  B hoverEvent(final @Nullable HoverEventSource<?> source);
 
   /**
    * Sets the string to be inserted when this component is shift-clicked.
@@ -372,7 +373,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @Override
-  @NotNull B insertion(final @Nullable String insertion);
+  B insertion(final @Nullable String insertion);
 
   /**
    * Merges styling from another component into this component.
@@ -382,7 +383,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  default @NotNull B mergeStyle(final @NotNull Component that) {
+  default B mergeStyle(final Component that) {
     return this.mergeStyle(that, Style.Merge.all());
   }
 
@@ -395,7 +396,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_, _ -> this")
-  default @NotNull B mergeStyle(final @NotNull Component that, final Style.@NotNull Merge@NotNull... merges) {
+  default B mergeStyle(final Component that, final Style.Merge... merges) {
     return this.mergeStyle(that, Style.Merge.merges(merges));
   }
 
@@ -408,7 +409,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @since 4.0.0
    */
   @Contract("_, _ -> this")
-  @NotNull B mergeStyle(final @NotNull Component that, final @NotNull Set<Style.Merge> merges);
+  B mergeStyle(final Component that, final Set<Style.Merge> merges);
 
   /**
    * Resets all styling on this component.
@@ -416,7 +417,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @return this builder
    * @since 4.0.0
    */
-  @NotNull B resetStyle();
+  B resetStyle();
 
   /**
    * Build a component.
@@ -424,7 +425,7 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    * @return the component
    */
   @Override
-  @NotNull C build();
+  C build();
 
   /**
    * Applies {@code applicable}.
@@ -435,18 +436,18 @@ public interface ComponentBuilder<C extends BuildableComponent<C, B>, B extends
    */
   @Contract("_ -> this")
   @SuppressWarnings("unchecked")
-  default @NotNull B applicableApply(final @NotNull ComponentBuilderApplicable applicable) {
+  default B applicableApply(final ComponentBuilderApplicable applicable) {
     applicable.componentBuilderApply(this);
     return (B) this;
   }
 
   @Override
-  default void componentBuilderApply(final @NotNull ComponentBuilder<?, ?> component) {
+  default void componentBuilderApply(final ComponentBuilder<?, ?> component) {
     component.append(this);
   }
 
   @Override
-  default @NotNull Component asComponent() {
+  default Component asComponent() {
     return this.build();
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/ComponentBuilderApplicable.java b/api/src/main/java/net/kyori/adventure/text/ComponentBuilderApplicable.java
index 9a93a2c8fa..f67e97de26 100644
--- a/api/src/main/java/net/kyori/adventure/text/ComponentBuilderApplicable.java
+++ b/api/src/main/java/net/kyori/adventure/text/ComponentBuilderApplicable.java
@@ -25,7 +25,7 @@
 
 import net.kyori.adventure.text.format.StyleBuilderApplicable;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that can be applied to a {@link ComponentBuilder}.
@@ -34,6 +34,7 @@
  * @since 4.0.0
  */
 @FunctionalInterface
+@NullMarked
 public interface ComponentBuilderApplicable {
   /**
    * Applies to {@code component}.
@@ -42,5 +43,5 @@ public interface ComponentBuilderApplicable {
    * @since 4.0.0
    */
   @Contract(mutates = "param")
-  void componentBuilderApply(final @NotNull ComponentBuilder<?, ?> component);
+  void componentBuilderApply(final ComponentBuilder<?, ?> component);
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/ComponentCompaction.java b/api/src/main/java/net/kyori/adventure/text/ComponentCompaction.java
index a0300af285..e3937b659f 100644
--- a/api/src/main/java/net/kyori/adventure/text/ComponentCompaction.java
+++ b/api/src/main/java/net/kyori/adventure/text/ComponentCompaction.java
@@ -29,10 +29,11 @@
 import java.util.Objects;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class ComponentCompaction {
   @VisibleForTesting
   static final boolean SIMPLIFY_STYLE_FOR_BLANK_COMPONENTS = false;
@@ -40,7 +41,7 @@ final class ComponentCompaction {
   private ComponentCompaction() {
   }
 
-  static Component compact(final @NotNull Component self, final @Nullable Style parentStyle) {
+  static Component compact(final Component self, final @Nullable Style parentStyle) {
     final List<Component> children = self.children();
     Component optimized = self.children(Collections.emptyList());
     if (parentStyle != null) {
@@ -185,7 +186,7 @@ private static boolean isBlank(final Component component) {
   * @param parentStyle style from component's parents, for context
   * @return a new, simplified style
   */
-  private static @NotNull Style simplifyStyleForBlank(final @NotNull Style style, final @Nullable Style parentStyle) {
+  private static Style simplifyStyleForBlank(final Style style, final @Nullable Style parentStyle) {
     if (!SIMPLIFY_STYLE_FOR_BLANK_COMPONENTS) {
       // todo: can this be fixed a better way?
       // https://github.com/KyoriPowered/adventure/issues/849
diff --git a/api/src/main/java/net/kyori/adventure/text/ComponentIterator.java b/api/src/main/java/net/kyori/adventure/text/ComponentIterator.java
index 9d9dc7ce50..9dea060ae3 100644
--- a/api/src/main/java/net/kyori/adventure/text/ComponentIterator.java
+++ b/api/src/main/java/net/kyori/adventure/text/ComponentIterator.java
@@ -28,15 +28,16 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Set;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 final class ComponentIterator implements Iterator<Component> {
   private Component component;
   private final ComponentIteratorType type;
   private final Set<ComponentIteratorFlag> flags;
   private final Deque<Component> deque;
 
-  ComponentIterator(final @NotNull Component component, final @NotNull ComponentIteratorType type, final @NotNull Set<ComponentIteratorFlag> flags) {
+  ComponentIterator(final Component component, final ComponentIteratorType type, final Set<ComponentIteratorFlag> flags) {
     this.component = component;
     this.type = type;
     this.flags = flags;
diff --git a/api/src/main/java/net/kyori/adventure/text/ComponentIteratorType.java b/api/src/main/java/net/kyori/adventure/text/ComponentIteratorType.java
index 404d5bbb65..1211083e49 100644
--- a/api/src/main/java/net/kyori/adventure/text/ComponentIteratorType.java
+++ b/api/src/main/java/net/kyori/adventure/text/ComponentIteratorType.java
@@ -28,7 +28,7 @@
 import java.util.Set;
 import net.kyori.adventure.text.event.HoverEvent;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * The iterator types.
@@ -40,6 +40,7 @@
  */
 @ApiStatus.NonExtendable
 @FunctionalInterface
+@NullMarked
 public interface ComponentIteratorType {
   /**
    * A depth-first iteration.
@@ -104,5 +105,5 @@ public interface ComponentIteratorType {
    * @param flags the flags
    * @since 4.9.0
    */
-  void populate(final @NotNull Component component, final @NotNull Deque<Component> deque, final @NotNull Set<ComponentIteratorFlag> flags);
+  void populate(final Component component, final Deque<Component> deque, final Set<ComponentIteratorFlag> flags);
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/ComponentLike.java b/api/src/main/java/net/kyori/adventure/text/ComponentLike.java
index 3d6e7d8e9a..ea48859b98 100644
--- a/api/src/main/java/net/kyori/adventure/text/ComponentLike.java
+++ b/api/src/main/java/net/kyori/adventure/text/ComponentLike.java
@@ -28,8 +28,8 @@
 import java.util.List;
 import java.util.function.Predicate;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -39,6 +39,7 @@
  * @since 4.0.0
  */
 @FunctionalInterface
+@NullMarked
 public interface ComponentLike {
   /**
    * Converts a list of {@link ComponentLike}s to a list of {@link Component}s.
@@ -47,7 +48,7 @@ public interface ComponentLike {
    * @return the components
    * @since 4.8.0
    */
-  static @NotNull List<Component> asComponents(final @NotNull List<? extends ComponentLike> likes) {
+  static List<Component> asComponents(final List<? extends ComponentLike> likes) {
     return asComponents(likes, null);
   }
 
@@ -61,7 +62,7 @@ public interface ComponentLike {
    * @return the components
    * @since 4.8.0
    */
-  static @NotNull List<Component> asComponents(final @NotNull List<? extends ComponentLike> likes, final @Nullable Predicate<? super Component> filter) {
+  static List<Component> asComponents(final List<? extends ComponentLike> likes, final @Nullable Predicate<? super Component> filter) {
     requireNonNull(likes, "likes");
     final int size = likes.size();
     if (size == 0) {
@@ -109,5 +110,5 @@ public interface ComponentLike {
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull Component asComponent();
+  Component asComponent();
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/EntityNBTComponent.java b/api/src/main/java/net/kyori/adventure/text/EntityNBTComponent.java
index 759cdab325..7dabdcb330 100644
--- a/api/src/main/java/net/kyori/adventure/text/EntityNBTComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/EntityNBTComponent.java
@@ -26,7 +26,7 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Given a Minecraft selector, this component reads the NBT of the associated entity and displays that information.
@@ -43,6 +43,7 @@
  * @since 4.0.0
  * @sinceMinecraft 1.14
  */
+@NullMarked
 public interface EntityNBTComponent extends NBTComponent<EntityNBTComponent, EntityNBTComponent.Builder>, ScopedComponent<EntityNBTComponent> {
   /**
    * Gets the entity selector.
@@ -50,7 +51,7 @@ public interface EntityNBTComponent extends NBTComponent<EntityNBTComponent, Ent
    * @return the entity selector
    * @since 4.0.0
    */
-  @NotNull String selector();
+  String selector();
 
   /**
    * Sets the entity selector.
@@ -60,10 +61,10 @@ public interface EntityNBTComponent extends NBTComponent<EntityNBTComponent, Ent
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull EntityNBTComponent selector(final @NotNull String selector);
+  EntityNBTComponent selector(final String selector);
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("selector", this.selector())
@@ -86,6 +87,6 @@ interface Builder extends NBTComponentBuilder<EntityNBTComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder selector(final @NotNull String selector);
+    Builder selector(final String selector);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/EntityNBTComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/EntityNBTComponentImpl.java
index 2e56672fc0..bd24d70c07 100644
--- a/api/src/main/java/net/kyori/adventure/text/EntityNBTComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/EntityNBTComponentImpl.java
@@ -27,15 +27,16 @@
 import java.util.Objects;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class EntityNBTComponentImpl extends NBTComponentImpl<EntityNBTComponent, EntityNBTComponent.Builder> implements EntityNBTComponent {
   private final String selector;
 
-  static EntityNBTComponent create(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style, final String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final String selector) {
+  static EntityNBTComponent create(final List<? extends ComponentLike> children, final Style style, final String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final String selector) {
     return new EntityNBTComponentImpl(
       ComponentLike.asComponents(children, IS_NOT_EMPTY),
       requireNonNull(style, "style"),
@@ -46,19 +47,19 @@ static EntityNBTComponent create(final @NotNull List<? extends ComponentLike> ch
     );
   }
 
-  EntityNBTComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final String nbtPath, final boolean interpret, final @Nullable Component separator, final String selector) {
+  EntityNBTComponentImpl(final List<Component> children, final Style style, final String nbtPath, final boolean interpret, final @Nullable Component separator, final String selector) {
     super(children, style, nbtPath, interpret, separator);
     this.selector = selector;
   }
 
   @Override
-  public @NotNull EntityNBTComponent nbtPath(final @NotNull String nbtPath) {
+  public EntityNBTComponent nbtPath(final String nbtPath) {
     if (Objects.equals(this.nbtPath, nbtPath)) return this;
     return create(this.children, this.style, nbtPath, this.interpret, this.separator, this.selector);
   }
 
   @Override
-  public @NotNull EntityNBTComponent interpret(final boolean interpret) {
+  public EntityNBTComponent interpret(final boolean interpret) {
     if (this.interpret == interpret) return this;
     return create(this.children, this.style, this.nbtPath, interpret, this.separator, this.selector);
   }
@@ -69,28 +70,28 @@ static EntityNBTComponent create(final @NotNull List<? extends ComponentLike> ch
   }
 
   @Override
-  public @NotNull EntityNBTComponent separator(final @Nullable ComponentLike separator) {
+  public EntityNBTComponent separator(final @Nullable ComponentLike separator) {
     return create(this.children, this.style, this.nbtPath, this.interpret, separator, this.selector);
   }
 
   @Override
-  public @NotNull String selector() {
+  public String selector() {
     return this.selector;
   }
 
   @Override
-  public @NotNull EntityNBTComponent selector(final @NotNull String selector) {
+  public EntityNBTComponent selector(final String selector) {
     if (Objects.equals(this.selector, selector)) return this;
     return create(this.children, this.style, this.nbtPath, this.interpret, this.separator, selector);
   }
 
   @Override
-  public @NotNull EntityNBTComponent children(final @NotNull List<? extends ComponentLike> children) {
+  public EntityNBTComponent children(final List<? extends ComponentLike> children) {
     return create(children, this.style, this.nbtPath, this.interpret, this.separator, this.selector);
   }
 
   @Override
-  public @NotNull EntityNBTComponent style(final @NotNull Style style) {
+  public EntityNBTComponent style(final Style style) {
     return create(this.children, style, this.nbtPath, this.interpret, this.separator, this.selector);
   }
 
@@ -116,7 +117,7 @@ public String toString() {
   }
 
   @Override
-  public EntityNBTComponent.@NotNull Builder toBuilder() {
+  public EntityNBTComponent.Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -126,19 +127,19 @@ static final class BuilderImpl extends AbstractNBTComponentBuilder<EntityNBTComp
     BuilderImpl() {
     }
 
-    BuilderImpl(final @NotNull EntityNBTComponent component) {
+    BuilderImpl(final EntityNBTComponent component) {
       super(component);
       this.selector = component.selector();
     }
 
     @Override
-    public EntityNBTComponent.@NotNull Builder selector(final @NotNull String selector) {
+    public EntityNBTComponent.Builder selector(final String selector) {
       this.selector = requireNonNull(selector, "selector");
       return this;
     }
 
     @Override
-    public @NotNull EntityNBTComponent build() {
+    public EntityNBTComponent build() {
       if (this.nbtPath == null) throw new IllegalStateException("nbt path must be set");
       if (this.selector == null) throw new IllegalStateException("selector must be set");
       return create(this.children, this.buildStyle(), this.nbtPath, this.interpret, this.separator, this.selector);
diff --git a/api/src/main/java/net/kyori/adventure/text/JoinConfiguration.java b/api/src/main/java/net/kyori/adventure/text/JoinConfiguration.java
index 44709a9880..27af3ff742 100644
--- a/api/src/main/java/net/kyori/adventure/text/JoinConfiguration.java
+++ b/api/src/main/java/net/kyori/adventure/text/JoinConfiguration.java
@@ -31,8 +31,8 @@
 import net.kyori.examination.Examinable;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A configuration for how a series of components can be joined.
@@ -84,6 +84,7 @@
  * @since 4.9.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConfiguration.Builder>, Examinable {
   /**
    * Creates a new builder.
@@ -91,7 +92,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return a new builder
    * @since 4.9.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new JoinConfigurationImpl.BuilderImpl();
   }
 
@@ -101,7 +102,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the join configuration
    * @since 4.9.0
    */
-  static @NotNull JoinConfiguration noSeparators() {
+  static JoinConfiguration noSeparators() {
     return JoinConfigurationImpl.NULL;
   }
 
@@ -114,7 +115,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the join configuration
    * @since 4.10.0
    */
-  static @NotNull JoinConfiguration newlines() {
+  static JoinConfiguration newlines() {
     return JoinConfigurationImpl.STANDARD_NEW_LINES;
   }
 
@@ -127,7 +128,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the join configuration
    * @since 4.15.0
    */
-  static @NotNull JoinConfiguration spaces() {
+  static JoinConfiguration spaces() {
     return JoinConfigurationImpl.STANDARD_SPACES;
   }
 
@@ -141,7 +142,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the join configuration
    * @since 4.10.0
    */
-  static @NotNull JoinConfiguration commas(final boolean spaces) {
+  static JoinConfiguration commas(final boolean spaces) {
     return spaces ? JoinConfigurationImpl.STANDARD_COMMA_SPACE_SEPARATED : JoinConfigurationImpl.STANDARD_COMMA_SEPARATED;
   }
 
@@ -156,7 +157,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the join configuration
    * @since 4.10.0
    */
-  static @NotNull JoinConfiguration arrayLike() {
+  static JoinConfiguration arrayLike() {
     return JoinConfigurationImpl.STANDARD_ARRAY_LIKE;
   }
 
@@ -167,7 +168,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the join configuration
    * @since 4.9.0
    */
-  static @NotNull JoinConfiguration separator(final @Nullable ComponentLike separator) {
+  static JoinConfiguration separator(final @Nullable ComponentLike separator) {
     if (separator == null) return JoinConfigurationImpl.NULL;
     return builder().separator(separator).build();
   }
@@ -180,7 +181,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the join configuration
    * @since 4.9.0
    */
-  static @NotNull JoinConfiguration separators(final @Nullable ComponentLike separator, final @Nullable ComponentLike lastSeparator) {
+  static JoinConfiguration separators(final @Nullable ComponentLike separator, final @Nullable ComponentLike lastSeparator) {
     if (separator == null && lastSeparator == null) return JoinConfigurationImpl.NULL;
     return builder().separator(separator).lastSeparator(lastSeparator).build();
   }
@@ -234,7 +235,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the operator
    * @since 4.9.0
    */
-  @NotNull Function<ComponentLike, Component> convertor();
+  Function<ComponentLike, Component> convertor();
 
   /**
    * Gets the predicate of this join configuration.
@@ -244,7 +245,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the predicate
    * @since 4.9.0
    */
-  @NotNull Predicate<ComponentLike> predicate();
+  Predicate<ComponentLike> predicate();
 
   /**
    * Gets the style of the parent component that contains the joined components.
@@ -252,7 +253,7 @@ public interface JoinConfiguration extends Buildable<JoinConfiguration, JoinConf
    * @return the style
    * @since 4.11.0
    */
-  @NotNull Style parentStyle();
+  Style parentStyle();
 
   /**
    * A builder for join configurations.
@@ -268,7 +269,7 @@ interface Builder extends AbstractBuilder<JoinConfiguration>, Buildable.Builder<
      * @since 4.9.0
      */
     @Contract("_ -> this")
-    @NotNull Builder prefix(final @Nullable ComponentLike prefix);
+    Builder prefix(final @Nullable ComponentLike prefix);
 
     /**
      * Sets the suffix of this join configuration builder.
@@ -278,7 +279,7 @@ interface Builder extends AbstractBuilder<JoinConfiguration>, Buildable.Builder<
      * @since 4.9.0
      */
     @Contract("_ -> this")
-    @NotNull Builder suffix(final @Nullable ComponentLike suffix);
+    Builder suffix(final @Nullable ComponentLike suffix);
 
     /**
      * Sets the separator of this join configuration builder.
@@ -288,7 +289,7 @@ interface Builder extends AbstractBuilder<JoinConfiguration>, Buildable.Builder<
      * @since 4.9.0
      */
     @Contract("_ -> this")
-    @NotNull Builder separator(final @Nullable ComponentLike separator);
+    Builder separator(final @Nullable ComponentLike separator);
 
     /**
      * Sets the last separator of this join configuration builder.
@@ -298,7 +299,7 @@ interface Builder extends AbstractBuilder<JoinConfiguration>, Buildable.Builder<
      * @since 4.9.0
      */
     @Contract("_ -> this")
-    @NotNull Builder lastSeparator(final @Nullable ComponentLike lastSeparator);
+    Builder lastSeparator(final @Nullable ComponentLike lastSeparator);
 
     /**
      * Sets the last separator that will be used instead of the normal last separator in the case where there
@@ -311,7 +312,7 @@ interface Builder extends AbstractBuilder<JoinConfiguration>, Buildable.Builder<
      * @since 4.9.0
      */
     @Contract("_ -> this")
-    @NotNull Builder lastSeparatorIfSerial(final @Nullable ComponentLike lastSeparatorIfSerial);
+    Builder lastSeparatorIfSerial(final @Nullable ComponentLike lastSeparatorIfSerial);
 
     /**
      * Sets the convertor of this join configuration builder.
@@ -323,7 +324,7 @@ interface Builder extends AbstractBuilder<JoinConfiguration>, Buildable.Builder<
      * @since 4.9.0
      */
     @Contract("_ -> this")
-    @NotNull Builder convertor(final @NotNull Function<ComponentLike, Component> convertor);
+    Builder convertor(final Function<ComponentLike, Component> convertor);
 
     /**
      * Sets the predicate of this join configuration builder.
@@ -335,7 +336,7 @@ interface Builder extends AbstractBuilder<JoinConfiguration>, Buildable.Builder<
      * @since 4.9.0
      */
     @Contract("_ -> this")
-    @NotNull Builder predicate(final @NotNull Predicate<ComponentLike> predicate);
+    Builder predicate(final Predicate<ComponentLike> predicate);
 
     /**
      * Sets the style of the parent component that contains the joined components.
@@ -345,6 +346,6 @@ interface Builder extends AbstractBuilder<JoinConfiguration>, Buildable.Builder<
      * @since 4.11.0
      */
     @Contract("_ -> this")
-    @NotNull Builder parentStyle(final @NotNull Style parentStyle);
+    Builder parentStyle(final Style parentStyle);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/JoinConfigurationImpl.java b/api/src/main/java/net/kyori/adventure/text/JoinConfigurationImpl.java
index 621a0ccfb2..235b66b100 100644
--- a/api/src/main/java/net/kyori/adventure/text/JoinConfigurationImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/JoinConfigurationImpl.java
@@ -32,9 +32,10 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class JoinConfigurationImpl implements JoinConfiguration {
   static final Function<ComponentLike, Component> DEFAULT_CONVERTOR = ComponentLike::asComponent;
   static final Predicate<ComponentLike> DEFAULT_PREDICATE = componentLike -> true;
@@ -70,7 +71,7 @@ private JoinConfigurationImpl() {
     this.rootStyle = Style.empty();
   }
 
-  private JoinConfigurationImpl(final @NotNull BuilderImpl builder) {
+  private JoinConfigurationImpl(final BuilderImpl builder) {
     this.prefix = ComponentLike.unbox(builder.prefix);
     this.suffix = ComponentLike.unbox(builder.suffix);
     this.separator = ComponentLike.unbox(builder.separator);
@@ -107,27 +108,27 @@ private JoinConfigurationImpl(final @NotNull BuilderImpl builder) {
   }
 
   @Override
-  public @NotNull Function<ComponentLike, Component> convertor() {
+  public Function<ComponentLike, Component> convertor() {
     return this.convertor;
   }
 
   @Override
-  public @NotNull Predicate<ComponentLike> predicate() {
+  public Predicate<ComponentLike> predicate() {
     return this.predicate;
   }
 
   @Override
-  public @NotNull Style parentStyle() {
+  public Style parentStyle() {
     return this.rootStyle;
   }
 
   @Override
-  public JoinConfiguration.@NotNull Builder toBuilder() {
+  public JoinConfiguration.Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("prefix", this.prefix),
       ExaminableProperty.of("suffix", this.suffix),
@@ -146,7 +147,7 @@ public String toString() {
   }
 
   @Contract(pure = true)
-  static @NotNull Component join(final @NotNull JoinConfiguration config, final @NotNull Iterable<? extends ComponentLike> components) {
+  static Component join(final JoinConfiguration config, final Iterable<? extends ComponentLike> components) {
     Objects.requireNonNull(config, "config");
     Objects.requireNonNull(components, "components");
 
@@ -218,7 +219,7 @@ public String toString() {
     return builder.build();
   }
 
-  static @NotNull Component singleElementJoin(final @NotNull JoinConfiguration config, final @Nullable ComponentLike component) {
+  static Component singleElementJoin(final JoinConfiguration config, final @Nullable ComponentLike component) {
     final Component prefix = config.prefix();
     final Component suffix = config.suffix();
     final Function<ComponentLike, Component> convertor = config.convertor();
@@ -257,7 +258,7 @@ static final class BuilderImpl implements JoinConfiguration.Builder {
       this(JoinConfigurationImpl.NULL);
     }
 
-    private BuilderImpl(final @NotNull JoinConfigurationImpl joinConfig) {
+    private BuilderImpl(final JoinConfigurationImpl joinConfig) {
       this.separator = joinConfig.separator;
       this.lastSeparator = joinConfig.lastSeparator;
       this.prefix = joinConfig.prefix;
@@ -269,55 +270,55 @@ private BuilderImpl(final @NotNull JoinConfigurationImpl joinConfig) {
     }
 
     @Override
-    public @NotNull Builder prefix(final @Nullable ComponentLike prefix) {
+    public Builder prefix(final @Nullable ComponentLike prefix) {
       this.prefix = prefix;
       return this;
     }
 
     @Override
-    public @NotNull Builder suffix(final @Nullable ComponentLike suffix) {
+    public Builder suffix(final @Nullable ComponentLike suffix) {
       this.suffix = suffix;
       return this;
     }
 
     @Override
-    public @NotNull Builder separator(final @Nullable ComponentLike separator) {
+    public Builder separator(final @Nullable ComponentLike separator) {
       this.separator = separator;
       return this;
     }
 
     @Override
-    public @NotNull Builder lastSeparator(final @Nullable ComponentLike lastSeparator) {
+    public Builder lastSeparator(final @Nullable ComponentLike lastSeparator) {
       this.lastSeparator = lastSeparator;
       return this;
     }
 
     @Override
-    public @NotNull Builder lastSeparatorIfSerial(final @Nullable ComponentLike lastSeparatorIfSerial) {
+    public Builder lastSeparatorIfSerial(final @Nullable ComponentLike lastSeparatorIfSerial) {
       this.lastSeparatorIfSerial = lastSeparatorIfSerial;
       return this;
     }
 
     @Override
-    public @NotNull Builder convertor(final @NotNull Function<ComponentLike, Component> convertor) {
+    public Builder convertor(final Function<ComponentLike, Component> convertor) {
       this.convertor = Objects.requireNonNull(convertor, "convertor");
       return this;
     }
 
     @Override
-    public @NotNull Builder predicate(final @NotNull Predicate<ComponentLike> predicate) {
+    public Builder predicate(final Predicate<ComponentLike> predicate) {
       this.predicate = Objects.requireNonNull(predicate, "predicate");
       return this;
     }
 
     @Override
-    public @NotNull Builder parentStyle(final @NotNull Style parentStyle) {
+    public Builder parentStyle(final Style parentStyle) {
       this.rootStyle = Objects.requireNonNull(parentStyle, "rootStyle");
       return this;
     }
 
     @Override
-    public @NotNull JoinConfiguration build() {
+    public JoinConfiguration build() {
       return new JoinConfigurationImpl(this);
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/text/KeybindComponent.java b/api/src/main/java/net/kyori/adventure/text/KeybindComponent.java
index 9fbf04440d..5770e99bad 100644
--- a/api/src/main/java/net/kyori/adventure/text/KeybindComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/KeybindComponent.java
@@ -27,7 +27,7 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A {@link Component} that displays the client's current keybind for the supplied action.
@@ -41,6 +41,7 @@
  * @since 4.0.0
  * @sinceMinecraft 1.12
  */
+@NullMarked
 public interface KeybindComponent extends BuildableComponent<KeybindComponent, KeybindComponent.Builder>, ScopedComponent<KeybindComponent> {
   /**
    * Gets the keybind.
@@ -48,7 +49,7 @@ public interface KeybindComponent extends BuildableComponent<KeybindComponent, K
    * @return the keybind
    * @since 4.0.0
    */
-  @NotNull String keybind();
+  String keybind();
 
   /**
    * Sets the keybind.
@@ -58,7 +59,7 @@ public interface KeybindComponent extends BuildableComponent<KeybindComponent, K
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull KeybindComponent keybind(final @NotNull String keybind);
+  KeybindComponent keybind(final String keybind);
 
   /**
    * Sets the keybind.
@@ -68,12 +69,12 @@ public interface KeybindComponent extends BuildableComponent<KeybindComponent, K
    * @since 4.9.0
    */
   @Contract(pure = true)
-  default @NotNull KeybindComponent keybind(final @NotNull KeybindLike keybind) {
+  default KeybindComponent keybind(final KeybindLike keybind) {
     return this.keybind(Objects.requireNonNull(keybind, "keybind").asKeybind());
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("keybind", this.keybind())
@@ -94,7 +95,7 @@ interface KeybindLike {
      * @return the keybind identifier
      * @since 4.9.0
      */
-    @NotNull String asKeybind();
+    String asKeybind();
   }
 
   /**
@@ -111,7 +112,7 @@ interface Builder extends ComponentBuilder<KeybindComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder keybind(final @NotNull String keybind);
+    Builder keybind(final String keybind);
 
     /**
      * Sets the keybind.
@@ -121,7 +122,7 @@ interface Builder extends ComponentBuilder<KeybindComponent, Builder> {
      * @since 4.9.0
      */
     @Contract(pure = true)
-    default @NotNull Builder keybind(final @NotNull KeybindLike keybind) {
+    default Builder keybind(final KeybindLike keybind) {
       return this.keybind(Objects.requireNonNull(keybind, "keybind").asKeybind());
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/text/KeybindComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/KeybindComponentImpl.java
index 077064a879..f0523cc60b 100644
--- a/api/src/main/java/net/kyori/adventure/text/KeybindComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/KeybindComponentImpl.java
@@ -27,15 +27,16 @@
 import java.util.Objects;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class KeybindComponentImpl extends AbstractComponent implements KeybindComponent {
   private final String keybind;
 
-  static KeybindComponent create(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style, final @NotNull String keybind) {
+  static KeybindComponent create(final List<? extends ComponentLike> children, final Style style, final String keybind) {
     return new KeybindComponentImpl(
       ComponentLike.asComponents(children, IS_NOT_EMPTY),
       requireNonNull(style, "style"),
@@ -43,29 +44,29 @@ static KeybindComponent create(final @NotNull List<? extends ComponentLike> chil
     );
   }
 
-  KeybindComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final @NotNull String keybind) {
+  KeybindComponentImpl(final List<Component> children, final Style style, final String keybind) {
     super(children, style);
     this.keybind = keybind;
   }
 
   @Override
-  public @NotNull String keybind() {
+  public String keybind() {
     return this.keybind;
   }
 
   @Override
-  public @NotNull KeybindComponent keybind(final @NotNull String keybind) {
+  public KeybindComponent keybind(final String keybind) {
     if (Objects.equals(this.keybind, keybind)) return this;
     return create(this.children, this.style, keybind);
   }
 
   @Override
-  public @NotNull KeybindComponent children(final @NotNull List<? extends ComponentLike> children) {
+  public KeybindComponent children(final List<? extends ComponentLike> children) {
     return create(children, this.style, this.keybind);
   }
 
   @Override
-  public @NotNull KeybindComponent style(final @NotNull Style style) {
+  public KeybindComponent style(final Style style) {
     return create(this.children, style, this.keybind);
   }
 
@@ -91,7 +92,7 @@ public String toString() {
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -101,19 +102,19 @@ static final class BuilderImpl extends AbstractComponentBuilder<KeybindComponent
     BuilderImpl() {
     }
 
-    BuilderImpl(final @NotNull KeybindComponent component) {
+    BuilderImpl(final KeybindComponent component) {
       super(component);
       this.keybind = component.keybind();
     }
 
     @Override
-    public @NotNull Builder keybind(final @NotNull String keybind) {
+    public Builder keybind(final String keybind) {
       this.keybind = requireNonNull(keybind, "keybind");
       return this;
     }
 
     @Override
-    public @NotNull KeybindComponent build() {
+    public KeybindComponent build() {
       if (this.keybind == null) throw new IllegalStateException("keybind must be set");
       return create(this.children, this.buildStyle(), this.keybind);
     }
diff --git a/api/src/main/java/net/kyori/adventure/text/LinearComponents.java b/api/src/main/java/net/kyori/adventure/text/LinearComponents.java
index 54749f6a68..edcad09e64 100644
--- a/api/src/main/java/net/kyori/adventure/text/LinearComponents.java
+++ b/api/src/main/java/net/kyori/adventure/text/LinearComponents.java
@@ -25,13 +25,14 @@
 
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.StyleBuilderApplicable;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A utility class that allows {@link Component components} to be created where {@link Style styles} can be specified inline.
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class LinearComponents {
   private LinearComponents() {
   }
@@ -51,7 +52,7 @@ private LinearComponents() {
    * @return a component
    * @since 4.0.0
    */
-  public static @NotNull Component linear(final @NotNull ComponentBuilderApplicable@NotNull... applicables) {
+  public static Component linear(final ComponentBuilderApplicable... applicables) {
     final int length = applicables.length;
     if (length == 0) return Component.empty();
     if (length == 1) {
diff --git a/api/src/main/java/net/kyori/adventure/text/NBTComponent.java b/api/src/main/java/net/kyori/adventure/text/NBTComponent.java
index 1861c27840..243bdf5a42 100644
--- a/api/src/main/java/net/kyori/adventure/text/NBTComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/NBTComponent.java
@@ -26,8 +26,8 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A component that can display NBT fetched from different locations, optionally trying to interpret the NBT as JSON
@@ -51,6 +51,7 @@
  * @since 4.0.0
  * @sinceMinecraft 1.14
  */
+@NullMarked
 public interface NBTComponent<C extends NBTComponent<C, B>, B extends NBTComponentBuilder<C, B>> extends BuildableComponent<C, B> {
   /**
    * Gets the NBT path.
@@ -58,7 +59,7 @@ public interface NBTComponent<C extends NBTComponent<C, B>, B extends NBTCompone
    * @return the NBT path
    * @since 4.0.0
    */
-  @NotNull String nbtPath();
+  String nbtPath();
 
   /**
    * Sets the NBT path.
@@ -68,7 +69,7 @@ public interface NBTComponent<C extends NBTComponent<C, B>, B extends NBTCompone
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull C nbtPath(final @NotNull String nbtPath);
+  C nbtPath(final String nbtPath);
 
   /**
    * Gets if we should be interpreting.
@@ -86,7 +87,7 @@ public interface NBTComponent<C extends NBTComponent<C, B>, B extends NBTCompone
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull C interpret(final boolean interpret);
+  C interpret(final boolean interpret);
 
   /**
    * Gets the separator.
@@ -103,10 +104,10 @@ public interface NBTComponent<C extends NBTComponent<C, B>, B extends NBTCompone
    * @return the separator
    * @since 4.8.0
    */
-  @NotNull C separator(final @Nullable ComponentLike separator);
+  C separator(final @Nullable ComponentLike separator);
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("nbtPath", this.nbtPath()),
diff --git a/api/src/main/java/net/kyori/adventure/text/NBTComponentBuilder.java b/api/src/main/java/net/kyori/adventure/text/NBTComponentBuilder.java
index fcd91f4e27..f460398836 100644
--- a/api/src/main/java/net/kyori/adventure/text/NBTComponentBuilder.java
+++ b/api/src/main/java/net/kyori/adventure/text/NBTComponentBuilder.java
@@ -24,8 +24,7 @@
 package net.kyori.adventure.text;
 
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /*
  * This can't be a child of NBTComponent.
@@ -47,7 +46,7 @@ public interface NBTComponentBuilder<C extends NBTComponent<C, B>, B extends NBT
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B nbtPath(final @NotNull String nbtPath);
+  B nbtPath(final String nbtPath);
 
   /**
    * Sets whether to interpret.
@@ -57,7 +56,7 @@ public interface NBTComponentBuilder<C extends NBTComponent<C, B>, B extends NBT
    * @since 4.0.0
    */
   @Contract("_ -> this")
-  @NotNull B interpret(final boolean interpret);
+  B interpret(final boolean interpret);
 
   /**
    * Sets the separator.
@@ -67,5 +66,5 @@ public interface NBTComponentBuilder<C extends NBTComponent<C, B>, B extends NBT
    * @since 4.8.0
    */
   @Contract("_ -> this")
-  @NotNull B separator(final @Nullable ComponentLike separator);
+  B separator(final @Nullable ComponentLike separator);
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/NBTComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/NBTComponentImpl.java
index 0e139473da..4a1bb8146e 100644
--- a/api/src/main/java/net/kyori/adventure/text/NBTComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/NBTComponentImpl.java
@@ -26,16 +26,17 @@
 import java.util.List;
 import java.util.Objects;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 abstract class NBTComponentImpl<C extends NBTComponent<C, B>, B extends NBTComponentBuilder<C, B>> extends AbstractComponent implements NBTComponent<C, B> {
   static final boolean INTERPRET_DEFAULT = false;
   final String nbtPath;
   final boolean interpret;
   final @Nullable Component separator;
 
-  NBTComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final String nbtPath, final boolean interpret, final @Nullable Component separator) {
+  NBTComponentImpl(final List<Component> children, final Style style, final String nbtPath, final boolean interpret, final @Nullable Component separator) {
     super(children, style);
     this.nbtPath = nbtPath;
     this.interpret = interpret;
@@ -43,7 +44,7 @@ abstract class NBTComponentImpl<C extends NBTComponent<C, B>, B extends NBTCompo
   }
 
   @Override
-  public @NotNull String nbtPath() {
+  public String nbtPath() {
     return this.nbtPath;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
index 1982a56800..38320acc59 100644
--- a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
@@ -31,8 +31,8 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Some magic to change return types.
@@ -40,106 +40,107 @@
  * @param <C> the component type
  * @since 4.0.0
  */
+@NullMarked
 public interface ScopedComponent<C extends Component> extends Component {
   @Override
-  @NotNull C children(final @NotNull List<? extends ComponentLike> children);
+  C children(final List<? extends ComponentLike> children);
 
   @Override
-  @NotNull C style(final @NotNull Style style);
+  C style(final Style style);
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C style(final @NotNull Consumer<Style.Builder> style) {
+  default C style(final Consumer<Style.Builder> style) {
     return (C) Component.super.style(style);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C style(final Style.@NotNull Builder style) {
+  default C style(final Style.Builder style) {
     return (C) Component.super.style(style);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C mergeStyle(final @NotNull Component that) {
+  default C mergeStyle(final Component that) {
     return (C) Component.super.mergeStyle(that);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C mergeStyle(final @NotNull Component that, final Style.@NotNull Merge@NotNull... merges) {
+  default C mergeStyle(final Component that, final Style.Merge... merges) {
     return (C) Component.super.mergeStyle(that, merges);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C append(final @NotNull Component component) {
+  default C append(final Component component) {
     return (C) Component.super.append(component);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C append(final @NotNull ComponentLike like) {
+  default C append(final ComponentLike like) {
     return (C) Component.super.append(like);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C append(final @NotNull ComponentBuilder<?, ?> builder) {
+  default C append(final ComponentBuilder<?, ?> builder) {
     return (C) Component.super.append(builder);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C mergeStyle(final @NotNull Component that, final @NotNull Set<Style.Merge> merges) {
+  default C mergeStyle(final Component that, final Set<Style.Merge> merges) {
     return (C) Component.super.mergeStyle(that, merges);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C color(final @Nullable TextColor color) {
+  default C color(final @Nullable TextColor color) {
     return (C) Component.super.color(color);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C colorIfAbsent(final @Nullable TextColor color) {
+  default C colorIfAbsent(final @Nullable TextColor color) {
     return (C) Component.super.colorIfAbsent(color);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C decorate(final @NotNull TextDecoration decoration) {
+  default C decorate(final TextDecoration decoration) {
     return (C) Component.super.decorate(decoration);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C decoration(final @NotNull TextDecoration decoration, final boolean flag) {
+  default C decoration(final TextDecoration decoration, final boolean flag) {
     return (C) Component.super.decoration(decoration, flag);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+  default C decoration(final TextDecoration decoration, final TextDecoration.State state) {
     return (C) Component.super.decoration(decoration, state);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C clickEvent(final @Nullable ClickEvent event) {
+  default C clickEvent(final @Nullable ClickEvent event) {
     return (C) Component.super.clickEvent(event);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C hoverEvent(final @Nullable HoverEventSource<?> event) {
+  default C hoverEvent(final @Nullable HoverEventSource<?> event) {
     return (C) Component.super.hoverEvent(event);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C insertion(final @Nullable String insertion) {
+  default C insertion(final @Nullable String insertion) {
     return (C) Component.super.insertion(insertion);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/ScoreComponent.java b/api/src/main/java/net/kyori/adventure/text/ScoreComponent.java
index 2f54998b47..982c08e892 100644
--- a/api/src/main/java/net/kyori/adventure/text/ScoreComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/ScoreComponent.java
@@ -26,8 +26,8 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A component that can display a player's score from a scoreboard objective,
@@ -51,6 +51,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface ScoreComponent extends BuildableComponent<ScoreComponent, ScoreComponent.Builder>, ScopedComponent<ScoreComponent> {
   /**
    * Gets the score name.
@@ -58,7 +59,7 @@ public interface ScoreComponent extends BuildableComponent<ScoreComponent, Score
    * @return the score name
    * @since 4.0.0
    */
-  @NotNull String name();
+  String name();
 
   /**
    * Sets the score name.
@@ -68,7 +69,7 @@ public interface ScoreComponent extends BuildableComponent<ScoreComponent, Score
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull ScoreComponent name(final @NotNull String name);
+  ScoreComponent name(final String name);
 
   /**
    * Gets the objective name.
@@ -76,7 +77,7 @@ public interface ScoreComponent extends BuildableComponent<ScoreComponent, Score
    * @return the objective name
    * @since 4.0.0
    */
-  @NotNull String objective();
+  String objective();
 
   /**
    * Sets the score objective.
@@ -86,7 +87,7 @@ public interface ScoreComponent extends BuildableComponent<ScoreComponent, Score
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull ScoreComponent objective(final @NotNull String objective);
+  ScoreComponent objective(final String objective);
 
   /**
    * Gets the value.
@@ -108,10 +109,10 @@ public interface ScoreComponent extends BuildableComponent<ScoreComponent, Score
    */
   @Deprecated
   @Contract(pure = true)
-  @NotNull ScoreComponent value(final @Nullable String value);
+  ScoreComponent value(final @Nullable String value);
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("name", this.name()),
@@ -136,7 +137,7 @@ interface Builder extends ComponentBuilder<ScoreComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder name(final @NotNull String name);
+    Builder name(final String name);
 
     /**
      * Sets the score objective.
@@ -146,7 +147,7 @@ interface Builder extends ComponentBuilder<ScoreComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder objective(final @NotNull String objective);
+    Builder objective(final String objective);
 
     /**
      * Sets the value.
@@ -158,6 +159,6 @@ interface Builder extends ComponentBuilder<ScoreComponent, Builder> {
      */
     @Deprecated
     @Contract("_ -> this")
-    @NotNull Builder value(final @Nullable String value);
+    Builder value(final @Nullable String value);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/ScoreComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/ScoreComponentImpl.java
index 6aed06727c..c784b59bc7 100644
--- a/api/src/main/java/net/kyori/adventure/text/ScoreComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/ScoreComponentImpl.java
@@ -27,18 +27,19 @@
 import java.util.Objects;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class ScoreComponentImpl extends AbstractComponent implements ScoreComponent {
   private final String name;
   private final String objective;
   @Deprecated
   private final @Nullable String value;
 
-  static ScoreComponent create(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style, final @NotNull String name, final @NotNull String objective, final @Nullable String value) {
+  static ScoreComponent create(final List<? extends ComponentLike> children, final Style style, final String name, final String objective, final @Nullable String value) {
     return new ScoreComponentImpl(
       ComponentLike.asComponents(children, IS_NOT_EMPTY),
       requireNonNull(style, "style"),
@@ -48,7 +49,7 @@ static ScoreComponent create(final @NotNull List<? extends ComponentLike> childr
     );
   }
 
-  ScoreComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final @NotNull String name, final @NotNull String objective, final @Nullable String value) {
+  ScoreComponentImpl(final List<Component> children, final Style style, final String name, final String objective, final @Nullable String value) {
     super(children, style);
     this.name = name;
     this.objective = objective;
@@ -56,23 +57,23 @@ static ScoreComponent create(final @NotNull List<? extends ComponentLike> childr
   }
 
   @Override
-  public @NotNull String name() {
+  public String name() {
     return this.name;
   }
 
   @Override
-  public @NotNull ScoreComponent name(final @NotNull String name) {
+  public ScoreComponent name(final String name) {
     if (Objects.equals(this.name, name)) return this;
     return create(this.children, this.style, name, this.objective, this.value);
   }
 
   @Override
-  public @NotNull String objective() {
+  public String objective() {
     return this.objective;
   }
 
   @Override
-  public @NotNull ScoreComponent objective(final @NotNull String objective) {
+  public ScoreComponent objective(final String objective) {
     if (Objects.equals(this.objective, objective)) return this;
     return create(this.children, this.style, this.name, objective, this.value);
   }
@@ -85,18 +86,18 @@ static ScoreComponent create(final @NotNull List<? extends ComponentLike> childr
 
   @Override
   @Deprecated
-  public @NotNull ScoreComponent value(final @Nullable String value) {
+  public ScoreComponent value(final @Nullable String value) {
     if (Objects.equals(this.value, value)) return this;
     return create(this.children, this.style, this.name, this.objective, value);
   }
 
   @Override
-  public @NotNull ScoreComponent children(final @NotNull List<? extends ComponentLike> children) {
+  public ScoreComponent children(final List<? extends ComponentLike> children) {
     return create(children, this.style, this.name, this.objective, this.value);
   }
 
   @Override
-  public @NotNull ScoreComponent style(final @NotNull Style style) {
+  public ScoreComponent style(final Style style) {
     return create(this.children, style, this.name, this.objective, this.value);
   }
 
@@ -127,7 +128,7 @@ public String toString() {
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -140,7 +141,7 @@ static final class BuilderImpl extends AbstractComponentBuilder<ScoreComponent,
     }
 
     @SuppressWarnings("deprecation")
-    BuilderImpl(final @NotNull ScoreComponent component) {
+    BuilderImpl(final ScoreComponent component) {
       super(component);
       this.name = component.name();
       this.objective = component.objective();
@@ -148,26 +149,26 @@ static final class BuilderImpl extends AbstractComponentBuilder<ScoreComponent,
     }
 
     @Override
-    public @NotNull Builder name(final @NotNull String name) {
+    public Builder name(final String name) {
       this.name = requireNonNull(name, "name");
       return this;
     }
 
     @Override
-    public @NotNull Builder objective(final @NotNull String objective) {
+    public Builder objective(final String objective) {
       this.objective = requireNonNull(objective, "objective");
       return this;
     }
 
     @Override
     @Deprecated
-    public @NotNull Builder value(final @Nullable String value) {
+    public Builder value(final @Nullable String value) {
       this.value = value;
       return this;
     }
 
     @Override
-    public @NotNull ScoreComponent build() {
+    public ScoreComponent build() {
       if (this.name == null) throw new IllegalStateException("name must be set");
       if (this.objective == null) throw new IllegalStateException("objective must be set");
       return create(this.children, this.buildStyle(), this.name, this.objective, this.value);
diff --git a/api/src/main/java/net/kyori/adventure/text/SelectorComponent.java b/api/src/main/java/net/kyori/adventure/text/SelectorComponent.java
index c67fb6cbbf..6d8d81b0f6 100644
--- a/api/src/main/java/net/kyori/adventure/text/SelectorComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/SelectorComponent.java
@@ -26,8 +26,8 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A component that can display the name of entities found with a given selector.
@@ -44,6 +44,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface SelectorComponent extends BuildableComponent<SelectorComponent, SelectorComponent.Builder>, ScopedComponent<SelectorComponent> {
   /**
    * Gets the selector pattern.
@@ -51,7 +52,7 @@ public interface SelectorComponent extends BuildableComponent<SelectorComponent,
    * @return the selector pattern
    * @since 4.0.0
    */
-  @NotNull String pattern();
+  String pattern();
 
   /**
    * Sets the selector pattern.
@@ -61,7 +62,7 @@ public interface SelectorComponent extends BuildableComponent<SelectorComponent,
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull SelectorComponent pattern(final @NotNull String pattern);
+  SelectorComponent pattern(final String pattern);
 
   /**
    * Gets the separator.
@@ -78,10 +79,10 @@ public interface SelectorComponent extends BuildableComponent<SelectorComponent,
    * @return the separator
    * @since 4.8.0
    */
-  @NotNull SelectorComponent separator(final @Nullable ComponentLike separator);
+  SelectorComponent separator(final @Nullable ComponentLike separator);
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("pattern", this.pattern()),
@@ -105,7 +106,7 @@ interface Builder extends ComponentBuilder<SelectorComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder pattern(final @NotNull String pattern);
+    Builder pattern(final String pattern);
 
     /**
      * Sets the separator.
@@ -115,6 +116,6 @@ interface Builder extends ComponentBuilder<SelectorComponent, Builder> {
      * @since 4.8.0
      */
     @Contract("_ -> this")
-    @NotNull Builder separator(final @Nullable ComponentLike separator);
+    Builder separator(final @Nullable ComponentLike separator);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/SelectorComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/SelectorComponentImpl.java
index aecff04fee..61af34f5c0 100644
--- a/api/src/main/java/net/kyori/adventure/text/SelectorComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/SelectorComponentImpl.java
@@ -27,16 +27,17 @@
 import java.util.Objects;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class SelectorComponentImpl extends AbstractComponent implements SelectorComponent {
   private final String pattern;
   private final @Nullable Component separator;
 
-  static SelectorComponent create(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style, final @NotNull String pattern, final @Nullable ComponentLike separator) {
+  static SelectorComponent create(final List<? extends ComponentLike> children, final Style style, final String pattern, final @Nullable ComponentLike separator) {
     return new SelectorComponentImpl(
       ComponentLike.asComponents(children, IS_NOT_EMPTY),
       requireNonNull(style, "style"),
@@ -45,19 +46,19 @@ static SelectorComponent create(final @NotNull List<? extends ComponentLike> chi
     );
   }
 
-  SelectorComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final @NotNull String pattern, final @Nullable Component separator) {
+  SelectorComponentImpl(final List<Component> children, final Style style, final String pattern, final @Nullable Component separator) {
     super(children, style);
     this.pattern = pattern;
     this.separator = separator;
   }
 
   @Override
-  public @NotNull String pattern() {
+  public String pattern() {
     return this.pattern;
   }
 
   @Override
-  public @NotNull SelectorComponent pattern(final @NotNull String pattern) {
+  public SelectorComponent pattern(final String pattern) {
     if (Objects.equals(this.pattern, pattern)) return this;
     return create(this.children, this.style, pattern, this.separator);
   }
@@ -68,17 +69,17 @@ static SelectorComponent create(final @NotNull List<? extends ComponentLike> chi
   }
 
   @Override
-  public @NotNull SelectorComponent separator(final @Nullable ComponentLike separator) {
+  public SelectorComponent separator(final @Nullable ComponentLike separator) {
     return create(this.children, this.style, this.pattern, separator);
   }
 
   @Override
-  public @NotNull SelectorComponent children(final @NotNull List<? extends ComponentLike> children) {
+  public SelectorComponent children(final List<? extends ComponentLike> children) {
     return create(children, this.style, this.pattern, this.separator);
   }
 
   @Override
-  public @NotNull SelectorComponent style(final @NotNull Style style) {
+  public SelectorComponent style(final Style style) {
     return create(this.children, style, this.pattern, this.separator);
   }
 
@@ -105,7 +106,7 @@ public String toString() {
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -116,26 +117,26 @@ static final class BuilderImpl extends AbstractComponentBuilder<SelectorComponen
     BuilderImpl() {
     }
 
-    BuilderImpl(final @NotNull SelectorComponent component) {
+    BuilderImpl(final SelectorComponent component) {
       super(component);
       this.pattern = component.pattern();
       this.separator = component.separator();
     }
 
     @Override
-    public @NotNull Builder pattern(final @NotNull String pattern) {
+    public Builder pattern(final String pattern) {
       this.pattern = requireNonNull(pattern, "pattern");
       return this;
     }
 
     @Override
-    public @NotNull Builder separator(final @Nullable ComponentLike separator) {
+    public Builder separator(final @Nullable ComponentLike separator) {
       this.separator = ComponentLike.unbox(separator);
       return this;
     }
 
     @Override
-    public @NotNull SelectorComponent build() {
+    public SelectorComponent build() {
       if (this.pattern == null) throw new IllegalStateException("pattern must be set");
       return create(this.children, this.buildStyle(), this.pattern, this.separator);
     }
diff --git a/api/src/main/java/net/kyori/adventure/text/StorageNBTComponent.java b/api/src/main/java/net/kyori/adventure/text/StorageNBTComponent.java
index 02c86cc9f2..c3c750ffd3 100644
--- a/api/src/main/java/net/kyori/adventure/text/StorageNBTComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/StorageNBTComponent.java
@@ -27,7 +27,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Given a {@link Key}, this component reads the NBT of the associated command storage and displays that information.
@@ -44,6 +44,7 @@
  * @since 4.0.0
  * @sinceMinecraft 1.15
  */
+@NullMarked
 public interface StorageNBTComponent extends NBTComponent<StorageNBTComponent, StorageNBTComponent.Builder>, ScopedComponent<StorageNBTComponent> {
   /**
    * Gets the NBT storage's ID.
@@ -51,7 +52,7 @@ public interface StorageNBTComponent extends NBTComponent<StorageNBTComponent, S
    * @return the NBT storage
    * @since 4.0.0
    */
-  @NotNull Key storage();
+  Key storage();
 
   /**
    * Sets the NBT storage.
@@ -61,10 +62,10 @@ public interface StorageNBTComponent extends NBTComponent<StorageNBTComponent, S
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull StorageNBTComponent storage(final @NotNull Key storage);
+  StorageNBTComponent storage(final Key storage);
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("storage", this.storage())
@@ -87,6 +88,6 @@ interface Builder extends NBTComponentBuilder<StorageNBTComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder storage(final @NotNull Key storage);
+    Builder storage(final Key storage);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/StorageNBTComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/StorageNBTComponentImpl.java
index 97f34a4c1b..f19d54876e 100644
--- a/api/src/main/java/net/kyori/adventure/text/StorageNBTComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/StorageNBTComponentImpl.java
@@ -28,15 +28,16 @@
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class StorageNBTComponentImpl extends NBTComponentImpl<StorageNBTComponent, StorageNBTComponent.Builder> implements StorageNBTComponent {
   private final Key storage;
 
-  static @NotNull StorageNBTComponent create(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style, final String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final @NotNull Key storage) {
+  static StorageNBTComponent create(final List<? extends ComponentLike> children, final Style style, final String nbtPath, final boolean interpret, final @Nullable ComponentLike separator, final Key storage) {
     return new StorageNBTComponentImpl(
       ComponentLike.asComponents(children, IS_NOT_EMPTY),
       requireNonNull(style, "style"),
@@ -47,19 +48,19 @@ final class StorageNBTComponentImpl extends NBTComponentImpl<StorageNBTComponent
     );
   }
 
-  StorageNBTComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final String nbtPath, final boolean interpret, final @Nullable Component separator, final Key storage) {
+  StorageNBTComponentImpl(final List<Component> children, final Style style, final String nbtPath, final boolean interpret, final @Nullable Component separator, final Key storage) {
     super(children, style, nbtPath, interpret, separator);
     this.storage = storage;
   }
 
   @Override
-  public @NotNull StorageNBTComponent nbtPath(final @NotNull String nbtPath) {
+  public StorageNBTComponent nbtPath(final String nbtPath) {
     if (Objects.equals(this.nbtPath, nbtPath)) return this;
     return create(this.children, this.style, nbtPath, this.interpret, this.separator, this.storage);
   }
 
   @Override
-  public @NotNull StorageNBTComponent interpret(final boolean interpret) {
+  public StorageNBTComponent interpret(final boolean interpret) {
     if (this.interpret == interpret) return this;
     return create(this.children, this.style, this.nbtPath, interpret, this.separator, this.storage);
   }
@@ -70,28 +71,28 @@ final class StorageNBTComponentImpl extends NBTComponentImpl<StorageNBTComponent
   }
 
   @Override
-  public @NotNull StorageNBTComponent separator(final @Nullable ComponentLike separator) {
+  public StorageNBTComponent separator(final @Nullable ComponentLike separator) {
     return create(this.children, this.style, this.nbtPath, this.interpret, separator, this.storage);
   }
 
   @Override
-  public @NotNull Key storage() {
+  public Key storage() {
     return this.storage;
   }
 
   @Override
-  public @NotNull StorageNBTComponent storage(final @NotNull Key storage) {
+  public StorageNBTComponent storage(final Key storage) {
     if (Objects.equals(this.storage, storage)) return this;
     return create(this.children, this.style, this.nbtPath, this.interpret, this.separator, storage);
   }
 
   @Override
-  public @NotNull StorageNBTComponent children(final @NotNull List<? extends ComponentLike> children) {
+  public StorageNBTComponent children(final List<? extends ComponentLike> children) {
     return create(children, this.style, this.nbtPath, this.interpret, this.separator, this.storage);
   }
 
   @Override
-  public @NotNull StorageNBTComponent style(final @NotNull Style style) {
+  public StorageNBTComponent style(final Style style) {
     return create(this.children, style, this.nbtPath, this.interpret, this.separator, this.storage);
   }
 
@@ -117,7 +118,7 @@ public String toString() {
   }
 
   @Override
-  public StorageNBTComponent.@NotNull Builder toBuilder() {
+  public StorageNBTComponent.Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -127,19 +128,19 @@ static class BuilderImpl extends AbstractNBTComponentBuilder<StorageNBTComponent
     BuilderImpl() {
     }
 
-    BuilderImpl(final @NotNull StorageNBTComponent component) {
+    BuilderImpl(final StorageNBTComponent component) {
       super(component);
       this.storage = component.storage();
     }
 
     @Override
-    public StorageNBTComponent.@NotNull Builder storage(final @NotNull Key storage) {
+    public StorageNBTComponent.Builder storage(final Key storage) {
       this.storage = requireNonNull(storage, "storage");
       return this;
     }
 
     @Override
-    public @NotNull StorageNBTComponent build() {
+    public StorageNBTComponent build() {
       if (this.nbtPath == null) throw new IllegalStateException("nbt path must be set");
       if (this.storage == null) throw new IllegalStateException("storage must be set");
       return create(this.children, this.buildStyle(), this.nbtPath, this.interpret, this.separator, this.storage);
diff --git a/api/src/main/java/net/kyori/adventure/text/TextComponent.java b/api/src/main/java/net/kyori/adventure/text/TextComponent.java
index cdfc105da4..b363f67bbc 100644
--- a/api/src/main/java/net/kyori/adventure/text/TextComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/TextComponent.java
@@ -27,7 +27,7 @@
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A component that displays a string.
@@ -40,6 +40,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface TextComponent extends BuildableComponent<TextComponent, TextComponent.Builder>, ScopedComponent<TextComponent> {
   /**
    * Creates a component with {@code components} as the children.
@@ -51,7 +52,7 @@ public interface TextComponent extends BuildableComponent<TextComponent, TextCom
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
-  static @NotNull TextComponent ofChildren(final @NotNull ComponentLike@NotNull... components) {
+  static TextComponent ofChildren(final ComponentLike... components) {
     return Component.textOfChildren(components);
   }
 
@@ -61,7 +62,7 @@ public interface TextComponent extends BuildableComponent<TextComponent, TextCom
    * @return the plain text content
    * @since 4.0.0
    */
-  @NotNull String content();
+  String content();
 
   /**
    * Sets the plain text content.
@@ -71,10 +72,10 @@ public interface TextComponent extends BuildableComponent<TextComponent, TextCom
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull TextComponent content(final @NotNull String content);
+  TextComponent content(final String content);
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("content", this.content())
@@ -95,7 +96,7 @@ interface Builder extends ComponentBuilder<TextComponent, Builder> {
      * @return the plain text content
      * @since 4.0.0
      */
-    @NotNull String content();
+    String content();
 
     /**
      * Sets the plain text content.
@@ -105,6 +106,6 @@ interface Builder extends ComponentBuilder<TextComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder content(final @NotNull String content);
+    Builder content(final String content);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/TextComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/TextComponentImpl.java
index f29847603f..2a573b626c 100644
--- a/api/src/main/java/net/kyori/adventure/text/TextComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/TextComponentImpl.java
@@ -30,12 +30,13 @@
 import net.kyori.adventure.internal.properties.AdventureProperties;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.util.Nag;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class TextComponentImpl extends AbstractComponent implements TextComponent {
   private static final boolean WARN_WHEN_LEGACY_FORMATTING_DETECTED = Boolean.TRUE.equals(AdventureProperties.TEXT_WARN_WHEN_LEGACY_FORMATTING_DETECTED.value());
   @VisibleForTesting
@@ -45,7 +46,7 @@ final class TextComponentImpl extends AbstractComponent implements TextComponent
   static final TextComponent NEWLINE = createDirect("\n");
   static final TextComponent SPACE = createDirect(" ");
 
-  static TextComponent create(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style, final @NotNull String content) {
+  static TextComponent create(final List<? extends ComponentLike> children, final Style style, final String content) {
     final List<Component> filteredChildren = ComponentLike.asComponents(children, IS_NOT_EMPTY);
     if (filteredChildren.isEmpty() && style.isEmpty() && content.isEmpty()) return Component.empty();
 
@@ -56,13 +57,13 @@ static TextComponent create(final @NotNull List<? extends ComponentLike> childre
     );
   }
 
-  private static @NotNull TextComponent createDirect(final @NotNull String content) {
+  private static TextComponent createDirect(final String content) {
     return new TextComponentImpl(Collections.emptyList(), Style.empty(), content);
   }
 
   private final String content;
 
-  TextComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final @NotNull String content) {
+  TextComponentImpl(final List<Component> children, final Style style, final String content) {
     super(children, style);
     this.content = content;
 
@@ -83,23 +84,23 @@ static TextComponent create(final @NotNull List<? extends ComponentLike> childre
   }
 
   @Override
-  public @NotNull String content() {
+  public String content() {
     return this.content;
   }
 
   @Override
-  public @NotNull TextComponent content(final @NotNull String content) {
+  public TextComponent content(final String content) {
     if (Objects.equals(this.content, content)) return this;
     return create(this.children, this.style, content);
   }
 
   @Override
-  public @NotNull TextComponent children(final @NotNull List<? extends ComponentLike> children) {
+  public TextComponent children(final List<? extends ComponentLike> children) {
     return create(children, this.style, this.content);
   }
 
   @Override
-  public @NotNull TextComponent style(final @NotNull Style style) {
+  public TextComponent style(final Style style) {
     return create(this.children, style, this.content);
   }
 
@@ -125,7 +126,7 @@ public String toString() {
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -140,24 +141,24 @@ static final class BuilderImpl extends AbstractComponentBuilder<TextComponent, B
     BuilderImpl() {
     }
 
-    BuilderImpl(final @NotNull TextComponent component) {
+    BuilderImpl(final TextComponent component) {
       super(component);
       this.content = component.content();
     }
 
     @Override
-    public @NotNull Builder content(final @NotNull String content) {
+    public Builder content(final String content) {
       this.content = requireNonNull(content, "content");
       return this;
     }
 
     @Override
-    public @NotNull String content() {
+    public String content() {
       return this.content;
     }
 
     @Override
-    public @NotNull TextComponent build() {
+    public TextComponent build() {
       if (this.isEmpty()) {
         return Component.empty();
       }
diff --git a/api/src/main/java/net/kyori/adventure/text/TextReplacementConfig.java b/api/src/main/java/net/kyori/adventure/text/TextReplacementConfig.java
index 4b389935df..68ec05d05a 100644
--- a/api/src/main/java/net/kyori/adventure/text/TextReplacementConfig.java
+++ b/api/src/main/java/net/kyori/adventure/text/TextReplacementConfig.java
@@ -33,8 +33,8 @@
 import net.kyori.examination.Examinable;
 import org.intellij.lang.annotations.RegExp;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -46,6 +46,7 @@
  *
  * @since 4.2.0
  */
+@NullMarked
 public interface TextReplacementConfig extends Buildable<TextReplacementConfig, TextReplacementConfig.Builder>, Examinable {
   /**
    * Create a new builder.
@@ -53,7 +54,7 @@ public interface TextReplacementConfig extends Buildable<TextReplacementConfig,
    * @return a new builder
    * @since 4.2.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new TextReplacementConfigImpl.Builder();
   }
 
@@ -63,7 +64,7 @@ public interface TextReplacementConfig extends Buildable<TextReplacementConfig,
    * @return the match pattern
    * @since 4.2.0
    */
-  @NotNull Pattern matchPattern();
+  Pattern matchPattern();
 
   /**
    * A builder for replacement configurations.
@@ -99,7 +100,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.2.0
      */
     @Contract("_ -> this")
-    default @NotNull Builder match(final @NotNull @RegExp String pattern) {
+    default Builder match(final @RegExp String pattern) {
       return this.match(Pattern.compile(pattern));
     }
 
@@ -111,7 +112,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.2.0
      */
     @Contract("_ -> this")
-    @NotNull Builder match(final @NotNull Pattern pattern);
+    Builder match(final Pattern pattern);
 
     /*
      * ---------------------------
@@ -125,7 +126,7 @@ default Builder matchLiteral(final String literal) {
      * @return this builder
      * @since 4.2.0
      */
-    default @NotNull Builder once() {
+    default Builder once() {
       return this.times(1);
     }
 
@@ -137,7 +138,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.2.0
      */
     @Contract("_ -> this")
-    default @NotNull Builder times(final int times) {
+    default Builder times(final int times) {
       return this.condition((index, replaced) -> replaced < times ? PatternReplacementResult.REPLACE : PatternReplacementResult.STOP);
     }
 
@@ -150,7 +151,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.2.0
      */
     @Contract("_ -> this")
-    default @NotNull Builder condition(final @NotNull IntFunction2<PatternReplacementResult> condition) {
+    default Builder condition(final IntFunction2<PatternReplacementResult> condition) {
       return this.condition((result, matchCount, replaced) -> condition.apply(matchCount, replaced));
     }
 
@@ -163,7 +164,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.8.0
      */
     @Contract("_ -> this")
-    @NotNull Builder condition(final @NotNull Condition condition);
+    Builder condition(final Condition condition);
 
     /*
      * -------------------------
@@ -179,7 +180,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.2.0
      */
     @Contract("_ -> this")
-    default @NotNull Builder replacement(final @NotNull String replacement) {
+    default Builder replacement(final String replacement) {
       requireNonNull(replacement, "replacement");
       return this.replacement(builder -> builder.content(replacement));
     }
@@ -192,7 +193,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.2.0
      */
     @Contract("_ -> this")
-    default @NotNull Builder replacement(final @Nullable ComponentLike replacement) {
+    default Builder replacement(final @Nullable ComponentLike replacement) {
       final @Nullable Component baked = ComponentLike.unbox(replacement);
       return this.replacement((result, input) -> baked);
     }
@@ -205,7 +206,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.2.0
      */
     @Contract("_ -> this")
-    default @NotNull Builder replacement(final @NotNull Function<TextComponent.Builder, @Nullable ComponentLike> replacement) {
+    default Builder replacement(final Function<TextComponent.Builder, @Nullable ComponentLike> replacement) {
       requireNonNull(replacement, "replacement");
       return this.replacement((result, input) -> replacement.apply(input));
 
@@ -219,7 +220,7 @@ default Builder matchLiteral(final String literal) {
      * @since 4.2.0
      */
     @Contract("_ -> this")
-    @NotNull Builder replacement(final @NotNull BiFunction<MatchResult, TextComponent.Builder, @Nullable ComponentLike> replacement);
+    Builder replacement(final BiFunction<MatchResult, TextComponent.Builder, @Nullable ComponentLike> replacement);
   }
 
   /**
@@ -238,6 +239,6 @@ interface Condition {
      * @return whether a certain match should
      * @since 4.8.0
      */
-    @NotNull PatternReplacementResult shouldReplace(final @NotNull MatchResult result, final int matchCount, final int replaced);
+    PatternReplacementResult shouldReplace(final MatchResult result, final int matchCount, final int replaced);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/TextReplacementConfigImpl.java b/api/src/main/java/net/kyori/adventure/text/TextReplacementConfigImpl.java
index c04e32a0df..f5bf61b5e2 100644
--- a/api/src/main/java/net/kyori/adventure/text/TextReplacementConfigImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/TextReplacementConfigImpl.java
@@ -29,11 +29,12 @@
 import java.util.stream.Stream;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class TextReplacementConfigImpl implements TextReplacementConfig {
   private final Pattern matchPattern;
   private final BiFunction<MatchResult, TextComponent.Builder, @Nullable ComponentLike> replacement;
@@ -46,7 +47,7 @@ final class TextReplacementConfigImpl implements TextReplacementConfig {
   }
 
   @Override
-  public @NotNull Pattern matchPattern() {
+  public Pattern matchPattern() {
     return this.matchPattern;
   }
 
@@ -55,12 +56,12 @@ TextReplacementRenderer.State createState() {
   }
 
   @Override
-  public TextReplacementConfig.@NotNull Builder toBuilder() {
+  public TextReplacementConfig.Builder toBuilder() {
     return new Builder(this);
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("matchPattern", this.matchPattern),
       ExaminableProperty.of("replacement", this.replacement),
@@ -88,25 +89,25 @@ static final class Builder implements TextReplacementConfig.Builder {
     }
 
     @Override
-    public @NotNull Builder match(final @NotNull Pattern pattern) {
+    public Builder match(final Pattern pattern) {
       this.matchPattern = requireNonNull(pattern, "pattern");
       return this;
     }
 
     @Override
-    public @NotNull Builder condition(final TextReplacementConfig.@NotNull Condition condition) {
+    public Builder condition(final TextReplacementConfig.Condition condition) {
       this.continuer = requireNonNull(condition, "continuation");
       return this;
     }
 
     @Override
-    public @NotNull Builder replacement(final @NotNull BiFunction<MatchResult, TextComponent.Builder, @Nullable ComponentLike> replacement) {
+    public Builder replacement(final BiFunction<MatchResult, TextComponent.Builder, @Nullable ComponentLike> replacement) {
       this.replacement = requireNonNull(replacement, "replacement");
       return this;
     }
 
     @Override
-    public @NotNull TextReplacementConfig build() {
+    public TextReplacementConfig build() {
       if (this.matchPattern == null) throw new IllegalStateException("A pattern must be provided to match against");
       if (this.replacement == null) throw new IllegalStateException("A replacement action must be provided");
       return new TextReplacementConfigImpl(this);
diff --git a/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java b/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java
index 9034a61313..916fe97ff0 100644
--- a/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java
+++ b/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java
@@ -32,12 +32,13 @@
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.renderer.ComponentRenderer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A renderer performing a replacement on every {@link TextComponent} element of a component tree.
  */
+@NullMarked
 final class TextReplacementRenderer implements ComponentRenderer<TextReplacementRenderer.State> {
   static final TextReplacementRenderer INSTANCE = new TextReplacementRenderer();
 
@@ -45,7 +46,7 @@ private TextReplacementRenderer() {
   }
 
   @Override
-  public @NotNull Component render(final @NotNull Component component, final @NotNull State state) {
+  public Component render(final Component component, final State state) {
     if (!state.running) return component;
     final boolean prevFirstMatch = state.firstMatch;
     state.firstMatch = true;
@@ -205,7 +206,7 @@ static final class State {
     int replaceCount = 0;
     boolean firstMatch = true;
 
-    State(final @NotNull Pattern pattern, final @NotNull BiFunction<MatchResult, TextComponent.Builder, @Nullable ComponentLike> replacement, final TextReplacementConfig.@NotNull Condition continuer) {
+    State(final Pattern pattern, final BiFunction<MatchResult, TextComponent.Builder, @Nullable ComponentLike> replacement, final TextReplacementConfig.Condition continuer) {
       this.pattern = pattern;
       this.replacement = replacement;
       this.continuer = continuer;
diff --git a/api/src/main/java/net/kyori/adventure/text/TranslatableComponent.java b/api/src/main/java/net/kyori/adventure/text/TranslatableComponent.java
index 809fd728d6..1043fda935 100644
--- a/api/src/main/java/net/kyori/adventure/text/TranslatableComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/TranslatableComponent.java
@@ -33,8 +33,8 @@
 import net.kyori.adventure.translation.TranslationRegistry;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A component that can display translated text.
@@ -61,6 +61,7 @@
  * @see TranslationRegistry
  * @since 4.0.0
  */
+@NullMarked
 public interface TranslatableComponent extends BuildableComponent<TranslatableComponent, TranslatableComponent.Builder>, ScopedComponent<TranslatableComponent> {
   /**
    * Gets the translation key.
@@ -68,7 +69,7 @@ public interface TranslatableComponent extends BuildableComponent<TranslatableCo
    * @return the translation key
    * @since 4.0.0
    */
-  @NotNull String key();
+  String key();
 
   /**
    * Sets the translation key.
@@ -78,7 +79,7 @@ public interface TranslatableComponent extends BuildableComponent<TranslatableCo
    * @since 4.8.0
    */
   @Contract(pure = true)
-  default @NotNull TranslatableComponent key(final @NotNull Translatable translatable) {
+  default TranslatableComponent key(final Translatable translatable) {
     return this.key(Objects.requireNonNull(translatable, "translatable").translationKey());
   }
 
@@ -90,7 +91,7 @@ public interface TranslatableComponent extends BuildableComponent<TranslatableCo
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull TranslatableComponent key(final @NotNull String key);
+  TranslatableComponent key(final String key);
 
   /**
    * Gets the unmodifiable list of translation arguments.
@@ -98,7 +99,7 @@ public interface TranslatableComponent extends BuildableComponent<TranslatableCo
    * @return the unmodifiable list of translation arguments
    * @since 4.0.0
    */
-  @NotNull List<Component> args();
+  List<Component> args();
 
   /**
    * Sets the translation arguments for this component.
@@ -108,7 +109,7 @@ public interface TranslatableComponent extends BuildableComponent<TranslatableCo
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull TranslatableComponent args(final @NotNull ComponentLike@NotNull... args);
+  TranslatableComponent args(final ComponentLike... args);
 
   /**
    * Sets the translation arguments for this component.
@@ -118,7 +119,7 @@ public interface TranslatableComponent extends BuildableComponent<TranslatableCo
    * @since 4.0.0
    */
   @Contract(pure = true)
-  @NotNull TranslatableComponent args(final @NotNull List<? extends ComponentLike> args);
+  TranslatableComponent args(final List<? extends ComponentLike> args);
 
   /**
    * Gets the translation fallback text for this component.
@@ -142,10 +143,10 @@ public interface TranslatableComponent extends BuildableComponent<TranslatableCo
    * @sinceMinecraft 1.19.4
    */
   @Contract(pure = true)
-  @NotNull TranslatableComponent fallback(final @Nullable String fallback);
+  TranslatableComponent fallback(final @Nullable String fallback);
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(
         ExaminableProperty.of("key", this.key()),
@@ -170,7 +171,7 @@ interface Builder extends ComponentBuilder<TranslatableComponent, Builder> {
      * @since 4.8.0
      */
     @Contract(pure = true)
-    default @NotNull Builder key(final @NotNull Translatable translatable) {
+    default Builder key(final Translatable translatable) {
       return this.key(Objects.requireNonNull(translatable, "translatable").translationKey());
     }
 
@@ -182,7 +183,7 @@ interface Builder extends ComponentBuilder<TranslatableComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder key(final @NotNull String key);
+    Builder key(final String key);
 
     /**
      * Sets the translation args.
@@ -192,7 +193,7 @@ interface Builder extends ComponentBuilder<TranslatableComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder args(final @NotNull ComponentBuilder<?, ?> arg);
+    Builder args(final ComponentBuilder<?, ?> arg);
 
     /**
      * Sets the translation args.
@@ -203,7 +204,7 @@ interface Builder extends ComponentBuilder<TranslatableComponent, Builder> {
      */
     @Contract("_ -> this")
     @SuppressWarnings("checkstyle:GenericWhitespace")
-    @NotNull Builder args(final @NotNull ComponentBuilder<?, ?>@NotNull... args);
+    Builder args(final ComponentBuilder<?, ?>... args);
 
     /**
      * Sets the translation args.
@@ -213,7 +214,7 @@ interface Builder extends ComponentBuilder<TranslatableComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder args(final @NotNull Component arg);
+    Builder args(final Component arg);
 
     /**
      * Sets the translation args.
@@ -223,7 +224,7 @@ interface Builder extends ComponentBuilder<TranslatableComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder args(final @NotNull ComponentLike@NotNull... args);
+    Builder args(final ComponentLike... args);
 
     /**
      * Sets the translation args.
@@ -233,7 +234,7 @@ interface Builder extends ComponentBuilder<TranslatableComponent, Builder> {
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    @NotNull Builder args(final @NotNull List<? extends ComponentLike> args);
+    Builder args(final List<? extends ComponentLike> args);
 
     /**
      * Sets the translation fallback text.
@@ -246,6 +247,6 @@ interface Builder extends ComponentBuilder<TranslatableComponent, Builder> {
      * @sinceMinecraft 1.19.4
      */
     @Contract("_ -> this")
-    @NotNull Builder fallback(final @Nullable String fallback);
+    Builder fallback(final @Nullable String fallback);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/TranslatableComponentImpl.java b/api/src/main/java/net/kyori/adventure/text/TranslatableComponentImpl.java
index df7f1c7353..e86e45a32b 100644
--- a/api/src/main/java/net/kyori/adventure/text/TranslatableComponentImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/TranslatableComponentImpl.java
@@ -31,18 +31,19 @@
 import java.util.stream.Stream;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class TranslatableComponentImpl extends AbstractComponent implements TranslatableComponent {
-  static TranslatableComponent create(final @NotNull List<Component> children, final @NotNull Style style, final @NotNull String key, final @Nullable String fallback, final @NotNull ComponentLike@NotNull[] args) {
+  static TranslatableComponent create(final List<Component> children, final Style style, final String key, final @Nullable String fallback, final ComponentLike[] args) {
     requireNonNull(args, "args");
     return create(children, style, key, fallback, Arrays.asList(args));
   }
 
-  static TranslatableComponent create(final @NotNull List<? extends ComponentLike> children, final @NotNull Style style, final @NotNull String key, final @Nullable String fallback, final @NotNull List<? extends ComponentLike> args) {
+  static TranslatableComponent create(final List<? extends ComponentLike> children, final Style style, final String key, final @Nullable String fallback, final List<? extends ComponentLike> args) {
     return new TranslatableComponentImpl(
       ComponentLike.asComponents(children, IS_NOT_EMPTY),
       requireNonNull(style, "style"),
@@ -56,7 +57,7 @@ static TranslatableComponent create(final @NotNull List<? extends ComponentLike>
   private final @Nullable String fallback;
   private final List<Component> args;
 
-  TranslatableComponentImpl(final @NotNull List<Component> children, final @NotNull Style style, final @NotNull String key, final @Nullable String fallback, final @NotNull List<Component> args) {
+  TranslatableComponentImpl(final List<Component> children, final Style style, final String key, final @Nullable String fallback, final List<Component> args) {
     super(children, style);
     this.key = key;
     this.fallback = fallback;
@@ -64,28 +65,28 @@ static TranslatableComponent create(final @NotNull List<? extends ComponentLike>
   }
 
   @Override
-  public @NotNull String key() {
+  public String key() {
     return this.key;
   }
 
   @Override
-  public @NotNull TranslatableComponent key(final @NotNull String key) {
+  public TranslatableComponent key(final String key) {
     if (Objects.equals(this.key, key)) return this;
     return create(this.children, this.style, key, this.fallback, this.args);
   }
 
   @Override
-  public @NotNull List<Component> args() {
+  public List<Component> args() {
     return this.args;
   }
 
   @Override
-  public @NotNull TranslatableComponent args(final @NotNull ComponentLike@NotNull... args) {
+  public TranslatableComponent args(final ComponentLike... args) {
     return create(this.children, this.style, this.key, this.fallback, args);
   }
 
   @Override
-  public @NotNull TranslatableComponent args(final @NotNull List<? extends ComponentLike> args) {
+  public TranslatableComponent args(final List<? extends ComponentLike> args) {
     return create(this.children, this.style, this.key, this.fallback, args);
   }
 
@@ -95,17 +96,17 @@ static TranslatableComponent create(final @NotNull List<? extends ComponentLike>
   }
 
   @Override
-  public @NotNull TranslatableComponent fallback(final @Nullable String fallback) {
+  public TranslatableComponent fallback(final @Nullable String fallback) {
     return create(this.children, this.style, this.key, fallback, this.args);
   }
 
   @Override
-  public @NotNull TranslatableComponent children(final @NotNull List<? extends ComponentLike> children) {
+  public TranslatableComponent children(final List<? extends ComponentLike> children) {
     return create(children, this.style, this.key, this.fallback, this.args);
   }
 
   @Override
-  public @NotNull TranslatableComponent style(final @NotNull Style style) {
+  public TranslatableComponent style(final Style style) {
     return create(this.children, style, this.key, this.fallback, this.args);
   }
 
@@ -133,7 +134,7 @@ public String toString() {
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -145,7 +146,7 @@ static final class BuilderImpl extends AbstractComponentBuilder<TranslatableComp
     BuilderImpl() {
     }
 
-    BuilderImpl(final @NotNull TranslatableComponent component) {
+    BuilderImpl(final TranslatableComponent component) {
       super(component);
       this.key = component.key();
       this.args = component.args();
@@ -153,50 +154,50 @@ static final class BuilderImpl extends AbstractComponentBuilder<TranslatableComp
     }
 
     @Override
-    public @NotNull Builder key(final @NotNull String key) {
+    public Builder key(final String key) {
       this.key = key;
       return this;
     }
 
     @Override
-    public @NotNull Builder args(final @NotNull ComponentBuilder<?, ?> arg) {
+    public Builder args(final ComponentBuilder<?, ?> arg) {
       return this.args(Collections.singletonList(requireNonNull(arg, "arg").build()));
     }
 
     @Override
     @SuppressWarnings("checkstyle:GenericWhitespace")
-    public @NotNull Builder args(final @NotNull ComponentBuilder<?, ?>@NotNull... args) {
+    public Builder args(final ComponentBuilder<?, ?>... args) {
       requireNonNull(args, "args");
       if (args.length == 0) return this.args(Collections.emptyList());
       return this.args(Stream.of(args).map(ComponentBuilder::build).collect(Collectors.toList()));
     }
 
     @Override
-    public @NotNull Builder args(final @NotNull Component arg) {
+    public Builder args(final Component arg) {
       return this.args(Collections.singletonList(requireNonNull(arg, "arg")));
     }
 
     @Override
-    public @NotNull Builder args(final @NotNull ComponentLike@NotNull... args) {
+    public Builder args(final ComponentLike... args) {
       requireNonNull(args, "args");
       if (args.length == 0) return this.args(Collections.emptyList());
       return this.args(Arrays.asList(args));
     }
 
     @Override
-    public @NotNull Builder args(final @NotNull List<? extends ComponentLike> args) {
+    public Builder args(final List<? extends ComponentLike> args) {
       this.args = ComponentLike.asComponents(requireNonNull(args, "args"));
       return this;
     }
 
     @Override
-    public @NotNull Builder fallback(final @Nullable String fallback) {
+    public Builder fallback(final @Nullable String fallback) {
       this.fallback = fallback;
       return this;
     }
 
     @Override
-    public @NotNull TranslatableComponent build() {
+    public TranslatableComponent build() {
       if (this.key == null) throw new IllegalStateException("key must be set");
       return create(this.children, this.buildStyle(), this.key, this.fallback, this.args);
     }
diff --git a/api/src/main/java/net/kyori/adventure/text/event/ClickCallback.java b/api/src/main/java/net/kyori/adventure/text/event/ClickCallback.java
index a11bdd38bb..d7599b65b5 100644
--- a/api/src/main/java/net/kyori/adventure/text/event/ClickCallback.java
+++ b/api/src/main/java/net/kyori/adventure/text/event/ClickCallback.java
@@ -35,8 +35,8 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.CheckReturnValue;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A handler for callback click events.
@@ -45,6 +45,7 @@
  * @since 4.13.0
  */
 @FunctionalInterface
+@NullMarked
 public interface ClickCallback<T extends Audience> {
   /**
    * The default lifetime of a callback after creating it, 12 hours.
@@ -73,7 +74,7 @@ public interface ClickCallback<T extends Audience> {
    */
   @CheckReturnValue
   @Contract(pure = true)
-  static <W extends Audience, N extends W> @NotNull ClickCallback<W> widen(final @NotNull ClickCallback<N> original, final @NotNull Class<N> type, final @Nullable Consumer<? super Audience> otherwise) {
+  static <W extends Audience, N extends W> ClickCallback<W> widen(final ClickCallback<N> original, final Class<N> type, final @Nullable Consumer<? super Audience> otherwise) {
     return audience -> {
       if (type.isInstance(audience)) {
         original.accept(type.cast(audience));
@@ -97,7 +98,7 @@ public interface ClickCallback<T extends Audience> {
    */
   @CheckReturnValue
   @Contract(pure = true)
-  static <W extends Audience, N extends W> @NotNull ClickCallback<W> widen(final @NotNull ClickCallback<N> original, final @NotNull Class<N> type) {
+  static <W extends Audience, N extends W> ClickCallback<W> widen(final ClickCallback<N> original, final Class<N> type) {
     return widen(original, type, null);
   }
 
@@ -107,7 +108,7 @@ public interface ClickCallback<T extends Audience> {
    * @param audience the single-user audience who is attempting to execute this callback function.
    * @since 4.13.0
    */
-  void accept(final @NotNull T audience);
+  void accept(final T audience);
 
   /**
    * Filter audiences that receive this click callback.
@@ -120,7 +121,7 @@ public interface ClickCallback<T extends Audience> {
    */
   @CheckReturnValue
   @Contract(pure = true)
-  default @NotNull ClickCallback<T> filter(final @NotNull Predicate<T> filter) {
+  default ClickCallback<T> filter(final Predicate<T> filter) {
     return this.filter(filter, null);
   }
 
@@ -134,7 +135,7 @@ public interface ClickCallback<T extends Audience> {
    */
   @CheckReturnValue
   @Contract(pure = true)
-  default @NotNull ClickCallback<T> filter(final @NotNull Predicate<T> filter, final @Nullable Consumer<? super Audience> otherwise) {
+  default ClickCallback<T> filter(final Predicate<T> filter, final @Nullable Consumer<? super Audience> otherwise) {
     return audience -> {
       if (filter.test(audience)) {
         this.accept(audience);
@@ -157,7 +158,7 @@ public interface ClickCallback<T extends Audience> {
    */
   @CheckReturnValue
   @Contract(pure = true)
-  default @NotNull ClickCallback<T> requiringPermission(final @NotNull String permission) {
+  default ClickCallback<T> requiringPermission(final String permission) {
     return this.requiringPermission(permission, null);
   }
 
@@ -173,7 +174,7 @@ public interface ClickCallback<T extends Audience> {
    */
   @CheckReturnValue
   @Contract(pure = true)
-  default @NotNull ClickCallback<T> requiringPermission(final @NotNull String permission, final @Nullable Consumer<? super Audience> otherwise) {
+  default ClickCallback<T> requiringPermission(final String permission, final @Nullable Consumer<? super Audience> otherwise) {
     return this.filter(audience -> audience.getOrDefault(PermissionChecker.POINTER, ClickCallbackInternals.ALWAYS_FALSE).test(permission), otherwise);
   }
 
@@ -190,7 +191,7 @@ interface Options extends Examinable {
      * @return the new builder
      * @since 4.13.0
      */
-    static @NotNull Builder builder() {
+    static Builder builder() {
       return new ClickCallbackOptionsImpl.BuilderImpl();
     }
 
@@ -201,7 +202,7 @@ interface Options extends Examinable {
      * @return the new builder
      * @since 4.13.0
      */
-    static @NotNull Builder builder(final @NotNull Options existing) {
+    static Builder builder(final Options existing) {
       return new ClickCallbackOptionsImpl.BuilderImpl(existing);
     }
 
@@ -223,7 +224,7 @@ interface Options extends Examinable {
      * @return the duration of this callback
      * @since 4.13.0
      */
-    @NotNull Duration lifetime();
+    Duration lifetime();
 
     /**
      * A builder for callback options.
@@ -239,7 +240,7 @@ interface Builder extends AbstractBuilder<Options> {
        * @return this builder
        * @since 4.13.0
        */
-      @NotNull Builder uses(int useCount);
+      Builder uses(int useCount);
 
       /**
        * Set how long the callback should last from sending.
@@ -248,7 +249,7 @@ interface Builder extends AbstractBuilder<Options> {
        * @return this builder
        * @since 4.13.0
        */
-      @NotNull Builder lifetime(final @NotNull TemporalAmount duration);
+      Builder lifetime(final TemporalAmount duration);
     }
   }
 
@@ -268,6 +269,6 @@ interface Provider {
      * @return a created click event that will execute the provided callback with options
      * @since 4.13.0
      */
-    @NotNull ClickEvent create(final @NotNull ClickCallback<Audience> callback, final @NotNull Options options);
+    ClickEvent create(final ClickCallback<Audience> callback, final Options options);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/event/ClickCallbackInternals.java b/api/src/main/java/net/kyori/adventure/text/event/ClickCallbackInternals.java
index 4a7fb4014d..ec9dbca47b 100644
--- a/api/src/main/java/net/kyori/adventure/text/event/ClickCallbackInternals.java
+++ b/api/src/main/java/net/kyori/adventure/text/event/ClickCallbackInternals.java
@@ -27,8 +27,9 @@
 import net.kyori.adventure.permission.PermissionChecker;
 import net.kyori.adventure.util.Services;
 import net.kyori.adventure.util.TriState;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 final class ClickCallbackInternals {
   private ClickCallbackInternals() {
   }
@@ -40,7 +41,7 @@ private ClickCallbackInternals() {
 
   static final class Fallback implements ClickCallback.Provider {
     @Override
-    public @NotNull ClickEvent create(final @NotNull ClickCallback<Audience> callback, final ClickCallback.@NotNull Options options) {
+    public ClickEvent create(final ClickCallback<Audience> callback, final ClickCallback.Options options) {
       return ClickEvent.suggestCommand("Callbacks are not supported on this platform!");
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/text/event/ClickCallbackOptionsImpl.java b/api/src/main/java/net/kyori/adventure/text/event/ClickCallbackOptionsImpl.java
index 55bd330fab..7e88d508f4 100644
--- a/api/src/main/java/net/kyori/adventure/text/event/ClickCallbackOptionsImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/event/ClickCallbackOptionsImpl.java
@@ -28,10 +28,11 @@
 import java.util.stream.Stream;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class ClickCallbackOptionsImpl implements ClickCallback.Options {
   static final ClickCallback.Options DEFAULT = new ClickCallbackOptionsImpl.BuilderImpl().build();
 
@@ -49,12 +50,12 @@ public int uses() {
   }
 
   @Override
-  public @NotNull Duration lifetime() {
+  public Duration lifetime() {
     return this.lifetime;
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("uses", this.uses),
       ExaminableProperty.of("expiration", this.lifetime)
@@ -77,24 +78,24 @@ static final class BuilderImpl implements Builder {
       this.lifetime = ClickCallback.DEFAULT_LIFETIME;
     }
 
-    BuilderImpl(final ClickCallback.@NotNull Options existing) {
+    BuilderImpl(final ClickCallback.Options existing) {
       this.uses = existing.uses();
       this.lifetime = existing.lifetime();
     }
 
     @Override
-    public ClickCallback.@NotNull Options build() {
+    public ClickCallback.Options build() {
       return new ClickCallbackOptionsImpl(this.uses, this.lifetime);
     }
 
     @Override
-    public @NotNull Builder uses(final int uses) {
+    public Builder uses(final int uses) {
       this.uses = uses;
       return this;
     }
 
     @Override
-    public @NotNull Builder lifetime(final @NotNull TemporalAmount lifetime) {
+    public Builder lifetime(final TemporalAmount lifetime) {
       this.lifetime = lifetime instanceof Duration ? (Duration) lifetime : Duration.from(requireNonNull(lifetime, "lifetime"));
       return this;
     }
diff --git a/api/src/main/java/net/kyori/adventure/text/event/ClickEvent.java b/api/src/main/java/net/kyori/adventure/text/event/ClickEvent.java
index 1a6bee3a28..e33c300a42 100644
--- a/api/src/main/java/net/kyori/adventure/text/event/ClickEvent.java
+++ b/api/src/main/java/net/kyori/adventure/text/event/ClickEvent.java
@@ -35,8 +35,8 @@
 import net.kyori.adventure.util.Index;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -47,6 +47,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class ClickEvent implements Examinable, StyleBuilderApplicable {
   /**
    * Creates a click event that opens a url.
@@ -55,7 +56,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a click event
    * @since 4.0.0
    */
-  public static @NotNull ClickEvent openUrl(final @NotNull String url) {
+  public static ClickEvent openUrl(final String url) {
     return new ClickEvent(Action.OPEN_URL, url);
   }
 
@@ -66,7 +67,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a click event
    * @since 4.0.0
    */
-  public static @NotNull ClickEvent openUrl(final @NotNull URL url) {
+  public static ClickEvent openUrl(final URL url) {
     return openUrl(url.toExternalForm());
   }
 
@@ -79,7 +80,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a click event
    * @since 4.0.0
    */
-  public static @NotNull ClickEvent openFile(final @NotNull String file) {
+  public static ClickEvent openFile(final String file) {
     return new ClickEvent(Action.OPEN_FILE, file);
   }
 
@@ -90,7 +91,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a click event
    * @since 4.0.0
    */
-  public static @NotNull ClickEvent runCommand(final @NotNull String command) {
+  public static ClickEvent runCommand(final String command) {
     return new ClickEvent(Action.RUN_COMMAND, command);
   }
 
@@ -101,7 +102,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a click event
    * @since 4.0.0
    */
-  public static @NotNull ClickEvent suggestCommand(final @NotNull String command) {
+  public static ClickEvent suggestCommand(final String command) {
     return new ClickEvent(Action.SUGGEST_COMMAND, command);
   }
 
@@ -112,7 +113,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a click event
    * @since 4.0.0
    */
-  public static @NotNull ClickEvent changePage(final @NotNull String page) {
+  public static ClickEvent changePage(final String page) {
     return new ClickEvent(Action.CHANGE_PAGE, page);
   }
 
@@ -123,7 +124,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a click event
    * @since 4.0.0
    */
-  public static @NotNull ClickEvent changePage(final int page) {
+  public static ClickEvent changePage(final int page) {
     return changePage(String.valueOf(page));
   }
 
@@ -135,7 +136,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @since 4.0.0
    * @sinceMinecraft 1.15
    */
-  public static @NotNull ClickEvent copyToClipboard(final @NotNull String text) {
+  public static ClickEvent copyToClipboard(final String text) {
     return new ClickEvent(Action.COPY_TO_CLIPBOARD, text);
   }
 
@@ -148,7 +149,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a callback click event
    * @since 4.13.0
    */
-  public static @NotNull ClickEvent callback(final @NotNull ClickCallback<Audience> function) {
+  public static ClickEvent callback(final ClickCallback<Audience> function) {
     return ClickCallbackInternals.PROVIDER.create(requireNonNull(function, "function"), ClickCallbackOptionsImpl.DEFAULT);
   }
 
@@ -160,7 +161,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a callback click event
    * @since 4.13.0
    */
-  public static @NotNull ClickEvent callback(final @NotNull ClickCallback<Audience> function, final ClickCallback.@NotNull Options options) {
+  public static ClickEvent callback(final ClickCallback<Audience> function, final ClickCallback.Options options) {
     return ClickCallbackInternals.PROVIDER.create(requireNonNull(function, "function"), requireNonNull(options, "options"));
   }
 
@@ -172,7 +173,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a callback click event
    * @since 4.13.0
    */
-  public static @NotNull ClickEvent callback(final @NotNull ClickCallback<Audience> function, final @NotNull Consumer<ClickCallback.Options.@NotNull Builder> optionsBuilder) {
+  public static ClickEvent callback(final ClickCallback<Audience> function, final Consumer<ClickCallback.Options.Builder> optionsBuilder) {
     return ClickCallbackInternals.PROVIDER.create(
       requireNonNull(function, "function"),
       AbstractBuilder.configureAndBuild(ClickCallback.Options.builder(), requireNonNull(optionsBuilder, "optionsBuilder"))
@@ -187,14 +188,14 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable {
    * @return a click event
    * @since 4.0.0
    */
-  public static @NotNull ClickEvent clickEvent(final @NotNull Action action, final @NotNull String value) {
+  public static ClickEvent clickEvent(final Action action, final String value) {
     return new ClickEvent(action, value);
   }
 
   private final Action action;
   private final String value;
 
-  private ClickEvent(final @NotNull Action action, final @NotNull String value) {
+  private ClickEvent(final Action action, final String value) {
     this.action = requireNonNull(action, "action");
     this.value = requireNonNull(value, "value");
   }
@@ -205,7 +206,7 @@ private ClickEvent(final @NotNull Action action, final @NotNull String value) {
    * @return the click event action
    * @since 4.0.0
    */
-  public @NotNull Action action() {
+  public Action action() {
     return this.action;
   }
 
@@ -215,12 +216,12 @@ private ClickEvent(final @NotNull Action action, final @NotNull String value) {
    * @return the click event value
    * @since 4.0.0
    */
-  public @NotNull String value() {
+  public String value() {
     return this.value;
   }
 
   @Override
-  public void styleApply(final Style.@NotNull Builder style) {
+  public void styleApply(final Style.Builder style) {
     style.clickEvent(this);
   }
 
@@ -240,7 +241,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("action", this.action),
       ExaminableProperty.of("value", this.value)
@@ -312,7 +313,7 @@ public enum Action {
      */
     private final boolean readable;
 
-    Action(final @NotNull String name, final boolean readable) {
+    Action(final String name, final boolean readable) {
       this.name = name;
       this.readable = readable;
     }
@@ -329,7 +330,7 @@ public boolean readable() {
     }
 
     @Override
-    public @NotNull String toString() {
+    public String toString() {
       return this.name;
     }
   }
diff --git a/api/src/main/java/net/kyori/adventure/text/event/HoverEvent.java b/api/src/main/java/net/kyori/adventure/text/event/HoverEvent.java
index a662a94bd5..52144da166 100644
--- a/api/src/main/java/net/kyori/adventure/text/event/HoverEvent.java
+++ b/api/src/main/java/net/kyori/adventure/text/event/HoverEvent.java
@@ -40,9 +40,9 @@
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -55,6 +55,7 @@
  * @param <V> the value type
  * @since 4.0.0
  */
+@NullMarked
 public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, StyleBuilderApplicable {
   /**
    * Creates a hover event that shows text on hover.
@@ -63,7 +64,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a hover event
    * @since 4.2.0
    */
-  public static @NotNull HoverEvent<Component> showText(final @NotNull ComponentLike text) {
+  public static HoverEvent<Component> showText(final ComponentLike text) {
     return showText(text.asComponent());
   }
 
@@ -74,7 +75,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a hover event
    * @since 4.0.0
    */
-  public static @NotNull HoverEvent<Component> showText(final @NotNull Component text) {
+  public static HoverEvent<Component> showText(final Component text) {
     return new HoverEvent<>(Action.SHOW_TEXT, text);
   }
 
@@ -86,7 +87,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a hover event
    * @since 4.0.0
    */
-  public static @NotNull HoverEvent<ShowItem> showItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
+  public static HoverEvent<ShowItem> showItem(final Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
     return showItem(item, count, null);
   }
 
@@ -98,7 +99,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a hover event
    * @since 4.6.0
    */
-  public static @NotNull HoverEvent<ShowItem> showItem(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
+  public static HoverEvent<ShowItem> showItem(final Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
     return showItem(item, count, null);
   }
 
@@ -111,7 +112,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a hover event
    * @since 4.0.0
    */
-  public static @NotNull HoverEvent<ShowItem> showItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
+  public static HoverEvent<ShowItem> showItem(final Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
     return showItem(ShowItem.of(item, count, nbt));
   }
 
@@ -124,7 +125,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a hover event
    * @since 4.6.0
    */
-  public static @NotNull HoverEvent<ShowItem> showItem(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
+  public static HoverEvent<ShowItem> showItem(final Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
     return showItem(ShowItem.of(item, count, nbt));
   }
 
@@ -135,7 +136,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a hover event
    * @since 4.0.0
    */
-  public static @NotNull HoverEvent<ShowItem> showItem(final @NotNull ShowItem item) {
+  public static HoverEvent<ShowItem> showItem(final ShowItem item) {
     return new HoverEvent<>(Action.SHOW_ITEM, item);
   }
 
@@ -149,7 +150,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a {@code ShowEntity}
    * @since 4.0.0
    */
-  public static @NotNull HoverEvent<ShowEntity> showEntity(final @NotNull Key type, final @NotNull UUID id) {
+  public static HoverEvent<ShowEntity> showEntity(final Key type, final UUID id) {
     return showEntity(type, id, null);
   }
 
@@ -163,7 +164,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a {@code ShowEntity}
    * @since 4.6.0
    */
-  public static @NotNull HoverEvent<ShowEntity> showEntity(final @NotNull Keyed type, final @NotNull UUID id) {
+  public static HoverEvent<ShowEntity> showEntity(final Keyed type, final UUID id) {
     return showEntity(type, id, null);
   }
 
@@ -178,7 +179,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a {@code ShowEntity}
    * @since 4.0.0
    */
-  public static @NotNull HoverEvent<ShowEntity> showEntity(final @NotNull Key type, final @NotNull UUID id, final @Nullable Component name) {
+  public static HoverEvent<ShowEntity> showEntity(final Key type, final UUID id, final @Nullable Component name) {
     return showEntity(ShowEntity.of(type, id, name));
   }
 
@@ -193,7 +194,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a {@code ShowEntity}
    * @since 4.6.0
    */
-  public static @NotNull HoverEvent<ShowEntity> showEntity(final @NotNull Keyed type, final @NotNull UUID id, final @Nullable Component name) {
+  public static HoverEvent<ShowEntity> showEntity(final Keyed type, final UUID id, final @Nullable Component name) {
     return showEntity(ShowEntity.of(type, id, name));
   }
 
@@ -206,7 +207,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a hover event
    * @since 4.0.0
    */
-  public static @NotNull HoverEvent<ShowEntity> showEntity(final @NotNull ShowEntity entity) {
+  public static HoverEvent<ShowEntity> showEntity(final ShowEntity entity) {
     return new HoverEvent<>(Action.SHOW_ENTITY, entity);
   }
 
@@ -219,7 +220,7 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @deprecated Removed in Vanilla 1.12, but we keep it for backwards compat
    */
   @Deprecated
-  public static @NotNull HoverEvent<String> showAchievement(final @NotNull String value) {
+  public static HoverEvent<String> showAchievement(final String value) {
     return new HoverEvent<>(Action.SHOW_ACHIEVEMENT, value);
   }
 
@@ -232,14 +233,14 @@ public final class HoverEvent<V> implements Examinable, HoverEventSource<V>, Sty
    * @return a click event
    * @since 4.0.0
    */
-  public static <V> @NotNull HoverEvent<V> hoverEvent(final @NotNull Action<V> action, final @NotNull V value) {
+  public static <V> HoverEvent<V> hoverEvent(final Action<V> action, final V value) {
     return new HoverEvent<>(action, value);
   }
 
   private final Action<V> action;
   private final V value;
 
-  private HoverEvent(final @NotNull Action<V> action, final @NotNull V value) {
+  private HoverEvent(final Action<V> action, final V value) {
     this.action = requireNonNull(action, "action");
     this.value = requireNonNull(value, "value");
   }
@@ -250,7 +251,7 @@ private HoverEvent(final @NotNull Action<V> action, final @NotNull V value) {
    * @return the hover event action
    * @since 4.0.0
    */
-  public @NotNull Action<V> action() {
+  public Action<V> action() {
     return this.action;
   }
 
@@ -260,7 +261,7 @@ private HoverEvent(final @NotNull Action<V> action, final @NotNull V value) {
    * @return the hover event value
    * @since 4.0.0
    */
-  public @NotNull V value() {
+  public V value() {
     return this.value;
   }
 
@@ -271,7 +272,7 @@ private HoverEvent(final @NotNull Action<V> action, final @NotNull V value) {
    * @return a hover event
    * @since 4.0.0
    */
-  public @NotNull HoverEvent<V> value(final @NotNull V value) {
+  public HoverEvent<V> value(final V value) {
     return new HoverEvent<>(this.action, value);
   }
 
@@ -284,7 +285,7 @@ private HoverEvent(final @NotNull Action<V> action, final @NotNull V value) {
    * @return a hover event
    * @since 4.0.0
    */
-  public <C> @NotNull HoverEvent<V> withRenderedValue(final @NotNull ComponentRenderer<C> renderer, final @NotNull C context) {
+  public <C> HoverEvent<V> withRenderedValue(final ComponentRenderer<C> renderer, final C context) {
     final V oldValue = this.value;
     final V newValue = this.action.renderer.render(renderer, context, oldValue);
     if (newValue != oldValue) return new HoverEvent<>(this.action, newValue);
@@ -292,18 +293,18 @@ private HoverEvent(final @NotNull Action<V> action, final @NotNull V value) {
   }
 
   @Override
-  public @NotNull HoverEvent<V> asHoverEvent() {
+  public HoverEvent<V> asHoverEvent() {
     return this; // i already am a hover event! hehehehe
   }
 
   @Override
-  public @NotNull HoverEvent<V> asHoverEvent(final @NotNull UnaryOperator<V> op) {
+  public HoverEvent<V> asHoverEvent(final UnaryOperator<V> op) {
     if (op == UnaryOperator.<V>identity()) return this; // nothing to do, can return ourself
     return new HoverEvent<>(this.action, op.apply(this.value));
   }
 
   @Override
-  public void styleApply(final Style.@NotNull Builder style) {
+  public void styleApply(final Style.Builder style) {
     style.hoverEvent(this);
   }
 
@@ -323,7 +324,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("action", this.action),
       ExaminableProperty.of("value", this.value)
@@ -353,7 +354,7 @@ public static final class ShowItem implements Examinable {
      * @return a {@code ShowItem}
      * @since 4.14.0
      */
-    public static @NotNull ShowItem showItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
+    public static ShowItem showItem(final Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
       return showItem(item, count, null);
     }
 
@@ -368,7 +369,7 @@ public static final class ShowItem implements Examinable {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @NotNull ShowItem of(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
+    public static ShowItem of(final Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
       return of(item, count, null);
     }
 
@@ -380,7 +381,7 @@ public static final class ShowItem implements Examinable {
      * @return a {@code ShowItem}
      * @since 4.14.0
      */
-    public static @NotNull ShowItem showItem(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
+    public static ShowItem showItem(final Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
       return showItem(item, count, null);
     }
 
@@ -395,7 +396,7 @@ public static final class ShowItem implements Examinable {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @NotNull ShowItem of(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
+    public static ShowItem of(final Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
       return of(item, count, null);
     }
 
@@ -408,7 +409,7 @@ public static final class ShowItem implements Examinable {
      * @return a {@code ShowItem}
      * @since 4.14.0
      */
-    public static @NotNull ShowItem showItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
+    public static ShowItem showItem(final Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
       return new ShowItem(requireNonNull(item, "item"), count, nbt);
     }
 
@@ -424,7 +425,7 @@ public static final class ShowItem implements Examinable {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @NotNull ShowItem of(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
+    public static ShowItem of(final Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
       return new ShowItem(requireNonNull(item, "item"), count, nbt);
     }
 
@@ -437,7 +438,7 @@ public static final class ShowItem implements Examinable {
      * @return a {@code ShowItem}
      * @since 4.14.0
      */
-    public static @NotNull ShowItem showItem(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
+    public static ShowItem showItem(final Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
       return new ShowItem(requireNonNull(item, "item").key(), count, nbt);
     }
 
@@ -453,11 +454,11 @@ public static final class ShowItem implements Examinable {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @NotNull ShowItem of(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
+    public static ShowItem of(final Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
       return new ShowItem(requireNonNull(item, "item").key(), count, nbt);
     }
 
-    private ShowItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
+    private ShowItem(final Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) {
       this.item = item;
       this.count = count;
       this.nbt = nbt;
@@ -469,7 +470,7 @@ private ShowItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MA
      * @return the item
      * @since 4.0.0
      */
-    public @NotNull Key item() {
+    public Key item() {
       return this.item;
     }
 
@@ -480,7 +481,7 @@ private ShowItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MA
      * @return a {@code ShowItem}
      * @since 4.0.0
      */
-    public @NotNull ShowItem item(final @NotNull Key item) {
+    public ShowItem item(final Key item) {
       if (requireNonNull(item, "item").equals(this.item)) return this;
       return new ShowItem(item, this.count, this.nbt);
     }
@@ -502,7 +503,7 @@ private ShowItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MA
      * @return a {@code ShowItem}
      * @since 4.0.0
      */
-    public @NotNull ShowItem count(final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
+    public ShowItem count(final @Range(from = 0, to = Integer.MAX_VALUE) int count) {
       if (count == this.count) return this;
       return new ShowItem(this.item, count, this.nbt);
     }
@@ -524,7 +525,7 @@ private ShowItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MA
      * @return a {@code ShowItem}
      * @since 4.0.0
      */
-    public @NotNull ShowItem nbt(final @Nullable BinaryTagHolder nbt) {
+    public ShowItem nbt(final @Nullable BinaryTagHolder nbt) {
       if (Objects.equals(nbt, this.nbt)) return this;
       return new ShowItem(this.item, this.count, nbt);
     }
@@ -546,7 +547,7 @@ public int hashCode() {
     }
 
     @Override
-    public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    public Stream<? extends ExaminableProperty> examinableProperties() {
       return Stream.of(
         ExaminableProperty.of("item", this.item),
         ExaminableProperty.of("count", this.count),
@@ -578,7 +579,7 @@ public static final class ShowEntity implements Examinable {
      * @return a {@code ShowEntity}
      * @since 4.14.0
      */
-    public static @NotNull ShowEntity showEntity(final @NotNull Key type, final @NotNull UUID id) {
+    public static ShowEntity showEntity(final Key type, final UUID id) {
       return showEntity(type, id, null);
     }
 
@@ -593,7 +594,7 @@ public static final class ShowEntity implements Examinable {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @NotNull ShowEntity of(final @NotNull Key type, final @NotNull UUID id) {
+    public static ShowEntity of(final Key type, final UUID id) {
       return of(type, id, null);
     }
 
@@ -605,7 +606,7 @@ public static final class ShowEntity implements Examinable {
      * @return a {@code ShowEntity}
      * @since 4.14.0
      */
-    public static @NotNull ShowEntity showEntity(final @NotNull Keyed type, final @NotNull UUID id) {
+    public static ShowEntity showEntity(final Keyed type, final UUID id) {
       return showEntity(type, id, null);
     }
 
@@ -620,7 +621,7 @@ public static final class ShowEntity implements Examinable {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @NotNull ShowEntity of(final @NotNull Keyed type, final @NotNull UUID id) {
+    public static ShowEntity of(final Keyed type, final UUID id) {
       return of(type, id, null);
     }
 
@@ -633,7 +634,7 @@ public static final class ShowEntity implements Examinable {
      * @return a {@code ShowEntity}
      * @since 4.14.0
      */
-    public static @NotNull ShowEntity showEntity(final @NotNull Key type, final @NotNull UUID id, final @Nullable Component name) {
+    public static ShowEntity showEntity(final Key type, final UUID id, final @Nullable Component name) {
       return new ShowEntity(requireNonNull(type, "type"), requireNonNull(id, "id"), name);
     }
 
@@ -649,7 +650,7 @@ public static final class ShowEntity implements Examinable {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @NotNull ShowEntity of(final @NotNull Key type, final @NotNull UUID id, final @Nullable Component name) {
+    public static ShowEntity of(final Key type, final UUID id, final @Nullable Component name) {
       return new ShowEntity(requireNonNull(type, "type"), requireNonNull(id, "id"), name);
     }
 
@@ -662,7 +663,7 @@ public static final class ShowEntity implements Examinable {
      * @return a {@code ShowEntity}
      * @since 4.14.0
      */
-    public static @NotNull ShowEntity showEntity(final @NotNull Keyed type, final @NotNull UUID id, final @Nullable Component name) {
+    public static ShowEntity showEntity(final Keyed type, final UUID id, final @Nullable Component name) {
       return new ShowEntity(requireNonNull(type, "type").key(), requireNonNull(id, "id"), name);
     }
 
@@ -678,11 +679,11 @@ public static final class ShowEntity implements Examinable {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @NotNull ShowEntity of(final @NotNull Keyed type, final @NotNull UUID id, final @Nullable Component name) {
+    public static ShowEntity of(final Keyed type, final UUID id, final @Nullable Component name) {
       return new ShowEntity(requireNonNull(type, "type").key(), requireNonNull(id, "id"), name);
     }
 
-    private ShowEntity(final @NotNull Key type, final @NotNull UUID id, final @Nullable Component name) {
+    private ShowEntity(final Key type, final UUID id, final @Nullable Component name) {
       this.type = type;
       this.id = id;
       this.name = name;
@@ -694,7 +695,7 @@ private ShowEntity(final @NotNull Key type, final @NotNull UUID id, final @Nulla
      * @return the type
      * @since 4.0.0
      */
-    public @NotNull Key type() {
+    public Key type() {
       return this.type;
     }
 
@@ -705,7 +706,7 @@ private ShowEntity(final @NotNull Key type, final @NotNull UUID id, final @Nulla
      * @return a {@code ShowEntity}
      * @since 4.0.0
      */
-    public @NotNull ShowEntity type(final @NotNull Key type) {
+    public ShowEntity type(final Key type) {
       if (requireNonNull(type, "type").equals(this.type)) return this;
       return new ShowEntity(type, this.id, this.name);
     }
@@ -717,7 +718,7 @@ private ShowEntity(final @NotNull Key type, final @NotNull UUID id, final @Nulla
      * @return a {@code ShowEntity}
      * @since 4.6.0
      */
-    public @NotNull ShowEntity type(final @NotNull Keyed type) {
+    public ShowEntity type(final Keyed type) {
       return this.type(requireNonNull(type, "type").key());
     }
 
@@ -727,7 +728,7 @@ private ShowEntity(final @NotNull Key type, final @NotNull UUID id, final @Nulla
      * @return the id
      * @since 4.0.0
      */
-    public @NotNull UUID id() {
+    public UUID id() {
       return this.id;
     }
 
@@ -738,7 +739,7 @@ private ShowEntity(final @NotNull Key type, final @NotNull UUID id, final @Nulla
      * @return a {@code ShowEntity}
      * @since 4.0.0
      */
-    public @NotNull ShowEntity id(final @NotNull UUID id) {
+    public ShowEntity id(final UUID id) {
       if (requireNonNull(id).equals(this.id)) return this;
       return new ShowEntity(this.type, id, this.name);
     }
@@ -760,7 +761,7 @@ private ShowEntity(final @NotNull Key type, final @NotNull UUID id, final @Nulla
      * @return a {@code ShowEntity}
      * @since 4.0.0
      */
-    public @NotNull ShowEntity name(final @Nullable Component name) {
+    public ShowEntity name(final @Nullable Component name) {
       if (Objects.equals(name, this.name)) return this;
       return new ShowEntity(this.type, this.id, name);
     }
@@ -782,7 +783,7 @@ public int hashCode() {
     }
 
     @Override
-    public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    public Stream<? extends ExaminableProperty> examinableProperties() {
       return Stream.of(
         ExaminableProperty.of("type", this.type),
         ExaminableProperty.of("id", this.id),
@@ -810,7 +811,7 @@ public static final class Action<V> {
      */
     public static final Action<Component> SHOW_TEXT = new Action<>("show_text", Component.class, true, new Renderer<Component>() {
       @Override
-      public <C> @NotNull Component render(final @NotNull ComponentRenderer<C> renderer, final @NotNull C context, final @NotNull Component value) {
+      public <C> Component render(final ComponentRenderer<C> renderer, final C context, final Component value) {
         return renderer.render(value, context);
       }
     });
@@ -821,7 +822,7 @@ public static final class Action<V> {
      */
     public static final Action<ShowItem> SHOW_ITEM = new Action<>("show_item", ShowItem.class, true, new Renderer<ShowItem>() {
       @Override
-      public <C> @NotNull ShowItem render(final @NotNull ComponentRenderer<C> renderer, final @NotNull C context, final @NotNull ShowItem value) {
+      public <C> ShowItem render(final ComponentRenderer<C> renderer, final C context, final ShowItem value) {
         return value;
       }
     });
@@ -832,7 +833,7 @@ public static final class Action<V> {
      */
     public static final Action<ShowEntity> SHOW_ENTITY = new Action<>("show_entity", ShowEntity.class, true, new Renderer<ShowEntity>() {
       @Override
-      public <C> @NotNull ShowEntity render(final @NotNull ComponentRenderer<C> renderer, final @NotNull C context, final @NotNull ShowEntity value) {
+      public <C> ShowEntity render(final ComponentRenderer<C> renderer, final C context, final ShowEntity value) {
         if (value.name == null) return value;
         return value.name(renderer.render(value.name, context));
       }
@@ -846,7 +847,7 @@ public static final class Action<V> {
     @Deprecated
     public static final Action<String> SHOW_ACHIEVEMENT = new Action<>("show_achievement", String.class, true, new Renderer<String>() {
       @Override
-      public <C> @NotNull String render(final @NotNull ComponentRenderer<C> renderer, final @NotNull C context, final @NotNull String value) {
+      public <C> String render(final ComponentRenderer<C> renderer, final C context, final String value) {
         return value;
       }
     });
@@ -880,7 +881,7 @@ public static final class Action<V> {
      * @return the value type
      * @since 4.0.0
      */
-    public @NotNull Class<V> type() {
+    public Class<V> type() {
       return this.type;
     }
 
@@ -896,13 +897,13 @@ public boolean readable() {
     }
 
     @Override
-    public @NotNull String toString() {
+    public String toString() {
       return this.name;
     }
 
     @FunctionalInterface
     interface Renderer<V> {
-      <C> @NotNull V render(final @NotNull ComponentRenderer<C> renderer, final @NotNull C context, final @NotNull V value);
+      <C> V render(final ComponentRenderer<C> renderer, final C context, final V value);
     }
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/event/HoverEventSource.java b/api/src/main/java/net/kyori/adventure/text/event/HoverEventSource.java
index b443a29de4..2e1cf7f5b3 100644
--- a/api/src/main/java/net/kyori/adventure/text/event/HoverEventSource.java
+++ b/api/src/main/java/net/kyori/adventure/text/event/HoverEventSource.java
@@ -24,8 +24,8 @@
 package net.kyori.adventure.text.event;
 
 import java.util.function.UnaryOperator;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Something that can provide a {@link HoverEvent}.
@@ -33,6 +33,7 @@
  * @param <V> the value type
  * @since 4.0.0
  */
+@NullMarked
 public interface HoverEventSource<V> {
   /**
    * Fetches a {@link HoverEvent} from a {@code HoverEventSource}.
@@ -52,7 +53,7 @@ public interface HoverEventSource<V> {
    * @return a hover event
    * @since 4.0.0
    */
-  default @NotNull HoverEvent<V> asHoverEvent() {
+  default HoverEvent<V> asHoverEvent() {
     return this.asHoverEvent(UnaryOperator.identity());
   }
 
@@ -66,5 +67,5 @@ public interface HoverEventSource<V> {
    * @return a hover event
    * @since 4.0.0
    */
-  @NotNull HoverEvent<V> asHoverEvent(final @NotNull UnaryOperator<V> op);
+  HoverEvent<V> asHoverEvent(final UnaryOperator<V> op);
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattener.java b/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattener.java
index 8344bf9327..0d2877884f 100644
--- a/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattener.java
+++ b/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattener.java
@@ -29,14 +29,15 @@
 import net.kyori.adventure.builder.AbstractBuilder;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.util.Buildable;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A 'flattener' to convert a component tree to a linear string for display.
  *
  * @since 4.7.0
  */
+@NullMarked
 public interface ComponentFlattener extends Buildable<ComponentFlattener, ComponentFlattener.Builder> {
   /**
    * Create a new builder for a flattener.
@@ -44,7 +45,7 @@ public interface ComponentFlattener extends Buildable<ComponentFlattener, Compon
    * @return a new builder
    * @since 4.7.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new ComponentFlattenerImpl.BuilderImpl();
   }
 
@@ -57,7 +58,7 @@ public interface ComponentFlattener extends Buildable<ComponentFlattener, Compon
    * @return a basic flattener
    * @since 4.7.0
    */
-  static @NotNull ComponentFlattener basic() {
+  static ComponentFlattener basic() {
     return ComponentFlattenerImpl.BASIC;
   }
 
@@ -69,7 +70,7 @@ public interface ComponentFlattener extends Buildable<ComponentFlattener, Compon
    * @return a text-only flattener
    * @since 4.7.0
    */
-  static @NotNull ComponentFlattener textOnly() {
+  static ComponentFlattener textOnly() {
     return ComponentFlattenerImpl.TEXT_ONLY;
   }
 
@@ -80,7 +81,7 @@ public interface ComponentFlattener extends Buildable<ComponentFlattener, Compon
    * @param listener the listener that will receive flattened component state
    * @since 4.7.0
    */
-  void flatten(final @NotNull Component input, final @NotNull FlattenerListener listener);
+  void flatten(final Component input, final FlattenerListener listener);
 
   /**
    * A builder for a component flattener.
@@ -100,7 +101,7 @@ interface Builder extends AbstractBuilder<ComponentFlattener>, Buildable.Builder
      * @see #complexMapper(Class, BiConsumer) for component types that are too complex to be directly rendered to a string
      * @since 4.7.0
      */
-    <T extends Component> @NotNull Builder mapper(final @NotNull Class<T> type, final @NotNull Function<T, String> converter);
+    <T extends Component> Builder mapper(final Class<T> type, final Function<T, String> converter);
 
     /**
      * Register a type of component that needs to be flattened to an intermediate stage.
@@ -111,7 +112,7 @@ interface Builder extends AbstractBuilder<ComponentFlattener>, Buildable.Builder
      * @return this builder
      * @since 4.7.0
      */
-    <T extends Component> @NotNull Builder complexMapper(final @NotNull Class<T> type, final @NotNull BiConsumer<T, Consumer<Component>> converter);
+    <T extends Component> Builder complexMapper(final Class<T> type, final BiConsumer<T, Consumer<Component>> converter);
 
     /**
      * Register a handler for unknown component types.
@@ -122,6 +123,6 @@ interface Builder extends AbstractBuilder<ComponentFlattener>, Buildable.Builder
      * @return this builder
      * @since 4.7.0
      */
-    @NotNull Builder unknownMapper(final @Nullable Function<Component, String> converter);
+    Builder unknownMapper(final @Nullable Function<Component, String> converter);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java b/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java
index 51c1987b72..33d8a23f36 100644
--- a/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java
@@ -38,11 +38,12 @@
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.TranslatableComponent;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class ComponentFlattenerImpl implements ComponentFlattener {
   @SuppressWarnings("deprecation")
   static final ComponentFlattener BASIC = new BuilderImpl()
@@ -78,11 +79,11 @@ final class ComponentFlattenerImpl implements ComponentFlattener {
   }
 
   @Override
-  public void flatten(final @NotNull Component input, final @NotNull FlattenerListener listener) {
+  public void flatten(final Component input, final FlattenerListener listener) {
     this.flatten0(input, listener, 0);
   }
 
-  private void flatten0(final @NotNull Component input, final @NotNull FlattenerListener listener, final int depth) {
+  private void flatten0(final Component input, final FlattenerListener listener, final int depth) {
     requireNonNull(input, "input");
     requireNonNull(listener, "listener");
     if (input == Component.empty()) return;
@@ -143,7 +144,7 @@ private void flatten0(final @NotNull Component input, final @NotNull FlattenerLi
   }
 
   @Override
-  public ComponentFlattener.@NotNull Builder toBuilder() {
+  public ComponentFlattener.Builder toBuilder() {
     return new BuilderImpl(this.flatteners, this.complexFlatteners, this.unknownHandler);
   }
 
@@ -172,12 +173,12 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull ComponentFlattener build() {
+    public ComponentFlattener build() {
       return new ComponentFlattenerImpl(this.flatteners, this.complexFlatteners, this.unknownHandler);
     }
 
     @Override
-    public <T extends Component> ComponentFlattener.@NotNull Builder mapper(final @NotNull Class<T> type, final @NotNull Function<T, String> converter) {
+    public <T extends Component> ComponentFlattener.Builder mapper(final Class<T> type, final Function<T, String> converter) {
       this.validateNoneInHierarchy(requireNonNull(type, "type"));
       this.flatteners.put(
         type,
@@ -188,7 +189,7 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public <T extends Component> ComponentFlattener.@NotNull Builder complexMapper(final @NotNull Class<T> type, final @NotNull BiConsumer<T, Consumer<Component>> converter) {
+    public <T extends Component> ComponentFlattener.Builder complexMapper(final Class<T> type, final BiConsumer<T, Consumer<Component>> converter) {
       this.validateNoneInHierarchy(requireNonNull(type, "type"));
       this.complexFlatteners.put(
         type,
@@ -216,7 +217,7 @@ private static void testHierarchy(final Class<?> existing, final Class<?> beingR
     }
 
     @Override
-    public ComponentFlattener.@NotNull Builder unknownMapper(final @Nullable Function<Component, String> converter) {
+    public ComponentFlattener.Builder unknownMapper(final @Nullable Function<Component, String> converter) {
       this.unknownHandler = converter;
       return this;
     }
diff --git a/api/src/main/java/net/kyori/adventure/text/flattener/FlattenerListener.java b/api/src/main/java/net/kyori/adventure/text/flattener/FlattenerListener.java
index 91584f6d52..33598e1c03 100644
--- a/api/src/main/java/net/kyori/adventure/text/flattener/FlattenerListener.java
+++ b/api/src/main/java/net/kyori/adventure/text/flattener/FlattenerListener.java
@@ -24,7 +24,7 @@
 package net.kyori.adventure.text.flattener;
 
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A listener accepting styled information from flattened components.
@@ -32,6 +32,7 @@
  * @since 4.7.0
  */
 @FunctionalInterface
+@NullMarked
 public interface FlattenerListener {
   /**
    * Begin a region of style in the component.
@@ -39,7 +40,7 @@ public interface FlattenerListener {
    * @param style the style to push
    * @since 4.7.0
    */
-  default void pushStyle(final @NotNull Style style) {
+  default void pushStyle(final Style style) {
   }
 
   /**
@@ -48,7 +49,7 @@ default void pushStyle(final @NotNull Style style) {
    * @param text the component text
    * @since 4.7.0
    */
-  void component(final @NotNull String text);
+  void component(final String text);
 
   /**
    * Pop a pushed style.
@@ -58,6 +59,6 @@ default void pushStyle(final @NotNull Style style) {
    * @param style the style popped, as passed to {@link #pushStyle(Style)}
    * @since 4.7.0
    */
-  default void popStyle(final @NotNull Style style) {
+  default void popStyle(final Style style) {
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/format/DecorationMap.java b/api/src/main/java/net/kyori/adventure/text/format/DecorationMap.java
index 1943a05ca2..43e9118d73 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/DecorationMap.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/DecorationMap.java
@@ -37,8 +37,8 @@
 import java.util.stream.Stream;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Bit-set driven decoration -&gt; state map.
@@ -78,6 +78,7 @@
  * a single {@code byte}, I however am not doing that because it's more effort than my time's worth.</p>
  */
 @Unmodifiable
+@NullMarked
 final class DecorationMap extends AbstractMap<TextDecoration, TextDecoration.State> implements Examinable {
   static final TextDecoration[] DECORATIONS = TextDecoration.values();
   private static final TextDecoration.State[] STATES = TextDecoration.State.values();
@@ -125,7 +126,7 @@ private DecorationMap(final int bitSet) {
     this.bitSet = bitSet;
   }
 
-  public @NotNull DecorationMap with(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+  public DecorationMap with(final TextDecoration decoration, final TextDecoration.State state) {
     Objects.requireNonNull(state, "state");
     Objects.requireNonNull(decoration, "decoration");
     final int offset = offset(decoration);
@@ -134,7 +135,7 @@ private DecorationMap(final int bitSet) {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Arrays.stream(DECORATIONS)
       .map(decoration -> ExaminableProperty.of(decoration.toString(), this.get(decoration)));
   }
@@ -164,7 +165,7 @@ public boolean isEmpty() {
   }
 
   @Override
-  public @NotNull Set<Entry<TextDecoration, TextDecoration.State>> entrySet() {
+  public Set<Entry<TextDecoration, TextDecoration.State>> entrySet() {
     if (this.entrySet == null) {
       synchronized (this) {
         // re-check for lost race condition
@@ -177,12 +178,12 @@ public boolean isEmpty() {
   }
 
   @Override
-  public @NotNull Set<TextDecoration> keySet() {
+  public Set<TextDecoration> keySet() {
     return KEY_SET;
   }
 
   @Override
-  public @NotNull Collection<TextDecoration.State> values() {
+  public Collection<TextDecoration.State> values() {
     if (this.values == null) {
       synchronized (this) {
         // re-check for lost race condition
@@ -208,7 +209,7 @@ public int hashCode() {
 
   final class EntrySet extends AbstractSet<Entry<TextDecoration, TextDecoration.State>> {
     @Override
-    public @NotNull Iterator<Entry<TextDecoration, TextDecoration.State>> iterator() {
+    public Iterator<Entry<TextDecoration, TextDecoration.State>> iterator() {
       return new Iterator<Entry<TextDecoration, TextDecoration.State>>() {
         private final Iterator<TextDecoration> decorations = KEY_SET.iterator();
         private final Iterator<TextDecoration.State> states = DecorationMap.this.values().iterator();
@@ -236,7 +237,7 @@ public int size() {
 
   final class Values extends AbstractCollection<TextDecoration.State> {
     @Override
-    public @NotNull Iterator<TextDecoration.State> iterator() {
+    public Iterator<TextDecoration.State> iterator() {
       return Spliterators.iterator(Arrays.spliterator(this.toArray(EMPTY_STATE_ARRAY)));
     }
 
@@ -246,7 +247,7 @@ public boolean isEmpty() {
     }
 
     @Override
-    public Object @NotNull [] toArray() {
+    public Object[] toArray() {
       final Object[] states = new Object[MAP_SIZE];
       for (int i = 0; i < MAP_SIZE; i++) {
         states[i] = DecorationMap.this.get(DECORATIONS[i]);
@@ -256,7 +257,7 @@ public boolean isEmpty() {
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> T @NotNull [] toArray(final T @NotNull [] dest) {
+    public <T> T[] toArray(final T[] dest) {
       if (dest.length < MAP_SIZE) {
         return (T[]) Arrays.copyOf(this.toArray(), MAP_SIZE, dest.getClass());
       }
@@ -291,13 +292,13 @@ public boolean isEmpty() {
     }
 
     @Override
-    public Object @NotNull [] toArray() {
+    public Object[] toArray() {
       return Arrays.copyOf(DECORATIONS, MAP_SIZE, Object[].class);
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T> T @NotNull [] toArray(final T @NotNull [] dest) {
+    public <T> T[] toArray(final T[] dest) {
       if (dest.length < MAP_SIZE) {
         return (T[]) Arrays.copyOf(DECORATIONS, MAP_SIZE, dest.getClass());
       }
@@ -309,7 +310,7 @@ public boolean isEmpty() {
     }
 
     @Override
-    public @NotNull Iterator<TextDecoration> iterator() {
+    public Iterator<TextDecoration> iterator() {
       return Spliterators.iterator(Arrays.spliterator(DECORATIONS));
     }
 
diff --git a/api/src/main/java/net/kyori/adventure/text/format/MutableStyleSetter.java b/api/src/main/java/net/kyori/adventure/text/format/MutableStyleSetter.java
index 1bf30b6dc5..f3ebd907d1 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/MutableStyleSetter.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/MutableStyleSetter.java
@@ -28,7 +28,7 @@
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
@@ -41,6 +41,7 @@
  * @since 4.10.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface MutableStyleSetter<T extends MutableStyleSetter<?>> extends StyleSetter<T> {
   /**
    * Sets {@code decorations} to {@link TextDecoration.State#TRUE}.
@@ -52,7 +53,7 @@ public interface MutableStyleSetter<T extends MutableStyleSetter<?>> extends Sty
   @Override
   @Contract("_ -> this")
   @SuppressWarnings("unchecked")
-  default @NotNull T decorate(final @NotNull TextDecoration@NotNull... decorations) {
+  default T decorate(final TextDecoration... decorations) {
     for (int i = 0, length = decorations.length; i < length; i++) {
       this.decorate(decorations[i]);
     }
@@ -71,7 +72,7 @@ public interface MutableStyleSetter<T extends MutableStyleSetter<?>> extends Sty
   @Override
   @Contract("_ -> this")
   @SuppressWarnings("unchecked")
-  default @NotNull T decorations(final @NotNull Map<TextDecoration, TextDecoration.State> decorations) {
+  default T decorations(final Map<TextDecoration, TextDecoration.State> decorations) {
     requireNonNull(decorations, "decorations");
     for (final Map.Entry<TextDecoration, TextDecoration.State> entry : decorations.entrySet()) {
       this.decoration(entry.getKey(), entry.getValue());
@@ -91,7 +92,7 @@ public interface MutableStyleSetter<T extends MutableStyleSetter<?>> extends Sty
   @Override
   @Contract("_, _ -> this")
   @SuppressWarnings("unchecked")
-  default @NotNull T decorations(final @NotNull Set<TextDecoration> decorations, final boolean flag) {
+  default T decorations(final Set<TextDecoration> decorations, final boolean flag) {
     final TextDecoration.State state = TextDecoration.State.byBoolean(flag);
     decorations.forEach(decoration -> this.decoration(decoration, state));
     return (T) this;
diff --git a/api/src/main/java/net/kyori/adventure/text/format/NamedTextColor.java b/api/src/main/java/net/kyori/adventure/text/format/NamedTextColor.java
index 787daeeb31..6755c83652 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/NamedTextColor.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/NamedTextColor.java
@@ -31,14 +31,15 @@
 import net.kyori.adventure.util.Index;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * The named text colours in Minecraft: Java Edition.
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class NamedTextColor implements TextColor {
   private static final int BLACK_VALUE = 0x000000;
   private static final int DARK_BLUE_VALUE = 0x0000aa;
@@ -230,7 +231,7 @@ public final class NamedTextColor implements TextColor {
    * @return nearest named colour. will always return a value
    * @since 4.0.0
    */
-  public static @NotNull NamedTextColor nearestTo(final @NotNull TextColor any) {
+  public static NamedTextColor nearestTo(final TextColor any) {
     if (any instanceof NamedTextColor) {
       return (NamedTextColor) any;
     }
@@ -254,17 +255,17 @@ public int value() {
   }
 
   @Override
-  public @NotNull HSVLike asHSV() {
+  public HSVLike asHSV() {
     return this.hsv;
   }
 
   @Override
-  public @NotNull String toString() {
+  public String toString() {
     return this.name;
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       Stream.of(ExaminableProperty.of("name", this.name)),
       TextColor.super.examinableProperties()
diff --git a/api/src/main/java/net/kyori/adventure/text/format/Style.java b/api/src/main/java/net/kyori/adventure/text/format/Style.java
index 201b9a737e..0180ca059a 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/Style.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/Style.java
@@ -39,10 +39,9 @@
 import net.kyori.examination.Examinable;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A style applies visual effects or extra functionality to {@link Component}s,
@@ -61,6 +60,7 @@
  * @since 4.0.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface Style extends Buildable<Style, Style.Builder>, Examinable, StyleGetter, StyleSetter<Style> {
   /**
    * The default font.
@@ -76,7 +76,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return empty style
    * @since 4.0.0
    */
-  static @NotNull Style empty() {
+  static Style empty() {
     return StyleImpl.EMPTY;
   }
 
@@ -86,7 +86,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a builder
    * @since 4.0.0
    */
-  static @NotNull Builder style() {
+  static Builder style() {
     return new StyleImpl.BuilderImpl();
   }
 
@@ -97,7 +97,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a style
    * @since 4.0.0
    */
-  static @NotNull Style style(final @NotNull Consumer<Builder> consumer) {
+  static Style style(final Consumer<Builder> consumer) {
     return AbstractBuilder.configureAndBuild(style(), consumer);
   }
 
@@ -108,7 +108,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a style
    * @since 4.0.0
    */
-  static @NotNull Style style(final @Nullable TextColor color) {
+  static Style style(final @Nullable TextColor color) {
     return empty().color(color);
   }
 
@@ -119,7 +119,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a style
    * @since 4.0.0
    */
-  static @NotNull Style style(final @NotNull TextDecoration decoration) {
+  static Style style(final TextDecoration decoration) {
     return style().decoration(decoration, true).build();
   }
 
@@ -131,7 +131,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a style
    * @since 4.0.0
    */
-  static @NotNull Style style(final @Nullable TextColor color, final TextDecoration@NotNull... decorations) {
+  static Style style(final @Nullable TextColor color, final TextDecoration... decorations) {
     final Builder builder = style();
     builder.color(color);
     builder.decorate(decorations);
@@ -146,7 +146,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a style
    * @since 4.0.0
    */
-  static @NotNull Style style(final @Nullable TextColor color, final Set<TextDecoration> decorations) {
+  static Style style(final @Nullable TextColor color, final Set<TextDecoration> decorations) {
     final Builder builder = style();
     builder.color(color);
     if (!decorations.isEmpty()) {
@@ -164,7 +164,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a style
    * @since 4.0.0
    */
-  static @NotNull Style style(final @UnknownNullability StyleBuilderApplicable@NotNull... applicables) {
+  static Style style(final @Nullable StyleBuilderApplicable... applicables) {
     final int length = applicables.length;
     if (length == 0) return empty();
     final Builder builder = style();
@@ -184,7 +184,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a style
    * @since 4.0.0
    */
-  static @NotNull Style style(final @NotNull Iterable<? extends StyleBuilderApplicable> applicables) {
+  static Style style(final Iterable<? extends StyleBuilderApplicable> applicables) {
     final Builder builder = style();
     for (final StyleBuilderApplicable applicable : applicables) {
       applicable.styleApply(builder);
@@ -201,7 +201,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a new style
    * @since 4.0.0
    */
-  default @NotNull Style edit(final @NotNull Consumer<Builder> consumer) {
+  default Style edit(final Consumer<Builder> consumer) {
     return this.edit(consumer, Merge.Strategy.ALWAYS);
   }
 
@@ -213,7 +213,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @return a new style
    * @since 4.0.0
    */
-  default @NotNull Style edit(final @NotNull Consumer<Builder> consumer, final Merge.@NotNull Strategy strategy) {
+  default Style edit(final Consumer<Builder> consumer, final Merge.Strategy strategy) {
     return style(style -> {
       if (strategy == Merge.Strategy.ALWAYS) {
         style.merge(this, strategy);
@@ -245,7 +245,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @sinceMinecraft 1.16
    */
   @Override
-  @NotNull Style font(final @Nullable Key font);
+  Style font(final @Nullable Key font);
 
   /**
    * Gets the color.
@@ -264,7 +264,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @since 4.0.0
    */
   @Override
-  @NotNull Style color(final @Nullable TextColor color);
+  Style color(final @Nullable TextColor color);
 
   /**
    * Sets the color if there isn't one set already.
@@ -274,7 +274,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @since 4.0.0
    */
   @Override
-  @NotNull Style colorIfAbsent(final @Nullable TextColor color);
+  Style colorIfAbsent(final @Nullable TextColor color);
 
   /**
    * Tests if this style has a decoration.
@@ -285,7 +285,7 @@ public interface Style extends Buildable<Style, Style.Builder>, Examinable, Styl
    * @since 4.0.0
    */
   @Override
-  default boolean hasDecoration(final @NotNull TextDecoration decoration) {
+  default boolean hasDecoration(final TextDecoration decoration) {
     return StyleGetter.super.hasDecoration(decoration);
   }
 
@@ -299,7 +299,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  TextDecoration.@NotNull State decoration(final @NotNull TextDecoration decoration);
+  TextDecoration.State decoration(final TextDecoration decoration);
 
   /**
    * Sets the state of {@code decoration} to {@link TextDecoration.State#TRUE} on this style.
@@ -309,7 +309,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  default @NotNull Style decorate(final @NotNull TextDecoration decoration) {
+  default Style decorate(final TextDecoration decoration) {
     return StyleSetter.super.decorate(decoration);
   }
 
@@ -323,7 +323,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  default @NotNull Style decoration(final @NotNull TextDecoration decoration, final boolean flag) {
+  default Style decoration(final TextDecoration decoration, final boolean flag) {
     return StyleSetter.super.decoration(decoration, flag);
   }
 
@@ -339,7 +339,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  @NotNull Style decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state);
+  Style decoration(final TextDecoration decoration, final TextDecoration.State state);
 
   /**
    * Sets the state of a decoration on this style to {@code state} if the current state of
@@ -351,7 +351,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.12.0
    */
   @Override
-  @NotNull Style decorationIfAbsent(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state);
+  Style decorationIfAbsent(final TextDecoration decoration, final TextDecoration.State state);
 
   /**
    * Gets a map of decorations this style has.
@@ -360,7 +360,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  default @Unmodifiable @NotNull Map<TextDecoration, TextDecoration.State> decorations() {
+  default @Unmodifiable Map<TextDecoration, TextDecoration.State> decorations() {
     return StyleGetter.super.decorations();
   }
 
@@ -374,7 +374,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  @NotNull Style decorations(final @NotNull Map<TextDecoration, TextDecoration.State> decorations);
+  Style decorations(final Map<TextDecoration, TextDecoration.State> decorations);
 
   /**
    * Gets the click event.
@@ -393,7 +393,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  @NotNull Style clickEvent(final @Nullable ClickEvent event);
+  Style clickEvent(final @Nullable ClickEvent event);
 
   /**
    * Gets the hover event.
@@ -412,7 +412,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  @NotNull Style hoverEvent(final @Nullable HoverEventSource<?> source);
+  Style hoverEvent(final @Nullable HoverEventSource<?> source);
 
   /**
    * Gets the string to be inserted when this style is shift-clicked.
@@ -431,7 +431,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.0.0
    */
   @Override
-  @NotNull Style insertion(final @Nullable String insertion);
+  Style insertion(final @Nullable String insertion);
 
   /**
    * Merges from another style into this style.
@@ -440,7 +440,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a style
    * @since 4.0.0
    */
-  default @NotNull Style merge(final @NotNull Style that) {
+  default Style merge(final Style that) {
     return this.merge(that, Merge.all());
   }
 
@@ -452,7 +452,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a style
    * @since 4.0.0
    */
-  default @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy) {
+  default Style merge(final Style that, final Merge.Strategy strategy) {
     return this.merge(that, strategy, Merge.all());
   }
 
@@ -464,7 +464,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a style
    * @since 4.0.0
    */
-  default @NotNull Style merge(final @NotNull Style that, final @NotNull Merge merge) {
+  default Style merge(final Style that, final Merge merge) {
     return this.merge(that, Collections.singleton(merge));
   }
 
@@ -477,7 +477,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a style
    * @since 4.0.0
    */
-  default @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Merge merge) {
+  default Style merge(final Style that, final Merge.Strategy strategy, final Merge merge) {
     return this.merge(that, strategy, Collections.singleton(merge));
   }
 
@@ -489,7 +489,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a style
    * @since 4.0.0
    */
-  default @NotNull Style merge(final @NotNull Style that, final @NotNull Merge@NotNull... merges) {
+  default Style merge(final Style that, final Merge... merges) {
     return this.merge(that, Merge.merges(merges));
   }
 
@@ -502,7 +502,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a style
    * @since 4.0.0
    */
-  default @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Merge@NotNull... merges) {
+  default Style merge(final Style that, final Merge.Strategy strategy, final Merge... merges) {
     return this.merge(that, strategy, Merge.merges(merges));
   }
 
@@ -514,7 +514,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a style
    * @since 4.0.0
    */
-  default @NotNull Style merge(final @NotNull Style that, final @NotNull Set<Merge> merges) {
+  default Style merge(final Style that, final Set<Merge> merges) {
     return this.merge(that, Merge.Strategy.ALWAYS, merges);
   }
 
@@ -527,7 +527,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a style
    * @since 4.0.0
    */
-  @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Set<Merge> merges);
+  Style merge(final Style that, final Merge.Strategy strategy, final Set<Merge> merges);
 
   /**
    * Simplify this style to remove any information that is redundant.
@@ -536,7 +536,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a new, simplified style
    * @since 4.12.0
    */
-  @NotNull Style unmerge(final @NotNull Style that);
+  Style unmerge(final Style that);
 
   /**
    * Tests if this style is empty.
@@ -553,7 +553,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @return a builder
    */
   @Override
-  @NotNull Builder toBuilder();
+  Builder toBuilder();
 
   /**
    * A merge choice.
@@ -601,7 +601,7 @@ enum Merge {
      * @return a merge set
      * @since 4.0.0
      */
-    public static @Unmodifiable @NotNull Set<Merge> all() {
+    public static @Unmodifiable Set<Merge> all() {
       return ALL;
     }
 
@@ -611,7 +611,7 @@ enum Merge {
      * @return a merge set
      * @since 4.0.0
      */
-    public static @Unmodifiable @NotNull Set<Merge> colorAndDecorations() {
+    public static @Unmodifiable Set<Merge> colorAndDecorations() {
       return COLOR_AND_DECORATIONS;
     }
 
@@ -622,7 +622,7 @@ enum Merge {
      * @return a merge set
      * @since 4.10.0
      */
-    public static @Unmodifiable @NotNull Set<Merge> merges(final Merge@NotNull... merges) {
+    public static @Unmodifiable Set<Merge> merges(final Merge... merges) {
       return MonkeyBars.enumSet(Merge.class, merges);
     }
 
@@ -636,11 +636,11 @@ enum Merge {
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-    public static @Unmodifiable @NotNull Set<Merge> of(final Merge@NotNull... merges) {
+    public static @Unmodifiable Set<Merge> of(final Merge... merges) {
       return MonkeyBars.enumSet(Merge.class, merges);
     }
 
-    static boolean hasAll(final @NotNull Set<Merge> merges) {
+    static boolean hasAll(final Set<Merge> merges) {
       return merges.size() == ALL.size();
     }
 
@@ -687,7 +687,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    @NotNull Builder font(final @Nullable Key font);
+    Builder font(final @Nullable Key font);
 
     /**
      * Sets the color.
@@ -698,7 +698,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    @NotNull Builder color(final @Nullable TextColor color);
+    Builder color(final @Nullable TextColor color);
 
     /**
      * Sets the color if there isn't one set already.
@@ -709,7 +709,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    @NotNull Builder colorIfAbsent(final @Nullable TextColor color);
+    Builder colorIfAbsent(final @Nullable TextColor color);
 
     /**
      * Sets {@code decoration} to {@link TextDecoration.State#TRUE}.
@@ -720,7 +720,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    default @NotNull Builder decorate(final @NotNull TextDecoration decoration) {
+    default Builder decorate(final TextDecoration decoration) {
       return MutableStyleSetter.super.decorate(decoration);
     }
 
@@ -733,7 +733,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    default @NotNull Builder decorate(final @NotNull TextDecoration@NotNull... decorations) {
+    default Builder decorate(final TextDecoration... decorations) {
       return MutableStyleSetter.super.decorate(decorations);
     }
 
@@ -748,7 +748,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_, _ -> this")
-    default @NotNull Builder decoration(final @NotNull TextDecoration decoration, final boolean flag) {
+    default Builder decoration(final TextDecoration decoration, final boolean flag) {
       return MutableStyleSetter.super.decoration(decoration, flag);
     }
 
@@ -763,7 +763,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    default @NotNull Builder decorations(final @NotNull Map<TextDecoration, TextDecoration.State> decorations) {
+    default Builder decorations(final Map<TextDecoration, TextDecoration.State> decorations) {
       return MutableStyleSetter.super.decorations(decorations);
     }
 
@@ -780,7 +780,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_, _ -> this")
-    @NotNull Builder decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state);
+    Builder decoration(final TextDecoration decoration, final TextDecoration.State state);
 
     /**
      * Sets the state of a decoration on this style to {@code state} if the current state of the decoration is {@link TextDecoration.State#NOT_SET}.
@@ -792,7 +792,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_, _ -> this")
-    @NotNull Builder decorationIfAbsent(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state);
+    Builder decorationIfAbsent(final TextDecoration decoration, final TextDecoration.State state);
 
     /**
      * Sets the click event.
@@ -803,7 +803,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    @NotNull Builder clickEvent(final @Nullable ClickEvent event);
+    Builder clickEvent(final @Nullable ClickEvent event);
 
     /**
      * Sets the hover event.
@@ -814,7 +814,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    @NotNull Builder hoverEvent(final @Nullable HoverEventSource<?> source);
+    Builder hoverEvent(final @Nullable HoverEventSource<?> source);
 
     /**
      * Sets the string to be inserted.
@@ -825,7 +825,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      */
     @Override
     @Contract("_ -> this")
-    @NotNull Builder insertion(final @Nullable String insertion);
+    Builder insertion(final @Nullable String insertion);
 
     /**
      * Merges from another style into this style.
@@ -835,7 +835,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    default @NotNull Builder merge(final @NotNull Style that) {
+    default Builder merge(final Style that) {
       return this.merge(that, Merge.all());
     }
 
@@ -848,7 +848,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      * @since 4.0.0
      */
     @Contract("_, _ -> this")
-    default @NotNull Builder merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy) {
+    default Builder merge(final Style that, final Merge.Strategy strategy) {
       return this.merge(that, strategy, Merge.all());
     }
 
@@ -861,7 +861,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      * @since 4.0.0
      */
     @Contract("_, _ -> this")
-    default @NotNull Builder merge(final @NotNull Style that, final @NotNull Merge@NotNull... merges) {
+    default Builder merge(final Style that, final Merge... merges) {
       if (merges.length == 0) return this;
       return this.merge(that, Merge.merges(merges));
     }
@@ -876,7 +876,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      * @since 4.0.0
      */
     @Contract("_, _, _ -> this")
-    default @NotNull Builder merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Merge@NotNull... merges) {
+    default Builder merge(final Style that, final Merge.Strategy strategy, final Merge... merges) {
       if (merges.length == 0) return this;
       return this.merge(that, strategy, Merge.merges(merges));
     }
@@ -890,7 +890,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      * @since 4.0.0
      */
     @Contract("_, _ -> this")
-    default @NotNull Builder merge(final @NotNull Style that, final @NotNull Set<Merge> merges) {
+    default Builder merge(final Style that, final Set<Merge> merges) {
       return this.merge(that, Merge.Strategy.ALWAYS, merges);
     }
 
@@ -904,7 +904,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      * @since 4.0.0
      */
     @Contract("_, _, _ -> this")
-    @NotNull Builder merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Set<Merge> merges);
+    Builder merge(final Style that, final Merge.Strategy strategy, final Set<Merge> merges);
 
     /**
      * Applies {@code applicable} to this builder.
@@ -914,7 +914,7 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      * @since 4.0.0
      */
     @Contract("_ -> this")
-    default @NotNull Builder apply(final @NotNull StyleBuilderApplicable applicable) {
+    default Builder apply(final StyleBuilderApplicable applicable) {
       applicable.styleApply(this);
       return this;
     }
@@ -925,6 +925,6 @@ interface Builder extends AbstractBuilder<Style>, Buildable.Builder<Style>, Muta
      * @return the style
      */
     @Override
-    @NotNull Style build();
+    Style build();
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleBuilderApplicable.java b/api/src/main/java/net/kyori/adventure/text/format/StyleBuilderApplicable.java
index 3cfdc0a140..ccebb43220 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleBuilderApplicable.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleBuilderApplicable.java
@@ -26,7 +26,7 @@
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.ComponentBuilderApplicable;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that can be applied to a {@link Style}.
@@ -35,6 +35,7 @@
  */
 @FunctionalInterface
 @SuppressWarnings("FunctionalInterfaceMethodChanged")
+@NullMarked
 public interface StyleBuilderApplicable extends ComponentBuilderApplicable {
   /**
    * Applies to {@code style}.
@@ -43,10 +44,10 @@ public interface StyleBuilderApplicable extends ComponentBuilderApplicable {
    * @since 4.0.0
    */
   @Contract(mutates = "param")
-  void styleApply(final Style.@NotNull Builder style);
+  void styleApply(final Style.Builder style);
 
   @Override
-  default void componentBuilderApply(final @NotNull ComponentBuilder<?, ?> component) {
+  default void componentBuilderApply(final ComponentBuilder<?, ?> component) {
     component.style(this::styleApply);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleGetter.java b/api/src/main/java/net/kyori/adventure/text/format/StyleGetter.java
index 4a4fc12f70..02fbfb1d0f 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleGetter.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleGetter.java
@@ -29,9 +29,9 @@
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Reads style properties from an object.
@@ -40,6 +40,7 @@
  * @since 4.10.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface StyleGetter {
   /**
    * Gets the font.
@@ -66,7 +67,7 @@ public interface StyleGetter {
    *     stylable does not have the decoration
    * @since 4.10.0
    */
-  default boolean hasDecoration(final @NotNull TextDecoration decoration) {
+  default boolean hasDecoration(final TextDecoration decoration) {
     return this.decoration(decoration) == TextDecoration.State.TRUE;
   }
 
@@ -79,7 +80,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    *     and {@link TextDecoration.State#NOT_SET} if not set
    * @since 4.10.0
    */
-  TextDecoration.@NotNull State decoration(final @NotNull TextDecoration decoration);
+  TextDecoration.State decoration(final TextDecoration decoration);
 
   /**
    * Gets a map of decorations this stylable has.
@@ -88,7 +89,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    * @since 4.10.0
    */
   @SuppressWarnings("Duplicates")
-  default @Unmodifiable @NotNull Map<TextDecoration, TextDecoration.State> decorations() {
+  default @Unmodifiable Map<TextDecoration, TextDecoration.State> decorations() {
     final Map<TextDecoration, TextDecoration.State> decorations = new EnumMap<>(TextDecoration.class);
     for (int i = 0, length = DecorationMap.DECORATIONS.length; i < length; i++) {
       final TextDecoration decoration = DecorationMap.DECORATIONS[i];
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
index ff00898263..bbd6e419cd 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
@@ -34,17 +34,18 @@
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class StyleImpl implements Style {
   static final StyleImpl EMPTY = new StyleImpl(null, null, DecorationMap.EMPTY, null, null, null);
   // visible to avoid generating accessors when creating a builder
   final @Nullable Key font;
   final @Nullable TextColor color;
-  final @NotNull DecorationMap decorations;
+  final DecorationMap decorations;
   final @Nullable ClickEvent clickEvent;
   final @Nullable HoverEvent<?> hoverEvent;
   final @Nullable String insertion;
@@ -52,7 +53,7 @@ final class StyleImpl implements Style {
   StyleImpl(
     final @Nullable Key font,
     final @Nullable TextColor color,
-    final @NotNull Map<TextDecoration, TextDecoration.State> decorations,
+    final Map<TextDecoration, TextDecoration.State> decorations,
     final @Nullable ClickEvent clickEvent,
     final @Nullable HoverEvent<?> hoverEvent,
     final @Nullable String insertion
@@ -71,7 +72,7 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style font(final @Nullable Key font) {
+  public Style font(final @Nullable Key font) {
     if (Objects.equals(this.font, font)) return this;
     return new StyleImpl(font, this.color, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
   }
@@ -82,13 +83,13 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style color(final @Nullable TextColor color) {
+  public Style color(final @Nullable TextColor color) {
     if (Objects.equals(this.color, color)) return this;
     return new StyleImpl(this.font, color, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
   }
 
   @Override
-  public @NotNull Style colorIfAbsent(final @Nullable TextColor color) {
+  public Style colorIfAbsent(final @Nullable TextColor color) {
     if (this.color == null) {
       return this.color(color);
     }
@@ -96,7 +97,7 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public TextDecoration.@NotNull State decoration(final @NotNull TextDecoration decoration) {
+  public TextDecoration.State decoration(final TextDecoration decoration) {
     // null -> null
     final TextDecoration.@Nullable State state = this.decorations.get(decoration);
     if (state != null) {
@@ -106,14 +107,14 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+  public Style decoration(final TextDecoration decoration, final TextDecoration.State state) {
     requireNonNull(state, "state");
     if (this.decoration(decoration) == state) return this;
     return new StyleImpl(this.font, this.color, this.decorations.with(decoration, state), this.clickEvent, this.hoverEvent, this.insertion);
   }
 
   @Override
-  public @NotNull Style decorationIfAbsent(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+  public Style decorationIfAbsent(final TextDecoration decoration, final TextDecoration.State state) {
     requireNonNull(state, "state");
     final TextDecoration.@Nullable State oldState = this.decorations.get(decoration);
     if (oldState == TextDecoration.State.NOT_SET) {
@@ -126,12 +127,12 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Map<TextDecoration, TextDecoration.State> decorations() {
+  public Map<TextDecoration, TextDecoration.State> decorations() {
     return this.decorations;
   }
 
   @Override
-  public @NotNull Style decorations(final @NotNull Map<TextDecoration, TextDecoration.State> decorations) {
+  public Style decorations(final Map<TextDecoration, TextDecoration.State> decorations) {
     return new StyleImpl(this.font, this.color, DecorationMap.merge(decorations, this.decorations), this.clickEvent, this.hoverEvent, this.insertion);
   }
 
@@ -141,7 +142,7 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style clickEvent(final @Nullable ClickEvent event) {
+  public Style clickEvent(final @Nullable ClickEvent event) {
     return new StyleImpl(this.font, this.color, this.decorations, event, this.hoverEvent, this.insertion);
   }
 
@@ -151,7 +152,7 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style hoverEvent(final @Nullable HoverEventSource<?> source) {
+  public Style hoverEvent(final @Nullable HoverEventSource<?> source) {
     return new StyleImpl(this.font, this.color, this.decorations, this.clickEvent, HoverEventSource.unbox(source), this.insertion);
   }
 
@@ -161,13 +162,13 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style insertion(final @Nullable String insertion) {
+  public Style insertion(final @Nullable String insertion) {
     if (Objects.equals(this.insertion, insertion)) return this;
     return new StyleImpl(this.font, this.color, this.decorations, this.clickEvent, this.hoverEvent, insertion);
   }
 
   @Override
-  public @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Set<Merge> merges) {
+  public Style merge(final Style that, final Merge.Strategy strategy, final Set<Merge> merges) {
     if (nothingToMerge(that, strategy, merges)) {
       return this;
     }
@@ -184,7 +185,7 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style unmerge(final @NotNull Style that) {
+  public Style unmerge(final Style that) {
     if (this.isEmpty()) {
       // the target style is empty, so there is nothing to simplify
       return this;
@@ -223,7 +224,7 @@ final class StyleImpl implements Style {
   }
 
   @SuppressWarnings("RedundantIfStatement")
-  static boolean nothingToMerge(final @NotNull Style mergeFrom, final Merge.@NotNull Strategy strategy, final @NotNull Set<Merge> merges) {
+  static boolean nothingToMerge(final Style mergeFrom, final Merge.Strategy strategy, final Set<Merge> merges) {
     if (strategy == Merge.Strategy.NEVER) return true;
     if (mergeFrom.isEmpty()) return true;
     if (merges.isEmpty()) return true;
@@ -236,12 +237,12 @@ public boolean isEmpty() {
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.concat(
       this.decorations.examinableProperties(),
       Stream.of(
@@ -255,7 +256,7 @@ public boolean isEmpty() {
   }
 
   @Override
-  public @NotNull String toString() {
+  public String toString() {
     return Internals.toString(this);
   }
 
@@ -295,7 +296,7 @@ static final class BuilderImpl implements Builder {
       this.decorations = new EnumMap<>(DecorationMap.EMPTY);
     }
 
-    BuilderImpl(final @NotNull StyleImpl style) {
+    BuilderImpl(final StyleImpl style) {
       this.color = style.color;
       this.decorations = new EnumMap<>(style.decorations);
       this.clickEvent = style.clickEvent;
@@ -305,19 +306,19 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder font(final @Nullable Key font) {
+    public Builder font(final @Nullable Key font) {
       this.font = font;
       return this;
     }
 
     @Override
-    public @NotNull Builder color(final @Nullable TextColor color) {
+    public Builder color(final @Nullable TextColor color) {
       this.color = color;
       return this;
     }
 
     @Override
-    public @NotNull Builder colorIfAbsent(final @Nullable TextColor color) {
+    public Builder colorIfAbsent(final @Nullable TextColor color) {
       if (this.color == null) {
         this.color = color;
       }
@@ -325,7 +326,7 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+    public Builder decoration(final TextDecoration decoration, final TextDecoration.State state) {
       requireNonNull(state, "state");
       requireNonNull(decoration, "decoration");
       this.decorations.put(decoration, state);
@@ -333,7 +334,7 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder decorationIfAbsent(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
+    public Builder decorationIfAbsent(final TextDecoration decoration, final TextDecoration.State state) {
       requireNonNull(state, "state");
       final TextDecoration.@Nullable State oldState = this.decorations.get(decoration);
       if (oldState == TextDecoration.State.NOT_SET) {
@@ -346,25 +347,25 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder clickEvent(final @Nullable ClickEvent event) {
+    public Builder clickEvent(final @Nullable ClickEvent event) {
       this.clickEvent = event;
       return this;
     }
 
     @Override
-    public @NotNull Builder hoverEvent(final @Nullable HoverEventSource<?> source) {
+    public Builder hoverEvent(final @Nullable HoverEventSource<?> source) {
       this.hoverEvent = HoverEventSource.unbox(source);
       return this;
     }
 
     @Override
-    public @NotNull Builder insertion(final @Nullable String insertion) {
+    public Builder insertion(final @Nullable String insertion) {
       this.insertion = insertion;
       return this;
     }
 
     @Override
-    public @NotNull Builder merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Set<Merge> merges) {
+    public Builder merge(final Style that, final Merge.Strategy strategy, final Set<Merge> merges) {
       requireNonNull(that, "style");
       requireNonNull(strategy, "strategy");
       requireNonNull(merges, "merges");
@@ -434,7 +435,7 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull StyleImpl build() {
+    public StyleImpl build() {
       if (this.isEmpty()) {
         return EMPTY;
       }
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
index 7941a14307..9e090646a1 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
@@ -33,8 +33,8 @@
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Writes style properties to an object.
@@ -44,6 +44,7 @@
  * @since 4.10.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface StyleSetter<T extends StyleSetter<?>> {
   /**
    * Sets the font.
@@ -53,7 +54,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @since 4.10.0
    * @sinceMinecraft 1.16
    */
-  @NotNull T font(final @Nullable Key font);
+  T font(final @Nullable Key font);
 
   /**
    * Sets the color.
@@ -62,7 +63,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  @NotNull T color(final @Nullable TextColor color);
+  T color(final @Nullable TextColor color);
 
   /**
    * Sets the color if there isn't one set already.
@@ -71,7 +72,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  @NotNull T colorIfAbsent(final @Nullable TextColor color);
+  T colorIfAbsent(final @Nullable TextColor color);
 
   /**
    * Sets the state of {@code decoration} to {@link TextDecoration.State#TRUE}.
@@ -80,7 +81,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  default @NotNull T decorate(final @NotNull TextDecoration decoration) {
+  default T decorate(final TextDecoration decoration) {
     return this.decoration(decoration, TextDecoration.State.TRUE);
   }
 
@@ -91,7 +92,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  default @NotNull T decorate(final @NotNull TextDecoration@NotNull... decorations) {
+  default T decorate(final TextDecoration... decorations) {
     final Map<TextDecoration, TextDecoration.State> map = new EnumMap<>(TextDecoration.class);
     for (int i = 0, length = decorations.length; i < length; i++) {
       map.put(decorations[i], TextDecoration.State.TRUE);
@@ -108,7 +109,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  default @NotNull T decoration(final @NotNull TextDecoration decoration, final boolean flag) {
+  default T decoration(final TextDecoration decoration, final boolean flag) {
     return this.decoration(decoration, TextDecoration.State.byBoolean(flag));
   }
 
@@ -123,7 +124,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  @NotNull T decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state);
+  T decoration(final TextDecoration decoration, final TextDecoration.State state);
 
   /**
    * Sets the state of a decoration to {@code state} if the current state of the decoration is {@link TextDecoration.State#NOT_SET}.
@@ -133,7 +134,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.12.0
    */
-  @NotNull T decorationIfAbsent(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state);
+  T decorationIfAbsent(final TextDecoration decoration, final TextDecoration.State state);
 
   /**
    * Sets decorations using the specified {@code decorations} map.
@@ -144,7 +145,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  @NotNull T decorations(final @NotNull Map<TextDecoration, TextDecoration.State> decorations);
+  T decorations(final Map<TextDecoration, TextDecoration.State> decorations);
 
   /**
    * Sets the state of a set of decorations to {@code flag}.
@@ -155,7 +156,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  default @NotNull T decorations(final @NotNull Set<TextDecoration> decorations, final boolean flag) {
+  default T decorations(final Set<TextDecoration> decorations, final boolean flag) {
     return this.decorations(decorations.stream().collect(Collectors.toMap(Function.identity(), decoration -> TextDecoration.State.byBoolean(flag))));
   }
 
@@ -166,7 +167,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  @NotNull T clickEvent(final @Nullable ClickEvent event);
+  T clickEvent(final @Nullable ClickEvent event);
 
   /**
    * Sets the hover event.
@@ -175,7 +176,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  @NotNull T hoverEvent(final @Nullable HoverEventSource<?> source);
+  T hoverEvent(final @Nullable HoverEventSource<?> source);
 
   /**
    * Sets the string to be inserted when this object ({@code T}) is shift-clicked.
@@ -184,5 +185,5 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.10.0
    */
-  @NotNull T insertion(final @Nullable String insertion);
+  T insertion(final @Nullable String insertion);
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/format/TextColor.java b/api/src/main/java/net/kyori/adventure/text/format/TextColor.java
index 9278878335..764b5879a0 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/TextColor.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/TextColor.java
@@ -29,9 +29,9 @@
 import net.kyori.adventure.util.RGBLike;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -46,6 +46,7 @@
  * @see NamedTextColor
  * @since 4.0.0
  */
+@NullMarked
 public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, StyleBuilderApplicable, TextFormat {
   /**
    * The hex character.
@@ -67,7 +68,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return a new text colour
    * @since 4.0.0
    */
-  static @NotNull TextColor color(final int value) {
+  static TextColor color(final int value) {
     final int truncatedValue = value & 0xffffff;
     final NamedTextColor named = NamedTextColor.namedColor(truncatedValue);
     return named != null ? named : new TextColorImpl(truncatedValue);
@@ -80,7 +81,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return a new text colour
    * @since 4.0.0
    */
-  static @NotNull TextColor color(final @NotNull RGBLike rgb) {
+  static TextColor color(final RGBLike rgb) {
     if (rgb instanceof TextColor) return (TextColor) rgb;
     return color(rgb.red(), rgb.green(), rgb.blue());
   }
@@ -93,7 +94,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @see <a href="https://en.wikipedia.org/wiki/HSL_and_HSV">https://en.wikipedia.org/wiki/HSL_and_HSV</a>
    * @since 4.6.0
    */
-  static @NotNull TextColor color(final @NotNull HSVLike hsv) {
+  static TextColor color(final HSVLike hsv) {
     final float s = hsv.s();
     final float v = hsv.v();
     if (s == 0) {
@@ -132,7 +133,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return a new text colour
    * @since 4.0.0
    */
-  static @NotNull TextColor color(final @Range(from = 0x0, to = 0xff) int r, final @Range(from = 0x0, to = 0xff) int g, final @Range(from = 0x0, to = 0xff) int b) {
+  static TextColor color(final @Range(from = 0x0, to = 0xff) int r, final @Range(from = 0x0, to = 0xff) int g, final @Range(from = 0x0, to = 0xff) int b) {
     return color((r & 0xff) << 16 | (g & 0xff) << 8 | (b & 0xff));
   }
 
@@ -145,7 +146,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return a new text colour
    * @since 4.0.0
    */
-  static @NotNull TextColor color(final float r, final float g, final float b) {
+  static TextColor color(final float r, final float g, final float b) {
     return color((int) (r * 0xff), (int) (g * 0xff), (int) (b * 0xff));
   }
 
@@ -156,7 +157,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return a new text colour
    * @since 4.0.0
    */
-  static @Nullable TextColor fromHexString(final @NotNull String string) {
+  static @Nullable TextColor fromHexString(final String string) {
     if (string.startsWith(HEX_PREFIX)) {
       try {
         final int hex = Integer.parseInt(string.substring(1), 16);
@@ -175,7 +176,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return a new text colour
    * @since 4.0.0
    */
-  static @Nullable TextColor fromCSSHexString(final @NotNull String string) {
+  static @Nullable TextColor fromCSSHexString(final String string) {
     if (string.startsWith(HEX_PREFIX)) {
       final String hexString = string.substring(1);
       if (hexString.length() != 3 && hexString.length() != 6) {
@@ -214,7 +215,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return a hex string
    * @since 4.0.0
    */
-  default @NotNull String asHexString() {
+  default String asHexString() {
     return String.format("%c%06x", HEX_CHARACTER, this.value());
   }
 
@@ -262,7 +263,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return the interpolated value, a color between the two input colors {@code a} and {@code b}
    * @since 4.8.0
    */
-  static @NotNull TextColor lerp(final float t, final @NotNull RGBLike a, final @NotNull RGBLike b) {
+  static TextColor lerp(final float t, final RGBLike a, final RGBLike b) {
     final float clampedT = Math.min(1.0f, Math.max(0.0f, t)); // clamp between 0 and 1
     final int ar = a.red();
     final int br = b.red();
@@ -286,7 +287,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
    * @return nearest named colour. will always return a value
    * @since 4.14.0
    */
-  static <C extends TextColor> @NotNull C nearestColorTo(final @NotNull List<C> values, final @NotNull TextColor any) {
+  static <C extends TextColor> C nearestColorTo(final List<C> values, final TextColor any) {
     requireNonNull(any, "color");
 
     float matchedDistance = Float.MAX_VALUE;
@@ -306,7 +307,7 @@ public interface TextColor extends Comparable<TextColor>, Examinable, RGBLike, S
   }
 
   @Override
-  default void styleApply(final Style.@NotNull Builder style) {
+  default void styleApply(final Style.Builder style) {
     style.color(this);
   }
 
@@ -316,7 +317,7 @@ default int compareTo(final TextColor that) {
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.asHexString()));
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/format/TextColorImpl.java b/api/src/main/java/net/kyori/adventure/text/format/TextColorImpl.java
index 90fe594d70..6c71bd71ac 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/TextColorImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/TextColorImpl.java
@@ -25,10 +25,11 @@
 
 import net.kyori.adventure.util.HSVLike;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "asHexString()")
+@NullMarked
 final class TextColorImpl implements TextColor {
   private final int value;
 
@@ -68,7 +69,7 @@ public String toString() {
    * @param other colour to compare to
    * @return distance metric
    */
-  static float distance(final @NotNull HSVLike self, final @NotNull HSVLike other) {
+  static float distance(final HSVLike self, final HSVLike other) {
     // weight hue more heavily than saturation and brightness. kind of magic numbers, but is fine for our use case of downsampling to a set of colors
     final float hueDistance = 3 * Math.min(Math.abs(self.h() - other.h()), 1f - Math.abs(self.h() - other.h()));
     final float saturationDiff = self.s() - other.s();
diff --git a/api/src/main/java/net/kyori/adventure/text/format/TextDecoration.java b/api/src/main/java/net/kyori/adventure/text/format/TextDecoration.java
index 1ab3241a28..2e9fda93d0 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/TextDecoration.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/TextDecoration.java
@@ -26,8 +26,8 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.util.Index;
 import net.kyori.adventure.util.TriState;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -36,6 +36,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public enum TextDecoration implements StyleBuilderApplicable, TextFormat {
   /**
    * A decoration which makes text obfuscated/unreadable.
@@ -89,7 +90,7 @@ public enum TextDecoration implements StyleBuilderApplicable, TextFormat {
    * @deprecated for removal since 4.10.0, use {@link #withState(boolean)} instead
    */
   @Deprecated
-  public final @NotNull TextDecorationAndState as(final boolean state) {
+  public final TextDecorationAndState as(final boolean state) {
     return this.withState(state);
   }
 
@@ -102,7 +103,7 @@ public enum TextDecoration implements StyleBuilderApplicable, TextFormat {
    * @deprecated for removal since 4.10.0, use {@link #withState(State)} instead
    */
   @Deprecated
-  public final @NotNull TextDecorationAndState as(final @NotNull State state) {
+  public final TextDecorationAndState as(final State state) {
     return this.withState(state);
   }
 
@@ -113,7 +114,7 @@ public enum TextDecoration implements StyleBuilderApplicable, TextFormat {
    * @return a {@link TextDecorationAndState}
    * @since 4.10.0
    */
-  public final @NotNull TextDecorationAndState withState(final boolean state) {
+  public final TextDecorationAndState withState(final boolean state) {
     return new TextDecorationAndStateImpl(this, State.byBoolean(state));
   }
 
@@ -124,7 +125,7 @@ public enum TextDecoration implements StyleBuilderApplicable, TextFormat {
    * @return a {@link TextDecorationAndState}
    * @since 4.10.0
    */
-  public final @NotNull TextDecorationAndState withState(final @NotNull State state) {
+  public final TextDecorationAndState withState(final State state) {
     return new TextDecorationAndStateImpl(this, state);
   }
 
@@ -135,17 +136,17 @@ public enum TextDecoration implements StyleBuilderApplicable, TextFormat {
    * @return a {@link TextDecorationAndState}
    * @since 4.10.0
    */
-  public final @NotNull TextDecorationAndState withState(final @NotNull TriState state) {
+  public final TextDecorationAndState withState(final TriState state) {
     return new TextDecorationAndStateImpl(this, State.byTriState(state));
   }
 
   @Override
-  public void styleApply(final Style.@NotNull Builder style) {
+  public void styleApply(final Style.Builder style) {
     style.decorate(this);
   }
 
   @Override
-  public @NotNull String toString() {
+  public String toString() {
     return this.name;
   }
 
@@ -192,7 +193,7 @@ public String toString() {
      * @return the state
      * @since 4.0.0
      */
-    public static @NotNull State byBoolean(final boolean flag) {
+    public static State byBoolean(final boolean flag) {
       return flag ? TRUE : FALSE;
     }
 
@@ -203,7 +204,7 @@ public String toString() {
      * @return the state
      * @since 4.0.0
      */
-    public static @NotNull State byBoolean(final @Nullable Boolean flag) {
+    public static State byBoolean(final @Nullable Boolean flag) {
       return flag == null ? NOT_SET : byBoolean(flag.booleanValue());
     }
 
@@ -214,7 +215,7 @@ public String toString() {
      * @return the state
      * @since 4.10.0
      */
-    public static @NotNull State byTriState(final @NotNull TriState flag) {
+    public static State byTriState(final TriState flag) {
       requireNonNull(flag);
       switch (flag) {
         case TRUE: return TRUE;
diff --git a/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndState.java b/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndState.java
index 9524ea1fcc..792531f60f 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndState.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndState.java
@@ -27,7 +27,7 @@
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A combination of a {@link TextDecoration} and a {@link TextDecoration.State}.
@@ -35,6 +35,7 @@
  * @since 4.8.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface TextDecorationAndState extends Examinable, StyleBuilderApplicable {
   /**
    * Gets the decoration.
@@ -42,7 +43,7 @@ public interface TextDecorationAndState extends Examinable, StyleBuilderApplicab
    * @return the decoration
    * @since 4.8.0
    */
-  @NotNull TextDecoration decoration();
+  TextDecoration decoration();
 
   /**
    * Gets the state.
@@ -50,15 +51,15 @@ public interface TextDecorationAndState extends Examinable, StyleBuilderApplicab
    * @return the state
    * @since 4.8.0
    */
-  TextDecoration.@NotNull State state();
+  TextDecoration.State state();
 
   @Override
-  default void styleApply(final Style.@NotNull Builder style) {
+  default void styleApply(final Style.Builder style) {
     style.decoration(this.decoration(), this.state());
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("decoration", this.decoration()),
       ExaminableProperty.of("state", this.state())
diff --git a/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndStateImpl.java b/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndStateImpl.java
index 154ef70691..60949a1985 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndStateImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndStateImpl.java
@@ -24,11 +24,12 @@
 package net.kyori.adventure.text.format;
 
 import net.kyori.adventure.internal.Internals;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class TextDecorationAndStateImpl implements TextDecorationAndState {
   private final TextDecoration decoration;
   private final TextDecoration.State state;
@@ -41,12 +42,12 @@ final class TextDecorationAndStateImpl implements TextDecorationAndState {
   }
 
   @Override
-  public @NotNull TextDecoration decoration() {
+  public TextDecoration decoration() {
     return this.decoration;
   }
 
   @Override
-  public TextDecoration.@NotNull State state() {
+  public TextDecoration.State state() {
     return this.state;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/text/renderer/AbstractComponentRenderer.java b/api/src/main/java/net/kyori/adventure/text/renderer/AbstractComponentRenderer.java
index 69cc1865d0..62c48d046f 100644
--- a/api/src/main/java/net/kyori/adventure/text/renderer/AbstractComponentRenderer.java
+++ b/api/src/main/java/net/kyori/adventure/text/renderer/AbstractComponentRenderer.java
@@ -33,7 +33,7 @@
 import net.kyori.adventure.text.StorageNBTComponent;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.TranslatableComponent;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An abstract implementation of a component renderer.
@@ -41,9 +41,10 @@
  * @param <C> the context type
  * @since 4.0.0
  */
+@NullMarked
 public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<C> {
   @Override
-  public @NotNull Component render(final @NotNull Component component, final @NotNull C context) {
+  public Component render(final Component component, final C context) {
     if (component instanceof TextComponent) {
       return this.renderText((TextComponent) component, context);
     } else if (component instanceof TranslatableComponent) {
@@ -73,7 +74,7 @@ public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<
    * @param context the context
    * @return the rendered component
    */
-  protected abstract @NotNull Component renderBlockNbt(final @NotNull BlockNBTComponent component, final @NotNull C context);
+  protected abstract Component renderBlockNbt(final BlockNBTComponent component, final C context);
 
   /**
    * Renders an entity NBT component.
@@ -82,7 +83,7 @@ public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<
    * @param context the context
    * @return the rendered component
    */
-  protected abstract @NotNull Component renderEntityNbt(final @NotNull EntityNBTComponent component, final @NotNull C context);
+  protected abstract Component renderEntityNbt(final EntityNBTComponent component, final C context);
 
   /**
    * Renders a storage NBT component.
@@ -91,7 +92,7 @@ public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<
    * @param context the context
    * @return the rendered component
    */
-  protected abstract @NotNull Component renderStorageNbt(final @NotNull StorageNBTComponent component, final @NotNull C context);
+  protected abstract Component renderStorageNbt(final StorageNBTComponent component, final C context);
 
   /**
    * Renders a keybind component.
@@ -100,7 +101,7 @@ public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<
    * @param context the context
    * @return the rendered component
    */
-  protected abstract @NotNull Component renderKeybind(final @NotNull KeybindComponent component, final @NotNull C context);
+  protected abstract Component renderKeybind(final KeybindComponent component, final C context);
 
   /**
    * Renders a score component.
@@ -109,7 +110,7 @@ public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<
    * @param context the context
    * @return the rendered component
    */
-  protected abstract @NotNull Component renderScore(final @NotNull ScoreComponent component, final @NotNull C context);
+  protected abstract Component renderScore(final ScoreComponent component, final C context);
 
   /**
    * Renders a selector component.
@@ -118,7 +119,7 @@ public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<
    * @param context the context
    * @return the rendered component
    */
-  protected abstract @NotNull Component renderSelector(final @NotNull SelectorComponent component, final @NotNull C context);
+  protected abstract Component renderSelector(final SelectorComponent component, final C context);
 
   /**
    * Renders a text component.
@@ -127,7 +128,7 @@ public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<
    * @param context the context
    * @return the rendered component
    */
-  protected abstract @NotNull Component renderText(final @NotNull TextComponent component, final @NotNull C context);
+  protected abstract Component renderText(final TextComponent component, final C context);
 
   /**
    * Renders a translatable component.
@@ -136,5 +137,5 @@ public abstract class AbstractComponentRenderer<C> implements ComponentRenderer<
    * @param context the context
    * @return the rendered component
    */
-  protected abstract @NotNull Component renderTranslatable(final @NotNull TranslatableComponent component, final @NotNull C context);
+  protected abstract Component renderTranslatable(final TranslatableComponent component, final C context);
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/renderer/ComponentRenderer.java b/api/src/main/java/net/kyori/adventure/text/renderer/ComponentRenderer.java
index a44512eb02..b4aae5327e 100644
--- a/api/src/main/java/net/kyori/adventure/text/renderer/ComponentRenderer.java
+++ b/api/src/main/java/net/kyori/adventure/text/renderer/ComponentRenderer.java
@@ -25,7 +25,7 @@
 
 import java.util.function.Function;
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A component renderer.
@@ -33,6 +33,7 @@
  * @param <C> the context type
  * @since 4.0.0
  */
+@NullMarked
 public interface ComponentRenderer<C> {
   /**
    * Renders a component.
@@ -42,7 +43,7 @@ public interface ComponentRenderer<C> {
    * @return the rendered component
    * @since 4.0.0
    */
-  @NotNull Component render(final @NotNull Component component, final @NotNull C context);
+  Component render(final Component component, final C context);
 
   /**
    * Return a {@link ComponentRenderer} that takes a different context type.
diff --git a/api/src/main/java/net/kyori/adventure/text/renderer/TranslatableComponentRenderer.java b/api/src/main/java/net/kyori/adventure/text/renderer/TranslatableComponentRenderer.java
index fc8a82d2ff..432929addc 100644
--- a/api/src/main/java/net/kyori/adventure/text/renderer/TranslatableComponentRenderer.java
+++ b/api/src/main/java/net/kyori/adventure/text/renderer/TranslatableComponentRenderer.java
@@ -46,8 +46,8 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.translation.Translator;
 import net.kyori.adventure.util.TriState;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -57,6 +57,7 @@
  * @param <C> the context type, usually {@link java.util.Locale}.
  * @since 4.0.0
  */
+@NullMarked
 public abstract class TranslatableComponentRenderer<C> extends AbstractComponentRenderer<C> {
   private static final Set<Style.Merge> MERGES = Style.Merge.merges(Style.Merge.COLOR, Style.Merge.DECORATIONS, Style.Merge.INSERTION, Style.Merge.FONT);
 
@@ -70,16 +71,16 @@ public abstract class TranslatableComponentRenderer<C> extends AbstractComponent
    * @return the renderer
    * @since 4.0.0
    */
-  public static @NotNull TranslatableComponentRenderer<Locale> usingTranslationSource(final @NotNull Translator source) {
+  public static TranslatableComponentRenderer<Locale> usingTranslationSource(final Translator source) {
     requireNonNull(source, "source");
     return new TranslatableComponentRenderer<Locale>() {
       @Override
-      protected @Nullable MessageFormat translate(final @NotNull String key, final @NotNull Locale context) {
+      protected @Nullable MessageFormat translate(final String key, final Locale context) {
         return source.translate(key, context);
       }
 
       @Override
-      protected @NotNull Component renderTranslatable(final @NotNull TranslatableComponent component, final @NotNull Locale context) {
+      protected Component renderTranslatable(final TranslatableComponent component, final Locale context) {
         final TriState anyTranslations = source.hasAnyTranslations();
         if (anyTranslations == TriState.TRUE || anyTranslations == TriState.NOT_SET) {
           final @Nullable Component translated = source.translate(component, context);
@@ -98,7 +99,7 @@ public abstract class TranslatableComponentRenderer<C> extends AbstractComponent
    * @param context a context
    * @return a message format or {@code null} to skip translation
    */
-  protected @Nullable MessageFormat translate(final @NotNull String key, final @NotNull C context) {
+  protected @Nullable MessageFormat translate(final String key, final C context) {
     return null;
   }
 
@@ -110,32 +111,32 @@ public abstract class TranslatableComponentRenderer<C> extends AbstractComponent
    * @param context a context
    * @return a message format or {@code null} to skip translation
    */
-  protected @Nullable MessageFormat translate(final @NotNull String key, final @Nullable String fallback, final @NotNull C context) {
+  protected @Nullable MessageFormat translate(final String key, final @Nullable String fallback, final C context) {
     return this.translate(key, context);
   }
 
   @Override
-  protected @NotNull Component renderBlockNbt(final @NotNull BlockNBTComponent component, final @NotNull C context) {
+  protected Component renderBlockNbt(final BlockNBTComponent component, final C context) {
     final BlockNBTComponent.Builder builder = this.nbt(context, Component.blockNBT(), component)
       .pos(component.pos());
     return this.mergeStyleAndOptionallyDeepRender(component, builder, context);
   }
 
   @Override
-  protected @NotNull Component renderEntityNbt(final @NotNull EntityNBTComponent component, final @NotNull C context) {
+  protected Component renderEntityNbt(final EntityNBTComponent component, final C context) {
     final EntityNBTComponent.Builder builder = this.nbt(context, Component.entityNBT(), component)
       .selector(component.selector());
     return this.mergeStyleAndOptionallyDeepRender(component, builder, context);
   }
 
   @Override
-  protected @NotNull Component renderStorageNbt(final @NotNull StorageNBTComponent component, final @NotNull C context) {
+  protected Component renderStorageNbt(final StorageNBTComponent component, final C context) {
     final StorageNBTComponent.Builder builder = this.nbt(context, Component.storageNBT(), component)
       .storage(component.storage());
     return this.mergeStyleAndOptionallyDeepRender(component, builder, context);
   }
 
-  protected <O extends NBTComponent<O, B>, B extends NBTComponentBuilder<O, B>> B nbt(final @NotNull C context, final B builder, final O oldComponent) {
+  protected <O extends NBTComponent<O, B>, B extends NBTComponentBuilder<O, B>> B nbt(final C context, final B builder, final O oldComponent) {
     builder
       .nbtPath(oldComponent.nbtPath())
       .interpret(oldComponent.interpret());
@@ -147,14 +148,14 @@ protected <O extends NBTComponent<O, B>, B extends NBTComponentBuilder<O, B>> B
   }
 
   @Override
-  protected @NotNull Component renderKeybind(final @NotNull KeybindComponent component, final @NotNull C context) {
+  protected Component renderKeybind(final KeybindComponent component, final C context) {
     final KeybindComponent.Builder builder = Component.keybind().keybind(component.keybind());
     return this.mergeStyleAndOptionallyDeepRender(component, builder, context);
   }
 
   @Override
   @SuppressWarnings("deprecation")
-  protected @NotNull Component renderScore(final @NotNull ScoreComponent component, final @NotNull C context) {
+  protected Component renderScore(final ScoreComponent component, final C context) {
     final ScoreComponent.Builder builder = Component.score()
       .name(component.name())
       .objective(component.objective())
@@ -163,20 +164,20 @@ protected <O extends NBTComponent<O, B>, B extends NBTComponentBuilder<O, B>> B
   }
 
   @Override
-  protected @NotNull Component renderSelector(final @NotNull SelectorComponent component, final @NotNull C context) {
+  protected Component renderSelector(final SelectorComponent component, final C context) {
     final SelectorComponent.Builder builder = Component.selector().pattern(component.pattern());
     return this.mergeStyleAndOptionallyDeepRender(component, builder, context);
   }
 
   @Override
-  protected @NotNull Component renderText(final @NotNull TextComponent component, final @NotNull C context) {
+  protected Component renderText(final TextComponent component, final C context) {
     final TextComponent.Builder builder = Component.text().content(component.content());
     return this.mergeStyleAndOptionallyDeepRender(component, builder, context);
   }
 
   @Override
   @SuppressWarnings("JdkObsolete") // MessageFormat requires StringBuffer in its api
-  protected @NotNull Component renderTranslatable(final @NotNull TranslatableComponent component, final @NotNull C context) {
+  protected Component renderTranslatable(final TranslatableComponent component, final C context) {
     final @Nullable MessageFormat format = this.translate(component.key(), component.fallback(), context);
     if (format == null) {
       // we don't have a translation for this component, but the arguments or children
diff --git a/api/src/main/java/net/kyori/adventure/text/serializer/ComponentEncoder.java b/api/src/main/java/net/kyori/adventure/text/serializer/ComponentEncoder.java
index d77ef11be9..a76043971a 100644
--- a/api/src/main/java/net/kyori/adventure/text/serializer/ComponentEncoder.java
+++ b/api/src/main/java/net/kyori/adventure/text/serializer/ComponentEncoder.java
@@ -25,8 +25,8 @@
 
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A {@link Component} encoder, which provides serialization, but without deserialization.
@@ -37,6 +37,7 @@
  * @param <R> the serialized type
  * @since 4.14.0
  */
+@NullMarked
 public interface ComponentEncoder<I extends Component, R> {
   /**
    * Serializes a component into an output of type {@code R}.
@@ -45,7 +46,7 @@ public interface ComponentEncoder<I extends Component, R> {
    * @return the output
    * @since 4.14.0
    */
-  @NotNull R serialize(final @NotNull I component);
+  R serialize(final I component);
 
   /**
    * Serializes a component into an output of type {@code R}.
diff --git a/api/src/main/java/net/kyori/adventure/text/serializer/ComponentSerializer.java b/api/src/main/java/net/kyori/adventure/text/serializer/ComponentSerializer.java
index 264d16c3a7..c32782926d 100644
--- a/api/src/main/java/net/kyori/adventure/text/serializer/ComponentSerializer.java
+++ b/api/src/main/java/net/kyori/adventure/text/serializer/ComponentSerializer.java
@@ -26,8 +26,8 @@
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A {@link Component} serializer and deserializer.
@@ -37,6 +37,7 @@
  * @param <R> the serialized type
  * @since 4.0.0
  */
+@NullMarked
 public interface ComponentSerializer<I extends Component, O extends Component, R> extends ComponentEncoder<I, R> {
   /**
    * Deserialize a component from input of type {@code R}.
@@ -45,7 +46,7 @@ public interface ComponentSerializer<I extends Component, O extends Component, R
    * @return the component
    * @since 4.0.0
    */
-  @NotNull O deserialize(final @NotNull R input);
+  O deserialize(final R input);
 
   /**
    * Deserialize a component from input of type {@code R}.
@@ -103,7 +104,7 @@ public interface ComponentSerializer<I extends Component, O extends Component, R
    * @since 4.0.0
    */
   @Override
-  @NotNull R serialize(final @NotNull I component);
+  R serialize(final I component);
 
   /**
    * Serializes a component into an output of type {@code R}.
diff --git a/api/src/main/java/net/kyori/adventure/title/Title.java b/api/src/main/java/net/kyori/adventure/title/Title.java
index 0f8b408c77..a0eac88f7e 100644
--- a/api/src/main/java/net/kyori/adventure/title/Title.java
+++ b/api/src/main/java/net/kyori/adventure/title/Title.java
@@ -28,9 +28,8 @@
 import net.kyori.adventure.util.Ticks;
 import net.kyori.examination.Examinable;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents an in-game title, which can be displayed across the centre of the screen.
@@ -39,6 +38,7 @@
  * @since 4.0.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface Title extends Examinable {
   /**
    * The default times.
@@ -55,7 +55,7 @@ public interface Title extends Examinable {
    * @return the title
    * @since 4.0.0
    */
-  static @NotNull Title title(final @NotNull Component title, final @NotNull Component subtitle) {
+  static Title title(final Component title, final Component subtitle) {
     return title(title, subtitle, DEFAULT_TIMES);
   }
 
@@ -68,7 +68,7 @@ public interface Title extends Examinable {
    * @return the title
    * @since 4.0.0
    */
-  static @NotNull Title title(final @NotNull Component title, final @NotNull Component subtitle, final @Nullable Times times) {
+  static Title title(final Component title, final Component subtitle, final @Nullable Times times) {
     return new TitleImpl(title, subtitle, times);
   }
 
@@ -78,7 +78,7 @@ public interface Title extends Examinable {
    * @return the title
    * @since 4.0.0
    */
-  @NotNull Component title();
+  Component title();
 
   /**
    * Gets the subtitle.
@@ -86,7 +86,7 @@ public interface Title extends Examinable {
    * @return the subtitle
    * @since 4.0.0
    */
-  @NotNull Component subtitle();
+  Component subtitle();
 
   /**
    * Gets the times.
@@ -104,7 +104,7 @@ public interface Title extends Examinable {
    * @return the value
    * @since 4.9.0
    */
-  <T> @UnknownNullability T part(final @NotNull TitlePart<T> part);
+  <T> @Nullable T part(final TitlePart<T> part);
 
   /**
    * Title times.
@@ -124,7 +124,7 @@ interface Times extends Examinable {
      */
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
     @Deprecated
-    static @NotNull Times of(final @NotNull Duration fadeIn, final @NotNull Duration stay, final @NotNull Duration fadeOut) {
+    static Times of(final Duration fadeIn, final Duration stay, final Duration fadeOut) {
       return times(fadeIn, stay, fadeOut);
     }
 
@@ -137,7 +137,7 @@ interface Times extends Examinable {
      * @return times
      * @since 4.10.0
      */
-    static @NotNull Times times(final @NotNull Duration fadeIn, final @NotNull Duration stay, final @NotNull Duration fadeOut) {
+    static Times times(final Duration fadeIn, final Duration stay, final Duration fadeOut) {
       return new TitleImpl.TimesImpl(fadeIn, stay, fadeOut);
     }
 
@@ -147,7 +147,7 @@ interface Times extends Examinable {
      * @return the time the title will fade-in
      * @since 4.0.0
      */
-    @NotNull Duration fadeIn();
+    Duration fadeIn();
 
     /**
      * Gets the time the title will stay.
@@ -155,7 +155,7 @@ interface Times extends Examinable {
      * @return the time the title will stay
      * @since 4.0.0
      */
-    @NotNull Duration stay();
+    Duration stay();
 
     /**
      * Gets the time the title will fade-out.
@@ -163,6 +163,6 @@ interface Times extends Examinable {
      * @return the time the title will fade-out
      * @since 4.0.0
      */
-    @NotNull Duration fadeOut();
+    Duration fadeOut();
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/title/TitleImpl.java b/api/src/main/java/net/kyori/adventure/title/TitleImpl.java
index 0154dba168..5f3b896af9 100644
--- a/api/src/main/java/net/kyori/adventure/title/TitleImpl.java
+++ b/api/src/main/java/net/kyori/adventure/title/TitleImpl.java
@@ -29,30 +29,30 @@
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.text.Component;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class TitleImpl implements Title {
   private final Component title;
   private final Component subtitle;
   private final @Nullable Times times;
 
-  TitleImpl(final @NotNull Component title, final @NotNull Component subtitle, final @Nullable Times times) {
+  TitleImpl(final Component title, final Component subtitle, final @Nullable Times times) {
     this.title = requireNonNull(title, "title");
     this.subtitle = requireNonNull(subtitle, "subtitle");
     this.times = times;
   }
 
   @Override
-  public @NotNull Component title() {
+  public Component title() {
     return this.title;
   }
 
   @Override
-  public @NotNull Component subtitle() {
+  public Component subtitle() {
     return this.subtitle;
   }
 
@@ -63,7 +63,7 @@ final class TitleImpl implements Title {
 
   @Override
   @SuppressWarnings("unchecked") // compared with parts directly
-  public <T> @UnknownNullability T part(final @NotNull TitlePart<T> part) {
+  public <T> @Nullable T part(final TitlePart<T> part) {
     requireNonNull(part, "part");
     if (part == TitlePart.TITLE) {
       return (T) this.title;
@@ -95,7 +95,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("title", this.title),
       ExaminableProperty.of("subtitle", this.subtitle),
@@ -113,24 +113,24 @@ static class TimesImpl implements Times {
     private final Duration stay;
     private final Duration fadeOut;
 
-    TimesImpl(final @NotNull Duration fadeIn, final @NotNull Duration stay, final @NotNull Duration fadeOut) {
+    TimesImpl(final Duration fadeIn, final Duration stay, final Duration fadeOut) {
       this.fadeIn = requireNonNull(fadeIn, "fadeIn");
       this.stay = requireNonNull(stay, "stay");
       this.fadeOut = requireNonNull(fadeOut, "fadeOut");
     }
 
     @Override
-    public @NotNull Duration fadeIn() {
+    public Duration fadeIn() {
       return this.fadeIn;
     }
 
     @Override
-    public @NotNull Duration stay() {
+    public Duration stay() {
       return this.stay;
     }
 
     @Override
-    public @NotNull Duration fadeOut() {
+    public Duration fadeOut() {
       return this.fadeOut;
     }
 
@@ -153,7 +153,7 @@ public int hashCode() {
     }
 
     @Override
-    public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    public Stream<? extends ExaminableProperty> examinableProperties() {
       return Stream.of(
         ExaminableProperty.of("fadeIn", this.fadeIn),
         ExaminableProperty.of("stay", this.stay),
diff --git a/api/src/main/java/net/kyori/adventure/translation/GlobalTranslator.java b/api/src/main/java/net/kyori/adventure/translation/GlobalTranslator.java
index 61c2d74261..e3699b0344 100644
--- a/api/src/main/java/net/kyori/adventure/translation/GlobalTranslator.java
+++ b/api/src/main/java/net/kyori/adventure/translation/GlobalTranslator.java
@@ -30,7 +30,7 @@
 import net.kyori.adventure.text.renderer.TranslatableComponentRenderer;
 import net.kyori.examination.Examinable;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A global source of translations. The global source is the default source used by adventure platforms
@@ -41,6 +41,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface GlobalTranslator extends Translator, Examinable {
   /**
    * Gets the global translation source.
@@ -48,7 +49,7 @@ public interface GlobalTranslator extends Translator, Examinable {
    * @return the source
    * @since 4.10.0
    */
-  static @NotNull GlobalTranslator translator() {
+  static GlobalTranslator translator() {
     return GlobalTranslatorImpl.INSTANCE;
   }
 
@@ -61,7 +62,7 @@ public interface GlobalTranslator extends Translator, Examinable {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull GlobalTranslator get() {
+  static GlobalTranslator get() {
     return GlobalTranslatorImpl.INSTANCE;
   }
 
@@ -71,7 +72,7 @@ public interface GlobalTranslator extends Translator, Examinable {
    * @return a renderer
    * @since 4.0.0
    */
-  static @NotNull TranslatableComponentRenderer<Locale> renderer() {
+  static TranslatableComponentRenderer<Locale> renderer() {
     return GlobalTranslatorImpl.INSTANCE.renderer;
   }
 
@@ -83,7 +84,7 @@ public interface GlobalTranslator extends Translator, Examinable {
    * @return the rendered component
    * @since 4.0.0
    */
-  static @NotNull Component render(final @NotNull Component component, final @NotNull Locale locale) {
+  static Component render(final Component component, final Locale locale) {
     return renderer().render(component, locale);
   }
 
@@ -93,7 +94,7 @@ public interface GlobalTranslator extends Translator, Examinable {
    * @return the sources
    * @since 4.0.0
    */
-  @NotNull Iterable<? extends Translator> sources();
+  Iterable<? extends Translator> sources();
 
   /**
    * Adds a translation source.
@@ -105,7 +106,7 @@ public interface GlobalTranslator extends Translator, Examinable {
    * @throws IllegalArgumentException if source is {@link GlobalTranslator}
    * @since 4.0.0
    */
-  boolean addSource(final @NotNull Translator source);
+  boolean addSource(final Translator source);
 
   /**
    * Removes a translation source.
@@ -114,5 +115,5 @@ public interface GlobalTranslator extends Translator, Examinable {
    * @return {@code true} if unregistered, {@code false} otherwise
    * @since 4.0.0
    */
-  boolean removeSource(final @NotNull Translator source);
+  boolean removeSource(final Translator source);
 }
diff --git a/api/src/main/java/net/kyori/adventure/translation/GlobalTranslatorImpl.java b/api/src/main/java/net/kyori/adventure/translation/GlobalTranslatorImpl.java
index e0489cc294..835ea94d29 100644
--- a/api/src/main/java/net/kyori/adventure/translation/GlobalTranslatorImpl.java
+++ b/api/src/main/java/net/kyori/adventure/translation/GlobalTranslatorImpl.java
@@ -35,11 +35,12 @@
 import net.kyori.adventure.text.renderer.TranslatableComponentRenderer;
 import net.kyori.adventure.util.TriState;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class GlobalTranslatorImpl implements GlobalTranslator {
   private static final Key NAME = Key.key("adventure", "global");
   static final GlobalTranslatorImpl INSTANCE = new GlobalTranslatorImpl();
@@ -50,30 +51,30 @@ private GlobalTranslatorImpl() {
   }
 
   @Override
-  public @NotNull Key name() {
+  public Key name() {
     return NAME;
   }
 
   @Override
-  public @NotNull Iterable<? extends Translator> sources() {
+  public Iterable<? extends Translator> sources() {
     return Collections.unmodifiableSet(this.sources);
   }
 
   @Override
-  public boolean addSource(final @NotNull Translator source) {
+  public boolean addSource(final Translator source) {
     requireNonNull(source, "source");
     if (source == this) throw new IllegalArgumentException("GlobalTranslationSource");
     return this.sources.add(source);
   }
 
   @Override
-  public boolean removeSource(final @NotNull Translator source) {
+  public boolean removeSource(final Translator source) {
     requireNonNull(source, "source");
     return this.sources.remove(source);
   }
 
   @Override
-  public @NotNull TriState hasAnyTranslations() {
+  public TriState hasAnyTranslations() {
     if (!this.sources.isEmpty()) {
       return TriState.TRUE;
     }
@@ -81,7 +82,7 @@ public boolean removeSource(final @NotNull Translator source) {
   }
 
   @Override
-  public @Nullable MessageFormat translate(final @NotNull String key, final @NotNull Locale locale) {
+  public @Nullable MessageFormat translate(final String key, final Locale locale) {
     requireNonNull(key, "key");
     requireNonNull(locale, "locale");
     for (final Translator source : this.sources) {
@@ -92,7 +93,7 @@ public boolean removeSource(final @NotNull Translator source) {
   }
 
   @Override
-  public @Nullable Component translate(final @NotNull TranslatableComponent component, final @NotNull Locale locale) {
+  public @Nullable Component translate(final TranslatableComponent component, final Locale locale) {
     requireNonNull(component, "component");
     requireNonNull(locale, "locale");
     for (final Translator source : this.sources) {
@@ -103,7 +104,7 @@ public boolean removeSource(final @NotNull Translator source) {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("sources", this.sources));
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/translation/Translatable.java b/api/src/main/java/net/kyori/adventure/translation/Translatable.java
index aa4bb187b4..af6a6de4ce 100644
--- a/api/src/main/java/net/kyori/adventure/translation/Translatable.java
+++ b/api/src/main/java/net/kyori/adventure/translation/Translatable.java
@@ -23,13 +23,14 @@
  */
 package net.kyori.adventure.translation;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that has a translation key.
  *
  * @since 4.8.0
  */
+@NullMarked
 public interface Translatable {
   /**
    * Gets the translation key.
@@ -37,5 +38,5 @@ public interface Translatable {
    * @return the translation key
    * @since 4.8.0
    */
-  @NotNull String translationKey();
+  String translationKey();
 }
diff --git a/api/src/main/java/net/kyori/adventure/translation/TranslationLocales.java b/api/src/main/java/net/kyori/adventure/translation/TranslationLocales.java
index 1897854d82..c55ba6aa50 100644
--- a/api/src/main/java/net/kyori/adventure/translation/TranslationLocales.java
+++ b/api/src/main/java/net/kyori/adventure/translation/TranslationLocales.java
@@ -26,7 +26,7 @@
 import java.util.Locale;
 import java.util.function.Supplier;
 import net.kyori.adventure.internal.properties.AdventureProperties;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 final class TranslationLocales {
   private static final Supplier<Locale> GLOBAL;
diff --git a/api/src/main/java/net/kyori/adventure/translation/TranslationRegistry.java b/api/src/main/java/net/kyori/adventure/translation/TranslationRegistry.java
index a8e48e2adf..c03b2c60a2 100644
--- a/api/src/main/java/net/kyori/adventure/translation/TranslationRegistry.java
+++ b/api/src/main/java/net/kyori/adventure/translation/TranslationRegistry.java
@@ -38,8 +38,8 @@
 import java.util.regex.Pattern;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.util.UTF8ResourceBundleControl;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -51,6 +51,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface TranslationRegistry extends Translator {
   /**
    * A pattern which matches a single quote.
@@ -66,7 +67,7 @@ public interface TranslationRegistry extends Translator {
    * @return a translation registry
    * @since 4.0.0
    */
-  static @NotNull TranslationRegistry create(final Key name) {
+  static TranslationRegistry create(final Key name) {
     return new TranslationRegistryImpl(requireNonNull(name, "name"));
   }
 
@@ -77,7 +78,7 @@ public interface TranslationRegistry extends Translator {
    * @return whether the registry contains a value for the translation key
    * @since 4.7.0
    */
-  boolean contains(final @NotNull String key);
+  boolean contains(final String key);
 
   /**
    * Gets a message format from a key and locale.
@@ -90,7 +91,7 @@ public interface TranslationRegistry extends Translator {
    * @since 4.0.0
    */
   @Override
-  @Nullable MessageFormat translate(final @NotNull String key, final @NotNull Locale locale);
+  @Nullable MessageFormat translate(final String key, final Locale locale);
 
   /**
    * Sets the default locale used by this registry.
@@ -98,7 +99,7 @@ public interface TranslationRegistry extends Translator {
    * @param locale the locale to use a default
    * @since 4.0.0
    */
-  void defaultLocale(final @NotNull Locale locale);
+  void defaultLocale(final Locale locale);
 
   /**
    * Registers a translation.
@@ -114,7 +115,7 @@ public interface TranslationRegistry extends Translator {
    * @throws IllegalArgumentException if the translation key is already exists
    * @since 4.0.0
    */
-  void register(final @NotNull String key, final @NotNull Locale locale, final @NotNull MessageFormat format);
+  void register(final String key, final Locale locale, final MessageFormat format);
 
   /**
    * Registers a map of translations.
@@ -135,7 +136,7 @@ public interface TranslationRegistry extends Translator {
    * @see #register(String, Locale, MessageFormat)
    * @since 4.0.0
    */
-  default void registerAll(final @NotNull Locale locale, final @NotNull Map<String, MessageFormat> formats) {
+  default void registerAll(final Locale locale, final Map<String, MessageFormat> formats) {
     this.registerAll(locale, formats.keySet(), formats::get);
   }
 
@@ -149,7 +150,7 @@ default void registerAll(final @NotNull Locale locale, final @NotNull Map<String
    * @see #registerAll(Locale, ResourceBundle, boolean)
    * @since 4.0.0
    */
-  default void registerAll(final @NotNull Locale locale, final @NotNull Path path, final boolean escapeSingleQuotes) {
+  default void registerAll(final Locale locale, final Path path, final boolean escapeSingleQuotes) {
     try (final BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
       this.registerAll(locale, new PropertyResourceBundle(reader), escapeSingleQuotes);
     } catch (final IOException e) {
@@ -174,7 +175,7 @@ default void registerAll(final @NotNull Locale locale, final @NotNull Path path,
    * @see UTF8ResourceBundleControl
    * @since 4.0.0
    */
-  default void registerAll(final @NotNull Locale locale, final @NotNull ResourceBundle bundle, final boolean escapeSingleQuotes) {
+  default void registerAll(final Locale locale, final ResourceBundle bundle, final boolean escapeSingleQuotes) {
     this.registerAll(locale, bundle.keySet(), key -> {
       final String format = bundle.getString(key);
       return new MessageFormat(
@@ -195,7 +196,7 @@ default void registerAll(final @NotNull Locale locale, final @NotNull ResourceBu
    * @throws IllegalArgumentException if a translation key is already exists
    * @since 4.0.0
    */
-  default void registerAll(final @NotNull Locale locale, final @NotNull Set<String> keys, final Function<String, MessageFormat> function) {
+  default void registerAll(final Locale locale, final Set<String> keys, final Function<String, MessageFormat> function) {
     IllegalArgumentException firstError = null;
     int errorCount = 0;
     for (final String key : keys) {
@@ -223,5 +224,5 @@ default void registerAll(final @NotNull Locale locale, final @NotNull Set<String
    * @param key a translation key
    * @since 4.0.0
    */
-  void unregister(final @NotNull String key);
+  void unregister(final String key);
 }
diff --git a/api/src/main/java/net/kyori/adventure/translation/TranslationRegistryImpl.java b/api/src/main/java/net/kyori/adventure/translation/TranslationRegistryImpl.java
index 1210ab6d0e..7106692ca3 100644
--- a/api/src/main/java/net/kyori/adventure/translation/TranslationRegistryImpl.java
+++ b/api/src/main/java/net/kyori/adventure/translation/TranslationRegistryImpl.java
@@ -34,11 +34,12 @@
 import net.kyori.adventure.util.TriState;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class TranslationRegistryImpl implements Examinable, TranslationRegistry {
   private final Key name;
   private final Map<String, Translation> translations = new ConcurrentHashMap<>();
@@ -49,27 +50,27 @@ final class TranslationRegistryImpl implements Examinable, TranslationRegistry {
   }
 
   @Override
-  public void register(final @NotNull String key, final @NotNull Locale locale, final @NotNull MessageFormat format) {
+  public void register(final String key, final Locale locale, final MessageFormat format) {
     this.translations.computeIfAbsent(key, Translation::new).register(locale, format);
   }
 
   @Override
-  public void unregister(final @NotNull String key) {
+  public void unregister(final String key) {
     this.translations.remove(key);
   }
 
   @Override
-  public @NotNull Key name() {
+  public Key name() {
     return this.name;
   }
 
   @Override
-  public boolean contains(final @NotNull String key) {
+  public boolean contains(final String key) {
     return this.translations.containsKey(key);
   }
 
   @Override
-  public @NotNull TriState hasAnyTranslations() {
+  public TriState hasAnyTranslations() {
     if (!this.translations.isEmpty()) {
       return TriState.TRUE;
     }
@@ -77,19 +78,19 @@ public boolean contains(final @NotNull String key) {
   }
 
   @Override
-  public @Nullable MessageFormat translate(final @NotNull String key, final @NotNull Locale locale) {
+  public @Nullable MessageFormat translate(final String key, final Locale locale) {
     final Translation translation = this.translations.get(key);
     if (translation == null) return null;
     return translation.translate(locale);
   }
 
   @Override
-  public void defaultLocale(final @NotNull Locale defaultLocale) {
+  public void defaultLocale(final Locale defaultLocale) {
     this.defaultLocale = requireNonNull(defaultLocale, "defaultLocale");
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("translations", this.translations));
   }
 
@@ -119,18 +120,18 @@ final class Translation implements Examinable {
     private final String key;
     private final Map<Locale, MessageFormat> formats;
 
-    Translation(final @NotNull String key) {
+    Translation(final String key) {
       this.key = requireNonNull(key, "translation key");
       this.formats = new ConcurrentHashMap<>();
     }
 
-    void register(final @NotNull Locale locale, final @NotNull MessageFormat format) {
+    void register(final Locale locale, final MessageFormat format) {
       if (this.formats.putIfAbsent(requireNonNull(locale, "locale"), requireNonNull(format, "message format")) != null) {
         throw new IllegalArgumentException(String.format("Translation already exists: %s for %s", this.key, locale));
       }
     }
 
-    @Nullable MessageFormat translate(final @NotNull Locale locale) {
+    @Nullable MessageFormat translate(final Locale locale) {
       MessageFormat format = this.formats.get(requireNonNull(locale, "locale"));
       if (format == null) {
         format = this.formats.get(new Locale(locale.getLanguage())); // try without country
@@ -145,7 +146,7 @@ void register(final @NotNull Locale locale, final @NotNull MessageFormat format)
     }
 
     @Override
-    public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    public Stream<? extends ExaminableProperty> examinableProperties() {
       return Stream.of(
         ExaminableProperty.of("key", this.key),
         ExaminableProperty.of("formats", this.formats)
diff --git a/api/src/main/java/net/kyori/adventure/translation/Translator.java b/api/src/main/java/net/kyori/adventure/translation/Translator.java
index d8b450b205..67d615cae2 100644
--- a/api/src/main/java/net/kyori/adventure/translation/Translator.java
+++ b/api/src/main/java/net/kyori/adventure/translation/Translator.java
@@ -30,8 +30,8 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TranslatableComponent;
 import net.kyori.adventure.util.TriState;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A message translator.
@@ -48,6 +48,7 @@
  * @see TranslationRegistry
  * @since 4.0.0
  */
+@NullMarked
 public interface Translator {
   /**
    * Parses a {@link Locale} from a {@link String}.
@@ -56,7 +57,7 @@ public interface Translator {
    * @return a locale
    * @since 4.0.0
    */
-  static @Nullable Locale parseLocale(final @NotNull String string) {
+  static @Nullable Locale parseLocale(final String string) {
     final String[] segments = string.split("_", 3); // language_country_variant
     final int length = segments.length;
     if (length == 1) {
@@ -77,7 +78,7 @@ public interface Translator {
    * @return an identifier for this translation source
    * @since 4.0.0
    */
-  @NotNull Key name();
+  Key name();
 
   /**
    * Checks if this translator has any translations.
@@ -85,7 +86,7 @@ public interface Translator {
    * @return {@link TriState#TRUE} if any, {@link TriState#NOT_SET} if unknown, or {@link TriState#FALSE} if none
    * @since 4.15.0
    */
-  default @NotNull TriState hasAnyTranslations() {
+  default TriState hasAnyTranslations() {
     return TriState.NOT_SET;
   }
 
@@ -100,7 +101,7 @@ public interface Translator {
    * @return a message format or {@code null} to skip translation
    * @since 4.0.0
    */
-  @Nullable MessageFormat translate(final @NotNull String key, final @NotNull Locale locale);
+  @Nullable MessageFormat translate(final String key, final Locale locale);
 
   /**
    * Gets a translated component from a translatable component and locale.
@@ -110,7 +111,7 @@ public interface Translator {
    * @return a translated component or {@code null} to use {@link #translate(String, Locale)} instead (if available)
    * @since 4.13.0
    */
-  default @Nullable Component translate(final @NotNull TranslatableComponent component, final @NotNull Locale locale) {
+  default @Nullable Component translate(final TranslatableComponent component, final Locale locale) {
     return null;
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/Buildable.java b/api/src/main/java/net/kyori/adventure/util/Buildable.java
index 4126b41cb6..6c37db9d98 100644
--- a/api/src/main/java/net/kyori/adventure/util/Buildable.java
+++ b/api/src/main/java/net/kyori/adventure/util/Buildable.java
@@ -26,8 +26,8 @@
 import java.util.function.Consumer;
 import net.kyori.adventure.builder.AbstractBuilder;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Something that can be built.
@@ -36,6 +36,7 @@
  * @param <B> the builder type
  * @since 4.0.0
  */
+@NullMarked
 public interface Buildable<R, B extends Buildable.Builder<R>> {
   /**
    * Configures {@code builder} using {@code consumer} and then builds.
@@ -50,7 +51,7 @@ public interface Buildable<R, B extends Buildable.Builder<R>> {
    */
   @Contract(mutates = "param1")
   @Deprecated
-  static <R extends Buildable<R, B>, B extends Builder<R>> @NotNull R configureAndBuild(final @NotNull B builder, final @Nullable Consumer<? super B> consumer) {
+  static <R extends Buildable<R, B>, B extends Builder<R>> R configureAndBuild(final B builder, final @Nullable Consumer<? super B> consumer) {
     return AbstractBuilder.configureAndBuild(builder, consumer);
   }
 
@@ -61,7 +62,7 @@ public interface Buildable<R, B extends Buildable.Builder<R>> {
    * @since 4.0.0
    */
   @Contract(value = "-> new", pure = true)
-  @NotNull B toBuilder();
+  B toBuilder();
 
   /**
    * A builder.
@@ -80,6 +81,6 @@ interface Builder<R> extends AbstractBuilder<R> {
      */
     @Contract(value = "-> new", pure = true)
     @Override
-    @NotNull R build();
+    R build();
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/Codec.java b/api/src/main/java/net/kyori/adventure/util/Codec.java
index 3471a110d6..f853aa8434 100644
--- a/api/src/main/java/net/kyori/adventure/util/Codec.java
+++ b/api/src/main/java/net/kyori/adventure/util/Codec.java
@@ -24,7 +24,7 @@
 package net.kyori.adventure.util;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A combination encoder and decoder.
@@ -35,6 +35,7 @@
  * @param <EX> the encode exception type
  * @since 4.0.0
  */
+@NullMarked
 public interface Codec<D, E, DX extends Throwable, EX extends Throwable> {
   /**
    * Creates a codec.
@@ -48,15 +49,15 @@ public interface Codec<D, E, DX extends Throwable, EX extends Throwable> {
    * @return a codec
    * @since 4.10.0
    */
-  static <D, E, DX extends Throwable, EX extends Throwable> @NotNull Codec<D, E, DX, EX> codec(final @NotNull Decoder<D, E, DX> decoder, final @NotNull Encoder<D, E, EX> encoder) {
+  static <D, E, DX extends Throwable, EX extends Throwable> Codec<D, E, DX, EX> codec(final Decoder<D, E, DX> decoder, final Encoder<D, E, EX> encoder) {
     return new Codec<D, E, DX, EX>() {
       @Override
-      public @NotNull D decode(final @NotNull E encoded) throws DX {
+      public D decode(final E encoded) throws DX {
         return decoder.decode(encoded);
       }
 
       @Override
-      public @NotNull E encode(final @NotNull D decoded) throws EX {
+      public E encode(final D decoded) throws EX {
         return encoder.encode(decoded);
       }
     };
@@ -77,15 +78,15 @@ public interface Codec<D, E, DX extends Throwable, EX extends Throwable> {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static <D, E, DX extends Throwable, EX extends Throwable> @NotNull Codec<D, E, DX, EX> of(final @NotNull Decoder<D, E, DX> decoder, final @NotNull Encoder<D, E, EX> encoder) {
+  static <D, E, DX extends Throwable, EX extends Throwable> Codec<D, E, DX, EX> of(final Decoder<D, E, DX> decoder, final Encoder<D, E, EX> encoder) {
     return new Codec<D, E, DX, EX>() {
       @Override
-      public @NotNull D decode(final @NotNull E encoded) throws DX {
+      public D decode(final E encoded) throws DX {
         return decoder.decode(encoded);
       }
 
       @Override
-      public @NotNull E encode(final @NotNull D decoded) throws EX {
+      public E encode(final D decoded) throws EX {
         return encoder.encode(decoded);
       }
     };
@@ -99,7 +100,7 @@ public interface Codec<D, E, DX extends Throwable, EX extends Throwable> {
    * @throws DX if an exception is encountered while decoding
    * @since 4.0.0
    */
-  @NotNull D decode(final @NotNull E encoded) throws DX;
+  D decode(final E encoded) throws DX;
 
   /**
    * A decoder.
@@ -118,7 +119,7 @@ interface Decoder<D, E, X extends Throwable> {
      * @throws X if an exception is encountered while decoding
      * @since 4.0.0
      */
-    @NotNull D decode(final @NotNull E encoded) throws X;
+    D decode(final E encoded) throws X;
   }
 
   /**
@@ -129,7 +130,7 @@ interface Decoder<D, E, X extends Throwable> {
    * @throws EX if an exception is encountered while encoding
    * @since 4.0.0
    */
-  @NotNull E encode(final @NotNull D decoded) throws EX;
+  E encode(final D decoded) throws EX;
 
   /**
    * An encoder.
@@ -148,6 +149,6 @@ interface Encoder<D, E, X extends Throwable> {
      * @throws X if an exception is encountered while encoding
      * @since 4.0.0
      */
-    @NotNull E encode(final @NotNull D decoded) throws X;
+    E encode(final D decoded) throws X;
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/ComponentMessageThrowable.java b/api/src/main/java/net/kyori/adventure/util/ComponentMessageThrowable.java
index 8cac466806..479a332e2c 100644
--- a/api/src/main/java/net/kyori/adventure/util/ComponentMessageThrowable.java
+++ b/api/src/main/java/net/kyori/adventure/util/ComponentMessageThrowable.java
@@ -24,7 +24,7 @@
 package net.kyori.adventure.util;
 
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * An extension interface for {@link Throwable}s to provide a {@link Component}-based message.
diff --git a/api/src/main/java/net/kyori/adventure/util/ForwardingIterator.java b/api/src/main/java/net/kyori/adventure/util/ForwardingIterator.java
index 552501068a..a94705c0cd 100644
--- a/api/src/main/java/net/kyori/adventure/util/ForwardingIterator.java
+++ b/api/src/main/java/net/kyori/adventure/util/ForwardingIterator.java
@@ -27,7 +27,7 @@
 import java.util.Objects;
 import java.util.Spliterator;
 import java.util.function.Supplier;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An iterable that forwards the {@link #iterator()} and {@link #spliterator()} calls to some {@link Supplier suppliers}.
@@ -35,6 +35,7 @@
  * @param <T> the type of the iterable
  * @since 4.9.0
  */
+@NullMarked
 public final class ForwardingIterator<T> implements Iterable<T> {
   private final Supplier<Iterator<T>> iterator;
   private final Supplier<Spliterator<T>> spliterator;
@@ -46,18 +47,18 @@ public final class ForwardingIterator<T> implements Iterable<T> {
    * @param spliterator the spliterator supplier
    * @since 4.9.0
    */
-  public ForwardingIterator(final @NotNull Supplier<Iterator<T>> iterator, final @NotNull Supplier<Spliterator<T>> spliterator) {
+  public ForwardingIterator(final Supplier<Iterator<T>> iterator, final Supplier<Spliterator<T>> spliterator) {
     this.iterator = Objects.requireNonNull(iterator, "iterator");
     this.spliterator = Objects.requireNonNull(spliterator, "spliterator");
   }
 
   @Override
-  public @NotNull Iterator<T> iterator() {
+  public Iterator<T> iterator() {
     return this.iterator.get();
   }
 
   @Override
-  public @NotNull Spliterator<T> spliterator() {
+  public Spliterator<T> spliterator() {
     return this.spliterator.get();
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/HSVLike.java b/api/src/main/java/net/kyori/adventure/util/HSVLike.java
index 87ba87e3a1..9d00ecc7bc 100644
--- a/api/src/main/java/net/kyori/adventure/util/HSVLike.java
+++ b/api/src/main/java/net/kyori/adventure/util/HSVLike.java
@@ -27,8 +27,8 @@
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that can provide hue, saturation, and value color components.
@@ -37,6 +37,7 @@
  *
  * @since 4.6.0
  */
+@NullMarked
 public interface HSVLike extends Examinable {
   /**
    * Creates a new HSVLike.
@@ -47,7 +48,7 @@ public interface HSVLike extends Examinable {
    * @return a new HSVLike
    * @since 4.10.0
    */
-  static @NotNull HSVLike hsvLike(final float h, final float s, final float v) {
+  static HSVLike hsvLike(final float h, final float s, final float v) {
     return new HSVLikeImpl(h, s, v);
   }
 
@@ -63,7 +64,7 @@ public interface HSVLike extends Examinable {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull HSVLike of(final float h, final float s, final float v) {
+  static HSVLike of(final float h, final float s, final float v) {
     return new HSVLikeImpl(h, s, v);
   }
 
@@ -76,7 +77,7 @@ public interface HSVLike extends Examinable {
    * @return a new HSVLike
    * @since 4.6.0
    */
-  static @NotNull HSVLike fromRGB(@Range(from = 0x0, to = 0xff) final int red, @Range(from = 0x0, to = 0xff) final int green, @Range(from = 0x0, to = 0xff) final int blue) {
+  static HSVLike fromRGB(@Range(from = 0x0, to = 0xff) final int red, @Range(from = 0x0, to = 0xff) final int green, @Range(from = 0x0, to = 0xff) final int blue) {
     final float r = red / 255.0f;
     final float g = green / 255.0f;
     final float b = blue / 255.0f;
@@ -137,7 +138,7 @@ public interface HSVLike extends Examinable {
   float v();
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("h", this.h()),
       ExaminableProperty.of("s", this.s()),
diff --git a/api/src/main/java/net/kyori/adventure/util/HSVLikeImpl.java b/api/src/main/java/net/kyori/adventure/util/HSVLikeImpl.java
index 485963b7b5..1d3d709317 100644
--- a/api/src/main/java/net/kyori/adventure/util/HSVLikeImpl.java
+++ b/api/src/main/java/net/kyori/adventure/util/HSVLikeImpl.java
@@ -25,7 +25,7 @@
 
 import java.util.Objects;
 import net.kyori.adventure.internal.Internals;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 final class HSVLikeImpl implements HSVLike {
   private final float h;
diff --git a/api/src/main/java/net/kyori/adventure/util/Index.java b/api/src/main/java/net/kyori/adventure/util/Index.java
index 2145201c77..984f7194ef 100644
--- a/api/src/main/java/net/kyori/adventure/util/Index.java
+++ b/api/src/main/java/net/kyori/adventure/util/Index.java
@@ -34,8 +34,8 @@
 import java.util.function.Function;
 import java.util.function.IntFunction;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A bi-directional map in which keys and values must be unique.
@@ -44,6 +44,7 @@
  * @param <V> the value type
  * @since 4.0.0
  */
+@NullMarked
 public final class Index<K, V> {
   private final Map<K, V> keyToValue;
   private final Map<V, K> valueToKey;
@@ -63,7 +64,7 @@ private Index(final Map<K, V> keyToValue, final Map<V, K> valueToKey) {
    * @return the key map
    * @since 4.0.0
    */
-  public static <K, V extends Enum<V>> @NotNull Index<K, V> create(final Class<V> type, final @NotNull Function<? super V, ? extends K> keyFunction) {
+  public static <K, V extends Enum<V>> Index<K, V> create(final Class<V> type, final Function<? super V, ? extends K> keyFunction) {
     return create(type, keyFunction, type.getEnumConstants());
   }
 
@@ -80,7 +81,7 @@ private Index(final Map<K, V> keyToValue, final Map<V, K> valueToKey) {
    */
   @SafeVarargs
   @SuppressWarnings("varargs")
-  public static <K, V extends Enum<V>> @NotNull Index<K, V> create(final Class<V> type, final @NotNull Function<? super V, ? extends K> keyFunction, final @NotNull V@NotNull... values) {
+  public static <K, V extends Enum<V>> Index<K, V> create(final Class<V> type, final Function<? super V, ? extends K> keyFunction, final V... values) {
     return create(values, length -> new EnumMap<>(type), keyFunction);
   }
 
@@ -96,7 +97,7 @@ private Index(final Map<K, V> keyToValue, final Map<V, K> valueToKey) {
    */
   @SafeVarargs
   @SuppressWarnings("varargs")
-  public static <K, V> @NotNull Index<K, V> create(final @NotNull Function<? super V, ? extends K> keyFunction, final @NotNull V@NotNull... values) {
+  public static <K, V> Index<K, V> create(final Function<? super V, ? extends K> keyFunction, final V... values) {
     return create(values, HashMap::new, keyFunction);
   }
 
@@ -110,15 +111,15 @@ private Index(final Map<K, V> keyToValue, final Map<V, K> valueToKey) {
    * @return the key map
    * @since 4.0.0
    */
-  public static <K, V> @NotNull Index<K, V> create(final @NotNull Function<? super V, ? extends K> keyFunction, final @NotNull List<V> constants) {
+  public static <K, V> Index<K, V> create(final Function<? super V, ? extends K> keyFunction, final List<V> constants) {
     return create(constants, HashMap::new, keyFunction);
   }
 
-  private static <K, V> @NotNull Index<K, V> create(final V[] values, final IntFunction<Map<V, K>> valueToKeyFactory, final @NotNull Function<? super V, ? extends K> keyFunction) {
+  private static <K, V> Index<K, V> create(final V[] values, final IntFunction<Map<V, K>> valueToKeyFactory, final Function<? super V, ? extends K> keyFunction) {
     return create(Arrays.asList(values), valueToKeyFactory, keyFunction);
   }
 
-  private static <K, V> @NotNull Index<K, V> create(final List<V> values, final IntFunction<Map<V, K>> valueToKeyFactory, final @NotNull Function<? super V, ? extends K> keyFunction) {
+  private static <K, V> Index<K, V> create(final List<V> values, final IntFunction<Map<V, K>> valueToKeyFactory, final Function<? super V, ? extends K> keyFunction) {
     final int length = values.size();
     final Map<K, V> keyToValue = new HashMap<>(length);
     final Map<V, K> valueToKey = valueToKeyFactory.apply(length); // to support using EnumMap instead of HashMap when possible
@@ -141,7 +142,7 @@ private Index(final Map<K, V> keyToValue, final Map<V, K> valueToKey) {
    * @return the keys
    * @since 4.0.0
    */
-  public @NotNull Set<K> keys() {
+  public Set<K> keys() {
     return Collections.unmodifiableSet(this.keyToValue.keySet());
   }
 
@@ -152,7 +153,7 @@ private Index(final Map<K, V> keyToValue, final Map<V, K> valueToKey) {
    * @return the key
    * @since 4.0.0
    */
-  public @Nullable K key(final @NotNull V value) {
+  public @Nullable K key(final V value) {
     return this.valueToKey.get(value);
   }
 
@@ -164,7 +165,7 @@ private Index(final Map<K, V> keyToValue, final Map<V, K> valueToKey) {
    * @throws NoSuchElementException if there is no key for the value
    * @since 4.11.0
    */
-  public @NotNull K keyOrThrow(final @NotNull V value) {
+  public K keyOrThrow(final V value) {
     final K key = this.key(value);
     if (key == null) {
       throw new NoSuchElementException("There is no key for value " + value);
@@ -181,7 +182,7 @@ private Index(final Map<K, V> keyToValue, final Map<V, K> valueToKey) {
    * @since 4.11.0
    */
   @Contract("_, null -> null; _, !null -> !null")
-  public K keyOr(final @NotNull V value, final @Nullable K defaultKey) {
+  public K keyOr(final V value, final @Nullable K defaultKey) {
     final K key = this.key(value);
     return key == null ? defaultKey : key;
   }
@@ -192,7 +193,7 @@ public K keyOr(final @NotNull V value, final @Nullable K defaultKey) {
    * @return the keys
    * @since 4.0.0
    */
-  public @NotNull Set<V> values() {
+  public Set<V> values() {
     return Collections.unmodifiableSet(this.valueToKey.keySet());
   }
 
@@ -203,7 +204,7 @@ public K keyOr(final @NotNull V value, final @Nullable K defaultKey) {
    * @return the value
    * @since 4.0.0
    */
-  public @Nullable V value(final @NotNull K key) {
+  public @Nullable V value(final K key) {
     return this.keyToValue.get(key);
   }
 
@@ -215,7 +216,7 @@ public K keyOr(final @NotNull V value, final @Nullable K defaultKey) {
    * @throws NoSuchElementException if there is no value for the key
    * @since 4.11.0
    */
-  public @NotNull V valueOrThrow(final @NotNull K key) {
+  public V valueOrThrow(final K key) {
     final V value = this.value(key);
     if (value == null) {
       throw new NoSuchElementException("There is no value for key " + key);
@@ -232,7 +233,7 @@ public K keyOr(final @NotNull V value, final @Nullable K defaultKey) {
    * @since 4.11.0
    */
   @Contract("_, null -> null; _, !null -> !null")
-  public V valueOr(final @NotNull K key, final @Nullable V defaultValue) {
+  public V valueOr(final K key, final @Nullable V defaultValue) {
     final V value = this.value(key);
     return value == null ? defaultValue : value;
   }
@@ -243,7 +244,7 @@ public V valueOr(final @NotNull K key, final @Nullable V defaultValue) {
    * @return a mapping from key to value in the index
    * @since 4.10.0
    */
-  public @NotNull Map<K, V> keyToValue() {
+  public Map<K, V> keyToValue() {
     return Collections.unmodifiableMap(this.keyToValue);
   }
 
@@ -253,7 +254,7 @@ public V valueOr(final @NotNull K key, final @Nullable V defaultValue) {
    * @return a mapping from value to key in the index
    * @since 4.10.0
    */
-  public @NotNull Map<V, K> valueToKey() {
+  public Map<V, K> valueToKey() {
     return Collections.unmodifiableMap(this.valueToKey);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/Listenable.java b/api/src/main/java/net/kyori/adventure/util/Listenable.java
index 46370c0370..d4a06e85cd 100644
--- a/api/src/main/java/net/kyori/adventure/util/Listenable.java
+++ b/api/src/main/java/net/kyori/adventure/util/Listenable.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Consumer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that has listeners.
@@ -34,6 +34,7 @@
  * @param <L> the listener type
  * @since 4.0.0
  */
+@NullMarked
 public abstract class Listenable<L> {
   private final List<L> listeners = new CopyOnWriteArrayList<>();
 
@@ -43,7 +44,7 @@ public abstract class Listenable<L> {
    * @param consumer the consumer
    * @since 4.0.0
    */
-  protected final void forEachListener(final @NotNull Consumer<L> consumer) {
+  protected final void forEachListener(final Consumer<L> consumer) {
     for (final L listener : this.listeners) {
       consumer.accept(listener);
     }
@@ -55,7 +56,7 @@ protected final void forEachListener(final @NotNull Consumer<L> consumer) {
    * @param listener the listener
    * @since 4.0.0
    */
-  protected final void addListener0(final @NotNull L listener) {
+  protected final void addListener0(final L listener) {
     this.listeners.add(listener);
   }
 
@@ -65,7 +66,7 @@ protected final void addListener0(final @NotNull L listener) {
    * @param listener the listener
    * @since 4.0.0
    */
-  protected final void removeListener0(final @NotNull L listener) {
+  protected final void removeListener0(final L listener) {
     this.listeners.remove(listener);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/MonkeyBars.java b/api/src/main/java/net/kyori/adventure/util/MonkeyBars.java
index 853a786820..1c319c1727 100644
--- a/api/src/main/java/net/kyori/adventure/util/MonkeyBars.java
+++ b/api/src/main/java/net/kyori/adventure/util/MonkeyBars.java
@@ -29,13 +29,14 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * {@link Collection} related utilities.
  *
  * @since 4.8.0
  */
+@NullMarked
 public final class MonkeyBars {
   private MonkeyBars() {
   }
@@ -51,7 +52,7 @@ private MonkeyBars() {
    */
   @SafeVarargs
   @SuppressWarnings("varargs")
-  public static <E extends Enum<E>> @NotNull Set<E> enumSet(final Class<E> type, final E@NotNull... constants) {
+  public static <E extends Enum<E>> Set<E> enumSet(final Class<E> type, final E... constants) {
     final Set<E> set = EnumSet.noneOf(type);
     Collections.addAll(set, constants);
     return Collections.unmodifiableSet(set);
@@ -68,7 +69,7 @@ private MonkeyBars() {
    * @return a list
    * @since 4.8.0
    */
-  public static <T> @NotNull List<T> addOne(final @NotNull List<T> oldList, final T newElement) {
+  public static <T> List<T> addOne(final List<T> oldList, final T newElement) {
     if (oldList.isEmpty()) return Collections.singletonList(newElement);
     final List<T> newList = new ArrayList<>(oldList.size() + 1);
     newList.addAll(oldList);
diff --git a/api/src/main/java/net/kyori/adventure/util/Nag.java b/api/src/main/java/net/kyori/adventure/util/Nag.java
index 21e89cf147..2f4bbdac4c 100644
--- a/api/src/main/java/net/kyori/adventure/util/Nag.java
+++ b/api/src/main/java/net/kyori/adventure/util/Nag.java
@@ -23,13 +23,14 @@
  */
 package net.kyori.adventure.util;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A nag.
  *
  * @since 4.7.0
  */
+@NullMarked
 public abstract class Nag extends RuntimeException {
   private static final long serialVersionUID = -695562541413409498L;
 
@@ -39,7 +40,7 @@ public abstract class Nag extends RuntimeException {
    * @param nag the nag
    * @since 4.7.0
    */
-  public static void print(final @NotNull Nag nag) {
+  public static void print(final Nag nag) {
     nag.printStackTrace();
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/util/RGBLike.java b/api/src/main/java/net/kyori/adventure/util/RGBLike.java
index c830389910..1029846859 100644
--- a/api/src/main/java/net/kyori/adventure/util/RGBLike.java
+++ b/api/src/main/java/net/kyori/adventure/util/RGBLike.java
@@ -23,14 +23,15 @@
  */
 package net.kyori.adventure.util;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that can provide red, green, and blue colour components.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface RGBLike {
   /**
    * Gets the red component.
@@ -62,7 +63,7 @@ public interface RGBLike {
    * @return an HSVLike representing this RGBLike in the HSV color space
    * @since 4.6.0
    */
-  default @NotNull HSVLike asHSV() {
+  default HSVLike asHSV() {
     return HSVLike.fromRGB(this.red(), this.green(), this.blue());
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/Services.java b/api/src/main/java/net/kyori/adventure/util/Services.java
index b1ca003be9..9f5f4b46ec 100644
--- a/api/src/main/java/net/kyori/adventure/util/Services.java
+++ b/api/src/main/java/net/kyori/adventure/util/Services.java
@@ -27,13 +27,14 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 import net.kyori.adventure.internal.properties.AdventureProperties;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Tools for working with {@link ServiceLoader}s.
  *
  * @since 4.8.0
  */
+@NullMarked
 public final class Services {
   private static final boolean SERVICE_LOAD_FAILURES_ARE_FATAL = Boolean.TRUE.equals(AdventureProperties.SERVICE_LOAD_FAILURES_ARE_FATAL.value());
 
@@ -48,7 +49,7 @@ private Services() {
    * @return a service, or {@link Optional#empty()}
    * @since 4.8.0
    */
-  public static <P> @NotNull Optional<P> service(final @NotNull Class<P> type) {
+  public static <P> Optional<P> service(final Class<P> type) {
     final ServiceLoader<P> loader = Services0.loader(type);
     final Iterator<P> it = loader.iterator();
     while (it.hasNext()) {
@@ -92,7 +93,7 @@ public interface Fallback {
    * @see Fallback
    * @since 4.14.0
    */
-  public static <P> @NotNull Optional<P> serviceWithFallback(final @NotNull Class<P> type) {
+  public static <P> Optional<P> serviceWithFallback(final Class<P> type) {
     final ServiceLoader<P> loader = Services0.loader(type);
     final Iterator<P> it = loader.iterator();
     P firstFallback = null;
diff --git a/api/src/main/java/net/kyori/adventure/util/ShadyPines.java b/api/src/main/java/net/kyori/adventure/util/ShadyPines.java
index c7a0a42f54..aaa31a8b59 100644
--- a/api/src/main/java/net/kyori/adventure/util/ShadyPines.java
+++ b/api/src/main/java/net/kyori/adventure/util/ShadyPines.java
@@ -25,13 +25,14 @@
 
 import java.util.Set;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Various utilities.
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class ShadyPines {
   private ShadyPines() {
   }
@@ -50,7 +51,7 @@ private ShadyPines() {
   @Deprecated
   @SafeVarargs
   @SuppressWarnings("varargs")
-  public static <E extends Enum<E>> @NotNull Set<E> enumSet(final Class<E> type, final E@NotNull... constants) {
+  public static <E extends Enum<E>> Set<E> enumSet(final Class<E> type, final E... constants) {
     return MonkeyBars.enumSet(type, constants);
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/util/Ticks.java b/api/src/main/java/net/kyori/adventure/util/Ticks.java
index 3ad8fc5253..93c6b017ee 100644
--- a/api/src/main/java/net/kyori/adventure/util/Ticks.java
+++ b/api/src/main/java/net/kyori/adventure/util/Ticks.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.util;
 
 import java.time.Duration;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Standard game tick utilities.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface Ticks {
   /**
    * The number of ticks that occur in one second.
@@ -53,7 +54,7 @@ public interface Ticks {
    * @return a duration
    * @since 4.0.0
    */
-  static @NotNull Duration duration(final long ticks) {
+  static Duration duration(final long ticks) {
     return Duration.ofMillis(ticks * SINGLE_TICK_DURATION_MS);
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/TriState.java b/api/src/main/java/net/kyori/adventure/util/TriState.java
index bfa865242b..6ec080a9d3 100644
--- a/api/src/main/java/net/kyori/adventure/util/TriState.java
+++ b/api/src/main/java/net/kyori/adventure/util/TriState.java
@@ -24,14 +24,15 @@
 package net.kyori.adventure.util;
 
 import java.util.function.BooleanSupplier;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Similar to a {@code boolean} but with three states.
  *
  * @since 4.8.0
  */
+@NullMarked
 public enum TriState {
   /**
    * State describing the absence of a value.
@@ -98,7 +99,7 @@ public boolean toBooleanOrElse(final boolean other) {
    * @return the boolean representing the tri-state or the result of the passed supplier if this state is {@link #NOT_SET}.
    * @since 4.10.0
    */
-  public boolean toBooleanOrElseGet(final @NotNull BooleanSupplier supplier) {
+  public boolean toBooleanOrElseGet(final BooleanSupplier supplier) {
     switch (this) {
       case TRUE: return true;
       case FALSE: return false;
@@ -113,7 +114,7 @@ public boolean toBooleanOrElseGet(final @NotNull BooleanSupplier supplier) {
    * @return a tri-state
    * @since 4.8.0
    */
-  public static @NotNull TriState byBoolean(final boolean value) {
+  public static TriState byBoolean(final boolean value) {
     return value ? TRUE : FALSE;
   }
 
@@ -124,7 +125,7 @@ public boolean toBooleanOrElseGet(final @NotNull BooleanSupplier supplier) {
    * @return a tri-state
    * @since 4.8.0
    */
-  public static @NotNull TriState byBoolean(final @Nullable Boolean value) {
+  public static TriState byBoolean(final @Nullable Boolean value) {
     return value == null ? NOT_SET : byBoolean(value.booleanValue());
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/util/UTF8ResourceBundleControl.java b/api/src/main/java/net/kyori/adventure/util/UTF8ResourceBundleControl.java
index 0842deedd2..271cf90998 100644
--- a/api/src/main/java/net/kyori/adventure/util/UTF8ResourceBundleControl.java
+++ b/api/src/main/java/net/kyori/adventure/util/UTF8ResourceBundleControl.java
@@ -32,7 +32,7 @@
 import java.util.Locale;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A {@link ResourceBundle.Control} that enforces UTF-8 string encoding.
@@ -41,6 +41,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class UTF8ResourceBundleControl extends ResourceBundle.Control {
   private static final UTF8ResourceBundleControl INSTANCE = new UTF8ResourceBundleControl();
 
@@ -50,7 +51,7 @@ public final class UTF8ResourceBundleControl extends ResourceBundle.Control {
    * @return a resource bundle control
    * @since 4.0.0
    */
-  public static ResourceBundle.@NotNull Control get() {
+  public static ResourceBundle.Control get() {
     return INSTANCE;
   }
 
diff --git a/api/src/test/java/net/kyori/adventure/bossbar/BossBarTest.java b/api/src/test/java/net/kyori/adventure/bossbar/BossBarTest.java
index 33d2f978b2..8f996a7b04 100644
--- a/api/src/test/java/net/kyori/adventure/bossbar/BossBarTest.java
+++ b/api/src/test/java/net/kyori/adventure/bossbar/BossBarTest.java
@@ -30,13 +30,14 @@
 import java.util.concurrent.atomic.AtomicReference;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@NullMarked
 public class BossBarTest {
   private final AtomicInteger name = new AtomicInteger();
   private final AtomicInteger progress = new AtomicInteger();
@@ -45,27 +46,27 @@ public class BossBarTest {
   private final AtomicInteger flags = new AtomicInteger();
   private final BossBar.Listener listener = new BossBar.Listener() {
     @Override
-    public void bossBarNameChanged(final @NotNull BossBar bar, final @NotNull Component oldName, final @NotNull Component newName) {
+    public void bossBarNameChanged(final BossBar bar, final Component oldName, final Component newName) {
       BossBarTest.this.name.incrementAndGet();
     }
 
     @Override
-    public void bossBarProgressChanged(final @NotNull BossBar bar, final float oldProgress, final float newProgress) {
+    public void bossBarProgressChanged(final BossBar bar, final float oldProgress, final float newProgress) {
       BossBarTest.this.progress.incrementAndGet();
     }
 
     @Override
-    public void bossBarColorChanged(final @NotNull BossBar bar, final BossBar.@NotNull Color oldColor, final BossBar.@NotNull Color newColor) {
+    public void bossBarColorChanged(final BossBar bar, final BossBar.Color oldColor, final BossBar.Color newColor) {
       BossBarTest.this.color.incrementAndGet();
     }
 
     @Override
-    public void bossBarOverlayChanged(final @NotNull BossBar bar, final BossBar.@NotNull Overlay oldOverlay, final BossBar.@NotNull Overlay newOverlay) {
+    public void bossBarOverlayChanged(final BossBar bar, final BossBar.Overlay oldOverlay, final BossBar.Overlay newOverlay) {
       BossBarTest.this.overlay.incrementAndGet();
     }
 
     @Override
-    public void bossBarFlagsChanged(final @NotNull BossBar bar, final @NotNull Set<BossBar.Flag> oldFlags, final @NotNull Set<BossBar.Flag> newFlags) {
+    public void bossBarFlagsChanged(final BossBar bar, final Set<BossBar.Flag> oldFlags, final Set<BossBar.Flag> newFlags) {
       BossBarTest.this.flags.incrementAndGet();
     }
   };
@@ -229,7 +230,7 @@ static class Changes implements BossBar.Listener {
     final AtomicReference<Set<BossBar.Flag>> flagsRemoved = new AtomicReference<>(Collections.emptySet());
 
     @Override
-    public void bossBarFlagsChanged(final @NotNull BossBar bar, final @NotNull Set<BossBar.Flag> flagsAdded, final @NotNull Set<BossBar.Flag> flagsRemoved) {
+    public void bossBarFlagsChanged(final BossBar bar, final Set<BossBar.Flag> flagsAdded, final Set<BossBar.Flag> flagsRemoved) {
       this.flagsAdded.set(flagsAdded);
       this.flagsRemoved.set(flagsRemoved);
     }
diff --git a/api/src/test/java/net/kyori/adventure/text/JoinTest.java b/api/src/test/java/net/kyori/adventure/text/JoinTest.java
index 2a74f21107..b7ab63cacd 100644
--- a/api/src/test/java/net/kyori/adventure/text/JoinTest.java
+++ b/api/src/test/java/net/kyori/adventure/text/JoinTest.java
@@ -30,11 +30,12 @@
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@NullMarked
 class JoinTest {
   @Test
   void testJoin() {
@@ -389,7 +390,7 @@ final void testJoinWithRootStyleNoComponents() {
   private static final class TestComponentLike implements ComponentLike {
 
     @Override
-    public @NotNull Component asComponent() {
+    public Component asComponent() {
       return Component.text("FAIL");
     }
   }
diff --git a/api/src/test/java/net/kyori/adventure/text/flattener/ComponentFlattenerTest.java b/api/src/test/java/net/kyori/adventure/text/flattener/ComponentFlattenerTest.java
index 79300b918f..7c983c52fa 100644
--- a/api/src/test/java/net/kyori/adventure/text/flattener/ComponentFlattenerTest.java
+++ b/api/src/test/java/net/kyori/adventure/text/flattener/ComponentFlattenerTest.java
@@ -34,7 +34,7 @@
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -42,6 +42,7 @@
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@NullMarked
 class ComponentFlattenerTest {
 
   static class TrackingFlattener implements FlattenerListener {
@@ -51,18 +52,18 @@ static class TrackingFlattener implements FlattenerListener {
     final List<String> strings = new ArrayList<>();
 
     @Override
-    public void pushStyle(final @NotNull Style style) {
+    public void pushStyle(final Style style) {
       this.pushCount++;
       this.pushedStyles.add(style);
     }
 
     @Override
-    public void component(final @NotNull String text) {
+    public void component(final String text) {
       this.strings.add(text);
     }
 
     @Override
-    public void popStyle(final @NotNull Style style) {
+    public void popStyle(final Style style) {
       this.popCount++;
     }
 
diff --git a/api/src/test/java/net/kyori/adventure/translation/GlobalTranslatorTest.java b/api/src/test/java/net/kyori/adventure/translation/GlobalTranslatorTest.java
index 88cd92cf2b..322dcc34e4 100644
--- a/api/src/test/java/net/kyori/adventure/translation/GlobalTranslatorTest.java
+++ b/api/src/test/java/net/kyori/adventure/translation/GlobalTranslatorTest.java
@@ -29,8 +29,8 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TranslatableComponent;
 import net.kyori.adventure.text.format.NamedTextColor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -42,6 +42,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@NullMarked
 class GlobalTranslatorTest {
   @BeforeEach
   void removeDummySourceBeforeEachTest() {
@@ -50,7 +51,7 @@ void removeDummySourceBeforeEachTest() {
 
   @ParameterizedTest
   @ValueSource(strings = {"testDummy", "otherDummy"})
-  void testRender(final @NotNull String key) {
+  void testRender(final String key) {
     GlobalTranslator.translator().addSource(DummyTranslator.INSTANCE);
     assertEquals(
       Component.text()
@@ -107,19 +108,19 @@ static class DummyTranslator implements Translator {
     static final DummyTranslator INSTANCE = new DummyTranslator();
 
     @Override
-    public @NotNull Key name() {
+    public Key name() {
       return Key.key("adventure", "test_dummy");
     }
 
     @Override
-    public @Nullable MessageFormat translate(final @NotNull String key, final @NotNull Locale locale) {
+    public @Nullable MessageFormat translate(final String key, final Locale locale) {
       return (key.equals("testDummy") && locale.equals(Locale.US))
         ? new MessageFormat("Hello {0}!")
         : null;
     }
 
     @Override
-    public @Nullable Component translate(final @NotNull TranslatableComponent component, final @NotNull Locale locale) {
+    public @Nullable Component translate(final TranslatableComponent component, final Locale locale) {
       return (component.key().equals("otherDummy") && locale.equals(Locale.US))
         ? Component.text()
           .append(Component.text("Hello "))
diff --git a/api/src/test/java/net/kyori/adventure/util/ComponentMessageThrowableTest.java b/api/src/test/java/net/kyori/adventure/util/ComponentMessageThrowableTest.java
index fbbdf718e7..4d483f1140 100644
--- a/api/src/test/java/net/kyori/adventure/util/ComponentMessageThrowableTest.java
+++ b/api/src/test/java/net/kyori/adventure/util/ComponentMessageThrowableTest.java
@@ -24,7 +24,7 @@
 package net.kyori.adventure.util;
 
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/api/src/test/java/net/kyori/adventure/util/HSVLikeTest.java b/api/src/test/java/net/kyori/adventure/util/HSVLikeTest.java
index afc22e1497..4692e7fbdc 100644
--- a/api/src/test/java/net/kyori/adventure/util/HSVLikeTest.java
+++ b/api/src/test/java/net/kyori/adventure/util/HSVLikeTest.java
@@ -28,7 +28,7 @@
 import java.math.RoundingMode;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -36,6 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@NullMarked
 class HSVLikeTest {
   @Test
   void roundTripRgbHsvTest() {
@@ -50,7 +51,7 @@ void compareRgbToHsvConversionToJavaAwtColor() {
     NamedTextColor.NAMES.values().forEach(HSVLikeTest::assertRgbToHsvConversionRoughlyMatchesJavaAwtColor);
   }
 
-  private static void assertRgbToHsvConversionRoughlyMatchesJavaAwtColor(final @NotNull RGBLike rgb) {
+  private static void assertRgbToHsvConversionRoughlyMatchesJavaAwtColor(final RGBLike rgb) {
     final HSVLike hsv = rgb.asHSV();
     assertArrayEquals(
       roundFloats(Color.RGBtoHSB(rgb.red(), rgb.green(), rgb.blue(), null)),
@@ -59,7 +60,7 @@ private static void assertRgbToHsvConversionRoughlyMatchesJavaAwtColor(final @No
     );
   }
 
-  private static float[] roundFloats(final float @NotNull [] floats) {
+  private static float[] roundFloats(final float[] floats) {
     final float[] result = new float[floats.length];
     for (int i = 0; i < floats.length; i++) {
       result[i] = BigDecimal.valueOf(floats[i]).setScale(7, RoundingMode.UP).floatValue();
diff --git a/api/src/test/java/net/kyori/test/EqualityAssertions.java b/api/src/test/java/net/kyori/test/EqualityAssertions.java
index e9978a1f77..ef098f04ba 100644
--- a/api/src/test/java/net/kyori/test/EqualityAssertions.java
+++ b/api/src/test/java/net/kyori/test/EqualityAssertions.java
@@ -23,11 +23,12 @@
  */
 package net.kyori.test;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
+@NullMarked
 public final class EqualityAssertions {
 
   private EqualityAssertions() {
@@ -35,7 +36,7 @@ private EqualityAssertions() {
 
   //Covers all branches in the standard #equals and #hashcode used in this project
   @SafeVarargs
-  public static <T> void assertEqualityAndNonEquality(final @NotNull T value, final @NotNull T equalToValue, final @NotNull T@NotNull... notEqualToValue) {
+  public static <T> void assertEqualityAndNonEquality(final T value, final T equalToValue, final T... notEqualToValue) {
     assertEquals(value, value);
     assertEquals(value, equalToValue);
     assertNotEquals(value, null);
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 702a1562bf..c656474b16 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,7 @@ jmhPlugin = "0.7.1"
 junit = "5.10.0"
 slf4j = "2.0.1"
 truth = "1.1.5"
+jspecify = "0.3.0"
 
 [libraries]
 # shared
@@ -20,6 +21,7 @@ examination-string = { module = "net.kyori:examination-string", version.ref = "e
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = "guava" }
 jetbrainsAnnotations = "org.jetbrains:annotations:24.0.1"
+jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
 
 # extra-kotlin
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" }
diff --git a/key/build.gradle.kts b/key/build.gradle.kts
index 9c4fe94f16..a1fb2e088e 100644
--- a/key/build.gradle.kts
+++ b/key/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
   api(libs.examination.api)
   api(libs.examination.string)
   compileOnlyApi(libs.jetbrainsAnnotations)
+  compileOnlyApi(libs.jspecify)
   testImplementation(libs.guava)
 }
 
diff --git a/key/src/main/java/net/kyori/adventure/key/InvalidKeyException.java b/key/src/main/java/net/kyori/adventure/key/InvalidKeyException.java
index d250c770e6..5df59c17a1 100644
--- a/key/src/main/java/net/kyori/adventure/key/InvalidKeyException.java
+++ b/key/src/main/java/net/kyori/adventure/key/InvalidKeyException.java
@@ -23,20 +23,21 @@
  */
 package net.kyori.adventure.key;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * This exception is thrown when an invalid namespace and/or value has been detected while creating a {@link Key}.
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class InvalidKeyException extends RuntimeException {
   private static final long serialVersionUID = -5413304087321449434L;
   private final String keyNamespace;
   private final String keyValue;
 
-  InvalidKeyException(final @NotNull String keyNamespace, final @NotNull String keyValue, final @Nullable String message) {
+  InvalidKeyException(final String keyNamespace, final String keyValue, final @Nullable String message) {
     super(message);
     this.keyNamespace = keyNamespace;
     this.keyValue = keyValue;
@@ -48,7 +49,7 @@ public final class InvalidKeyException extends RuntimeException {
    * @return a key
    * @since 4.0.0
    */
-  public final @NotNull String keyNamespace() {
+  public final String keyNamespace() {
     return this.keyNamespace;
   }
 
@@ -58,7 +59,7 @@ public final class InvalidKeyException extends RuntimeException {
    * @return a key
    * @since 4.0.0
    */
-  public final @NotNull String keyValue() {
+  public final String keyValue() {
     return this.keyValue;
   }
 }
diff --git a/key/src/main/java/net/kyori/adventure/key/Key.java b/key/src/main/java/net/kyori/adventure/key/Key.java
index 24ecc81c47..f786a26279 100644
--- a/key/src/main/java/net/kyori/adventure/key/Key.java
+++ b/key/src/main/java/net/kyori/adventure/key/Key.java
@@ -28,8 +28,8 @@
 import java.util.stream.Stream;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * An identifying object used to fetch and/or store unique objects.
@@ -56,6 +56,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface Key extends Comparable<Key>, Examinable, Namespaced, Keyed {
   /**
    * The namespace for Minecraft.
@@ -84,7 +85,7 @@ public interface Key extends Comparable<Key>, Examinable, Namespaced, Keyed {
    * @throws InvalidKeyException if the namespace or value contains an invalid character
    * @since 4.0.0
    */
-  static @NotNull Key key(final @NotNull @KeyPattern String string) {
+  static Key key(final @KeyPattern String string) {
     return key(string, DEFAULT_SEPARATOR);
   }
 
@@ -104,7 +105,7 @@ public interface Key extends Comparable<Key>, Examinable, Namespaced, Keyed {
    * @since 4.0.0
    */
   @SuppressWarnings("PatternValidation") // impossible to validate since the character is variable
-  static @NotNull Key key(final @NotNull String string, final char character) {
+  static Key key(final String string, final char character) {
     final int index = string.indexOf(character);
     final String namespace = index >= 1 ? string.substring(0, index) : MINECRAFT_NAMESPACE;
     final String value = index >= 0 ? string.substring(index + 1) : string;
@@ -120,7 +121,7 @@ public interface Key extends Comparable<Key>, Examinable, Namespaced, Keyed {
    * @throws InvalidKeyException if the namespace or value contains an invalid character
    * @since 4.4.0
    */
-  static @NotNull Key key(final @NotNull Namespaced namespaced, final @NotNull @KeyPattern.Value String value) {
+  static Key key(final Namespaced namespaced, final @KeyPattern.Value String value) {
     return key(namespaced.namespace(), value);
   }
 
@@ -133,7 +134,7 @@ public interface Key extends Comparable<Key>, Examinable, Namespaced, Keyed {
    * @throws InvalidKeyException if the namespace or value contains an invalid character
    * @since 4.0.0
    */
-  static @NotNull Key key(final @NotNull @KeyPattern.Namespace String namespace, final @NotNull @KeyPattern.Value String value) {
+  static Key key(final @KeyPattern.Namespace String namespace, final @KeyPattern.Value String value) {
     return new KeyImpl(namespace, value);
   }
 
@@ -145,7 +146,7 @@ public interface Key extends Comparable<Key>, Examinable, Namespaced, Keyed {
    * @return a comparator for keys
    * @since 4.10.0
    */
-  static @NotNull Comparator<? super Key> comparator() {
+  static Comparator<? super Key> comparator() {
     return KeyImpl.COMPARATOR;
   }
 
@@ -173,7 +174,7 @@ static boolean parseable(final @Nullable String string) {
    * @return {@code true} if {@code value} is a valid namespace, {@code false} otherwise
    * @since 4.12.0
    */
-  static boolean parseableNamespace(final @NotNull String namespace) {
+  static boolean parseableNamespace(final String namespace) {
     return !checkNamespace(namespace).isPresent();
   }
 
@@ -184,7 +185,7 @@ static boolean parseableNamespace(final @NotNull String namespace) {
    * @return {@link OptionalInt#empty()} if {@code value} is a valid namespace, otherwise an {@code OptionalInt} containing the index of an invalid character
    * @since 4.14.0
    */
-  static @NotNull OptionalInt checkNamespace(final @NotNull String namespace) {
+  static OptionalInt checkNamespace(final String namespace) {
     for (int i = 0, length = namespace.length(); i < length; i++) {
       if (!allowedInNamespace(namespace.charAt(i))) {
         return OptionalInt.of(i);
@@ -200,7 +201,7 @@ static boolean parseableNamespace(final @NotNull String namespace) {
    * @return {@code true} if {@code value} is a valid value, {@code false} otherwise
    * @since 4.12.0
    */
-  static boolean parseableValue(final @NotNull String value) {
+  static boolean parseableValue(final String value) {
     return !checkValue(value).isPresent();
   }
 
@@ -211,7 +212,7 @@ static boolean parseableValue(final @NotNull String value) {
    * @return {@link OptionalInt#empty()} if {@code value} is a valid value, otherwise an {@code OptionalInt} containing the index of an invalid character
    * @since 4.14.0
    */
-  static @NotNull OptionalInt checkValue(final @NotNull String value) {
+  static OptionalInt checkValue(final String value) {
     for (int i = 0, length = value.length(); i < length; i++) {
       if (!allowedInValue(value.charAt(i))) {
         return OptionalInt.of(i);
@@ -249,7 +250,7 @@ static boolean allowedInValue(final char character) {
    * @since 4.0.0
    */
   @Override
-  @NotNull @KeyPattern.Namespace String namespace();
+  @KeyPattern.Namespace String namespace();
 
   /**
    * Gets the value.
@@ -257,7 +258,7 @@ static boolean allowedInValue(final char character) {
    * @return the value
    * @since 4.0.0
    */
-  @NotNull @KeyPattern.Value String value();
+  @KeyPattern.Value String value();
 
   /**
    * Returns the string representation of this key.
@@ -265,7 +266,7 @@ static boolean allowedInValue(final char character) {
    * @return the string representation
    * @since 4.0.0
    */
-  @NotNull String asString();
+  String asString();
 
   /**
    * Returns the string representation of this key in minimal form.
@@ -275,7 +276,7 @@ static boolean allowedInValue(final char character) {
    * @return the string representation
    * @since 4.15.0
    */
-  default @NotNull String asMinimalString() {
+  default String asMinimalString() {
     if (this.namespace().equals(MINECRAFT_NAMESPACE)) {
       return this.value();
     }
@@ -283,7 +284,7 @@ static boolean allowedInValue(final char character) {
   }
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("namespace", this.namespace()),
       ExaminableProperty.of("value", this.value())
@@ -291,12 +292,12 @@ static boolean allowedInValue(final char character) {
   }
 
   @Override
-  default int compareTo(final @NotNull Key that) {
+  default int compareTo(final Key that) {
     return comparator().compare(this, that);
   }
 
   @Override
-  default @NotNull Key key() {
+  default Key key() {
     return this;
   }
 }
diff --git a/key/src/main/java/net/kyori/adventure/key/KeyImpl.java b/key/src/main/java/net/kyori/adventure/key/KeyImpl.java
index 70be29e09b..3afecde3ff 100644
--- a/key/src/main/java/net/kyori/adventure/key/KeyImpl.java
+++ b/key/src/main/java/net/kyori/adventure/key/KeyImpl.java
@@ -31,10 +31,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.intellij.lang.annotations.RegExp;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class KeyImpl implements Key {
   static final Comparator<? super Key> COMPARATOR = Comparator.comparing(Key::value).thenComparing(Key::namespace);
 
@@ -44,7 +45,7 @@ final class KeyImpl implements Key {
   private final String namespace;
   private final String value;
 
-  KeyImpl(final @NotNull String namespace, final @NotNull String value) {
+  KeyImpl(final String namespace, final String value) {
     checkError("namespace", namespace, value, Key.checkNamespace(namespace));
     checkError("value", namespace, value, Key.checkValue(value));
     this.namespace = requireNonNull(namespace, "namespace");
@@ -75,31 +76,31 @@ static boolean allowedInValue(final char character) {
   }
 
   @Override
-  public @NotNull String namespace() {
+  public String namespace() {
     return this.namespace;
   }
 
   @Override
-  public @NotNull String value() {
+  public String value() {
     return this.value;
   }
 
   @Override
-  public @NotNull String asString() {
+  public String asString() {
     return asString(this.namespace, this.value);
   }
 
-  private static @NotNull String asString(final @NotNull String namespace, final @NotNull String value) {
+  private static String asString(final String namespace, final String value) {
     return namespace + ':' + value;
   }
 
   @Override
-  public @NotNull String toString() {
+  public String toString() {
     return this.asString();
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("namespace", this.namespace),
       ExaminableProperty.of("value", this.value)
@@ -122,7 +123,7 @@ public int hashCode() {
   }
 
   @Override
-  public int compareTo(final @NotNull Key that) {
+  public int compareTo(final Key that) {
     return Key.super.compareTo(that);
   }
 }
diff --git a/key/src/main/java/net/kyori/adventure/key/Keyed.java b/key/src/main/java/net/kyori/adventure/key/Keyed.java
index e68f85cf16..ef1737fbc4 100644
--- a/key/src/main/java/net/kyori/adventure/key/Keyed.java
+++ b/key/src/main/java/net/kyori/adventure/key/Keyed.java
@@ -23,13 +23,14 @@
  */
 package net.kyori.adventure.key;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that has an associated {@link Key}.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface Keyed {
   /**
    * Gets the key.
@@ -37,5 +38,5 @@ public interface Keyed {
    * @return the key
    * @since 4.0.0
    */
-  @NotNull Key key();
+  Key key();
 }
diff --git a/key/src/main/java/net/kyori/adventure/key/KeyedValue.java b/key/src/main/java/net/kyori/adventure/key/KeyedValue.java
index 158a4b9d5d..9ac5044615 100644
--- a/key/src/main/java/net/kyori/adventure/key/KeyedValue.java
+++ b/key/src/main/java/net/kyori/adventure/key/KeyedValue.java
@@ -24,7 +24,7 @@
 package net.kyori.adventure.key;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
@@ -34,6 +34,7 @@
  * @param <T> the value type
  * @since 4.0.0
  */
+@NullMarked
 public interface KeyedValue<T> extends Keyed {
   /**
    * Creates a link.
@@ -44,7 +45,7 @@ public interface KeyedValue<T> extends Keyed {
    * @return the keyed
    * @since 4.10.0
    */
-  static <T> @NotNull KeyedValue<T> keyedValue(final @NotNull Key key, final @NotNull T value) {
+  static <T> KeyedValue<T> keyedValue(final Key key, final T value) {
     return new KeyedValueImpl<>(key, requireNonNull(value, "value"));
   }
 
@@ -60,7 +61,7 @@ public interface KeyedValue<T> extends Keyed {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static <T> @NotNull KeyedValue<T> of(final @NotNull Key key, final @NotNull T value) {
+  static <T> KeyedValue<T> of(final Key key, final T value) {
     return new KeyedValueImpl<>(key, requireNonNull(value, "value"));
   }
 
@@ -70,5 +71,5 @@ public interface KeyedValue<T> extends Keyed {
    * @return the value
    * @since 4.0.0
    */
-  @NotNull T value();
+  T value();
 }
diff --git a/key/src/main/java/net/kyori/adventure/key/KeyedValueImpl.java b/key/src/main/java/net/kyori/adventure/key/KeyedValueImpl.java
index 92d5849904..f7e0a72a69 100644
--- a/key/src/main/java/net/kyori/adventure/key/KeyedValueImpl.java
+++ b/key/src/main/java/net/kyori/adventure/key/KeyedValueImpl.java
@@ -27,9 +27,10 @@
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
 import net.kyori.examination.string.StringExaminer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class KeyedValueImpl<T> implements Examinable, KeyedValue<T> {
   private final Key key;
   private final T value;
@@ -40,12 +41,12 @@ final class KeyedValueImpl<T> implements Examinable, KeyedValue<T> {
   }
 
   @Override
-  public @NotNull Key key() {
+  public Key key() {
     return this.key;
   }
 
   @Override
-  public @NotNull T value() {
+  public T value() {
     return this.value;
   }
 
@@ -65,7 +66,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("key", this.key),
       ExaminableProperty.of("value", this.value)
diff --git a/key/src/main/java/net/kyori/adventure/key/Namespaced.java b/key/src/main/java/net/kyori/adventure/key/Namespaced.java
index 5b5affe8cf..a929c6e4f9 100644
--- a/key/src/main/java/net/kyori/adventure/key/Namespaced.java
+++ b/key/src/main/java/net/kyori/adventure/key/Namespaced.java
@@ -23,13 +23,14 @@
  */
 package net.kyori.adventure.key;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that has a namespace.
  *
  * @since 4.4.0
  */
+@NullMarked
 public interface Namespaced {
   /**
    * Gets the namespace.
@@ -37,5 +38,5 @@ public interface Namespaced {
    * @return the namespace
    * @since 4.4.0
    */
-  @NotNull @KeyPattern.Namespace String namespace();
+  @KeyPattern.Namespace String namespace();
 }
diff --git a/nbt/build.gradle.kts b/nbt/build.gradle.kts
index 4de83c6f69..f7e2a7b7c1 100644
--- a/nbt/build.gradle.kts
+++ b/nbt/build.gradle.kts
@@ -6,6 +6,7 @@ dependencies {
   api(libs.examination.api)
   api(libs.examination.string)
   compileOnlyApi(libs.jetbrainsAnnotations)
+  compileOnlyApi(libs.jspecify)
 }
 
 applyJarMetadata("net.kyori.adventure.nbt")
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/AbstractBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/AbstractBinaryTag.java
index c0e8772bd0..9ff606deaf 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/AbstractBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/AbstractBinaryTag.java
@@ -24,11 +24,12 @@
 package net.kyori.adventure.nbt;
 
 import net.kyori.examination.string.StringExaminer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 abstract class AbstractBinaryTag implements BinaryTag {
   @Override
-  public final @NotNull String examinableName() {
+  public final String examinableName() {
     return this.type().toString();
   }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ArrayBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/ArrayBinaryTag.java
index 733767868d..b79e2ba234 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ArrayBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ArrayBinaryTag.java
@@ -23,14 +23,15 @@
  */
 package net.kyori.adventure.nbt;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An array binary tag.
  *
  * @since 4.2.0
  */
+@NullMarked
 public interface ArrayBinaryTag extends BinaryTag {
   @Override
-  @NotNull BinaryTagType<? extends ArrayBinaryTag> type();
+  BinaryTagType<? extends ArrayBinaryTag> type();
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTag.java
index a92ac1d8d9..b675bbe970 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import net.kyori.examination.Examinable;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface BinaryTag extends BinaryTagLike, Examinable {
   /**
    * Gets the tag type.
@@ -38,10 +39,10 @@ public interface BinaryTag extends BinaryTagLike, Examinable {
    * @return the tag type
    * @since 4.0.0
    */
-  @NotNull BinaryTagType<? extends BinaryTag> type();
+  BinaryTagType<? extends BinaryTag> type();
 
   @Override
-  default @NotNull BinaryTag asBinaryTag() {
+  default BinaryTag asBinaryTag() {
     return this;
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagIO.java b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagIO.java
index 1da8dec373..584c51dc5c 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagIO.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagIO.java
@@ -34,13 +34,14 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 import java.util.zip.InflaterInputStream;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Serialization operations for binary tags.
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class BinaryTagIO {
   private BinaryTagIO() {
   }
@@ -57,7 +58,7 @@ private BinaryTagIO() {
    * @return binary tag reader
    * @since 4.4.0
    */
-  public static @NotNull Reader unlimitedReader() {
+  public static Reader unlimitedReader() {
     return BinaryTagReaderImpl.UNLIMITED;
   }
 
@@ -69,7 +70,7 @@ private BinaryTagIO() {
    * @return binary tag reader
    * @since 4.4.0
    */
-  public static @NotNull Reader reader() {
+  public static Reader reader() {
     return BinaryTagReaderImpl.DEFAULT_LIMIT;
   }
 
@@ -82,7 +83,7 @@ private BinaryTagIO() {
    * @return binary tag reader
    * @since 4.4.0
    */
-  public static @NotNull Reader reader(final long sizeLimitBytes) {
+  public static Reader reader(final long sizeLimitBytes) {
     if (sizeLimitBytes <= 0) {
       throw new IllegalArgumentException("The size limit must be greater than zero");
     }
@@ -95,7 +96,7 @@ private BinaryTagIO() {
    * @return binary tag writer
    * @since 4.4.0
    */
-  public static @NotNull Writer writer() {
+  public static Writer writer() {
     return BinaryTagWriterImpl.INSTANCE;
   }
 
@@ -109,7 +110,7 @@ private BinaryTagIO() {
    * @deprecated since 4.4.0, use {@link #reader()}
    */
   @Deprecated
-  public static @NotNull CompoundBinaryTag readPath(final @NotNull Path path) throws IOException {
+  public static CompoundBinaryTag readPath(final Path path) throws IOException {
     return reader().read(path);
   }
 
@@ -123,7 +124,7 @@ private BinaryTagIO() {
    * @deprecated since 4.4.0, use {@link #reader()}
    */
   @Deprecated
-  public static @NotNull CompoundBinaryTag readInputStream(final @NotNull InputStream input) throws IOException {
+  public static CompoundBinaryTag readInputStream(final InputStream input) throws IOException {
     return reader().read(input);
   }
 
@@ -137,7 +138,7 @@ private BinaryTagIO() {
    * @deprecated since 4.4.0, use {@link #reader()}
    */
   @Deprecated
-  public static @NotNull CompoundBinaryTag readCompressedPath(final @NotNull Path path) throws IOException {
+  public static CompoundBinaryTag readCompressedPath(final Path path) throws IOException {
     return reader().read(path, Compression.GZIP);
   }
 
@@ -151,7 +152,7 @@ private BinaryTagIO() {
    * @deprecated since 4.4.0, use {@link #reader()}
    */
   @Deprecated
-  public static @NotNull CompoundBinaryTag readCompressedInputStream(final @NotNull InputStream input) throws IOException {
+  public static CompoundBinaryTag readCompressedInputStream(final InputStream input) throws IOException {
     return reader().read(input, Compression.GZIP);
   }
 
@@ -165,7 +166,7 @@ private BinaryTagIO() {
    * @deprecated since 4.4.0, use {@link #reader()}
    */
   @Deprecated
-  public static @NotNull CompoundBinaryTag readDataInput(final @NotNull DataInput input) throws IOException {
+  public static CompoundBinaryTag readDataInput(final DataInput input) throws IOException {
     return reader().read(input);
   }
 
@@ -179,7 +180,7 @@ private BinaryTagIO() {
    * @deprecated since 4.4.0, use {@link #writer()}
    */
   @Deprecated
-  public static void writePath(final @NotNull CompoundBinaryTag tag, final @NotNull Path path) throws IOException {
+  public static void writePath(final CompoundBinaryTag tag, final Path path) throws IOException {
     writer().write(tag, path);
   }
 
@@ -193,7 +194,7 @@ public static void writePath(final @NotNull CompoundBinaryTag tag, final @NotNul
    * @deprecated since 4.4.0, use {@link #writer()}
    */
   @Deprecated
-  public static void writeOutputStream(final @NotNull CompoundBinaryTag tag, final @NotNull OutputStream output) throws IOException {
+  public static void writeOutputStream(final CompoundBinaryTag tag, final OutputStream output) throws IOException {
     writer().write(tag, output);
   }
 
@@ -207,7 +208,7 @@ public static void writeOutputStream(final @NotNull CompoundBinaryTag tag, final
    * @deprecated since 4.4.0, use {@link #writer()}
    */
   @Deprecated
-  public static void writeCompressedPath(final @NotNull CompoundBinaryTag tag, final @NotNull Path path) throws IOException {
+  public static void writeCompressedPath(final CompoundBinaryTag tag, final Path path) throws IOException {
     writer().write(tag, path, Compression.GZIP);
   }
 
@@ -221,7 +222,7 @@ public static void writeCompressedPath(final @NotNull CompoundBinaryTag tag, fin
    * @deprecated since 4.4.0, use {@link #writer()}
    */
   @Deprecated
-  public static void writeCompressedOutputStream(final @NotNull CompoundBinaryTag tag, final @NotNull OutputStream output) throws IOException {
+  public static void writeCompressedOutputStream(final CompoundBinaryTag tag, final OutputStream output) throws IOException {
     writer().write(tag, output, Compression.GZIP);
   }
 
@@ -235,7 +236,7 @@ public static void writeCompressedOutputStream(final @NotNull CompoundBinaryTag
    * @deprecated since 4.4.0, use {@link #writer()}
    */
   @Deprecated
-  public static void writeDataOutput(final @NotNull CompoundBinaryTag tag, final @NotNull DataOutput output) throws IOException {
+  public static void writeDataOutput(final CompoundBinaryTag tag, final DataOutput output) throws IOException {
     writer().write(tag, output);
   }
 
@@ -255,7 +256,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    default @NotNull CompoundBinaryTag read(final @NotNull Path path) throws IOException {
+    default CompoundBinaryTag read(final Path path) throws IOException {
       return this.read(path, Compression.NONE);
     }
 
@@ -268,7 +269,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    @NotNull CompoundBinaryTag read(final @NotNull Path path, final @NotNull Compression compression) throws IOException;
+    CompoundBinaryTag read(final Path path, final Compression compression) throws IOException;
 
     /**
      * Reads a binary tag from {@code input}.
@@ -280,7 +281,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    default @NotNull CompoundBinaryTag read(final @NotNull InputStream input) throws IOException {
+    default CompoundBinaryTag read(final InputStream input) throws IOException {
       return this.read(input, Compression.NONE);
     }
 
@@ -293,7 +294,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    @NotNull CompoundBinaryTag read(final @NotNull InputStream input, final @NotNull Compression compression) throws IOException;
+    CompoundBinaryTag read(final InputStream input, final Compression compression) throws IOException;
 
     /**
      * Reads a binary tag from {@code input}.
@@ -303,7 +304,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    @NotNull CompoundBinaryTag read(final @NotNull DataInput input) throws IOException;
+    CompoundBinaryTag read(final DataInput input) throws IOException;
 
     /**
      * Reads a binary tag, with a name, from {@code path}.
@@ -315,7 +316,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    default Map.@NotNull Entry<String, CompoundBinaryTag> readNamed(final @NotNull Path path) throws IOException {
+    default Map.Entry<String, CompoundBinaryTag> readNamed(final Path path) throws IOException {
       return this.readNamed(path, Compression.NONE);
     }
 
@@ -328,7 +329,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    Map.@NotNull Entry<String, CompoundBinaryTag> readNamed(final @NotNull Path path, final @NotNull Compression compression) throws IOException;
+    Map.Entry<String, CompoundBinaryTag> readNamed(final Path path, final Compression compression) throws IOException;
 
     /**
      * Reads a binary tag, with a name, from {@code input}.
@@ -340,7 +341,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    default Map.@NotNull Entry<String, CompoundBinaryTag> readNamed(final @NotNull InputStream input) throws IOException {
+    default Map.Entry<String, CompoundBinaryTag> readNamed(final InputStream input) throws IOException {
       return this.readNamed(input, Compression.NONE);
     }
 
@@ -353,7 +354,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    Map.@NotNull Entry<String, CompoundBinaryTag> readNamed(final @NotNull InputStream input, final @NotNull Compression compression) throws IOException;
+    Map.Entry<String, CompoundBinaryTag> readNamed(final InputStream input, final Compression compression) throws IOException;
 
     /**
      * Reads a binary tag, with a name, from {@code input}.
@@ -363,7 +364,7 @@ public interface Reader {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    Map.@NotNull Entry<String, CompoundBinaryTag> readNamed(final @NotNull DataInput input) throws IOException;
+    Map.Entry<String, CompoundBinaryTag> readNamed(final DataInput input) throws IOException;
   }
 
   /**
@@ -382,7 +383,7 @@ public interface Writer {
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    default void write(final @NotNull CompoundBinaryTag tag, final @NotNull Path path) throws IOException {
+    default void write(final CompoundBinaryTag tag, final Path path) throws IOException {
       this.write(tag, path, Compression.NONE);
     }
 
@@ -395,7 +396,7 @@ default void write(final @NotNull CompoundBinaryTag tag, final @NotNull Path pat
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    void write(final @NotNull CompoundBinaryTag tag, final @NotNull Path path, final @NotNull Compression compression) throws IOException;
+    void write(final CompoundBinaryTag tag, final Path path, final Compression compression) throws IOException;
 
     /**
      * Writes a binary tag to {@code output}.
@@ -407,7 +408,7 @@ default void write(final @NotNull CompoundBinaryTag tag, final @NotNull Path pat
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    default void write(final @NotNull CompoundBinaryTag tag, final @NotNull OutputStream output) throws IOException {
+    default void write(final CompoundBinaryTag tag, final OutputStream output) throws IOException {
       this.write(tag, output, Compression.NONE);
     }
 
@@ -420,7 +421,7 @@ default void write(final @NotNull CompoundBinaryTag tag, final @NotNull OutputSt
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    void write(final @NotNull CompoundBinaryTag tag, final @NotNull OutputStream output, final @NotNull Compression compression) throws IOException;
+    void write(final CompoundBinaryTag tag, final OutputStream output, final Compression compression) throws IOException;
 
     /**
      * Writes a binary tag to {@code output}.
@@ -430,7 +431,7 @@ default void write(final @NotNull CompoundBinaryTag tag, final @NotNull OutputSt
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    void write(final @NotNull CompoundBinaryTag tag, final @NotNull DataOutput output) throws IOException;
+    void write(final CompoundBinaryTag tag, final DataOutput output) throws IOException;
 
     /**
      * Writes a binary tag, with a name, to {@code path}.
@@ -442,7 +443,7 @@ default void write(final @NotNull CompoundBinaryTag tag, final @NotNull OutputSt
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    default void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag, final @NotNull Path path) throws IOException {
+    default void writeNamed(final Map.Entry<String, CompoundBinaryTag> tag, final Path path) throws IOException {
       this.writeNamed(tag, path, Compression.NONE);
     }
 
@@ -455,7 +456,7 @@ default void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag,
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag, final @NotNull Path path, final @NotNull Compression compression) throws IOException;
+    void writeNamed(final Map.Entry<String, CompoundBinaryTag> tag, final Path path, final Compression compression) throws IOException;
 
     /**
      * Writes a binary tag, with a name, to {@code output}.
@@ -467,7 +468,7 @@ default void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag,
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    default void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag, final @NotNull OutputStream output) throws IOException {
+    default void writeNamed(final Map.Entry<String, CompoundBinaryTag> tag, final OutputStream output) throws IOException {
       this.writeNamed(tag, output, Compression.NONE);
     }
 
@@ -480,7 +481,7 @@ default void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag,
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag, final @NotNull OutputStream output, final @NotNull Compression compression) throws IOException;
+    void writeNamed(final Map.Entry<String, CompoundBinaryTag> tag, final OutputStream output, final Compression compression) throws IOException;
 
     /**
      * Writes a binary tag, with a name, to {@code output}.
@@ -490,7 +491,7 @@ default void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag,
      * @throws IOException if an exception was encountered while reading the tag
      * @since 4.4.0
      */
-    void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag, final @NotNull DataOutput output) throws IOException;
+    void writeNamed(final Map.Entry<String, CompoundBinaryTag> tag, final DataOutput output) throws IOException;
   }
 
   /**
@@ -506,12 +507,12 @@ public static abstract class Compression {
      */
     public static final Compression NONE = new Compression() {
       @Override
-      @NotNull InputStream decompress(final @NotNull InputStream is) {
+      InputStream decompress(final InputStream is) {
         return is;
       }
 
       @Override
-      @NotNull OutputStream compress(final @NotNull OutputStream os) {
+      OutputStream compress(final OutputStream os) {
         return os;
       }
 
@@ -527,12 +528,12 @@ public String toString() {
      */
     public static final Compression GZIP = new Compression() {
       @Override
-      @NotNull InputStream decompress(final @NotNull InputStream is) throws IOException {
+      InputStream decompress(final InputStream is) throws IOException {
         return new GZIPInputStream(is);
       }
 
       @Override
-      @NotNull OutputStream compress(final @NotNull OutputStream os) throws IOException {
+      OutputStream compress(final OutputStream os) throws IOException {
         return new GZIPOutputStream(os);
       }
 
@@ -548,12 +549,12 @@ public String toString() {
      */
     public static final Compression ZLIB = new Compression() {
       @Override
-      @NotNull InputStream decompress(final @NotNull InputStream is) {
+      InputStream decompress(final InputStream is) {
         return new InflaterInputStream(is);
       }
 
       @Override
-      @NotNull OutputStream compress(final @NotNull OutputStream os) {
+      OutputStream compress(final OutputStream os) {
         return new DeflaterOutputStream(os);
       }
 
@@ -563,8 +564,8 @@ public String toString() {
       }
     };
 
-    abstract @NotNull InputStream decompress(final @NotNull InputStream is) throws IOException;
+    abstract InputStream decompress(final InputStream is) throws IOException;
 
-    abstract @NotNull OutputStream compress(final @NotNull OutputStream os) throws IOException;
+    abstract OutputStream compress(final OutputStream os) throws IOException;
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagLike.java b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagLike.java
index 95506e4f90..d04ab1a627 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagLike.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagLike.java
@@ -23,13 +23,14 @@
  */
 package net.kyori.adventure.nbt;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that can be represented as a binary tag.
  *
  * @since 4.4.0
  */
+@NullMarked
 public interface BinaryTagLike {
   /**
    * Gets a {@link BinaryTag} representation.
@@ -37,5 +38,5 @@ public interface BinaryTagLike {
    * @return a binary tag
    * @since 4.4.0
    */
-  @NotNull BinaryTag asBinaryTag();
+  BinaryTag asBinaryTag();
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagReaderImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagReaderImpl.java
index 3e93441dda..625f67ffac 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagReaderImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagReaderImpl.java
@@ -32,11 +32,12 @@
 import java.nio.file.Path;
 import java.util.AbstractMap;
 import java.util.Map;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static net.kyori.adventure.nbt.IOStreamUtil.closeShield;
 
 @SuppressWarnings("DuplicatedCode")
+@NullMarked
 final class BinaryTagReaderImpl implements BinaryTagIO.Reader {
   private final long maxBytes;
   static final BinaryTagIO.Reader UNLIMITED = new BinaryTagReaderImpl(-1L);
@@ -47,21 +48,21 @@ final class BinaryTagReaderImpl implements BinaryTagIO.Reader {
   }
 
   @Override
-  public @NotNull CompoundBinaryTag read(final @NotNull Path path, final BinaryTagIO.@NotNull Compression compression) throws IOException {
+  public CompoundBinaryTag read(final Path path, final BinaryTagIO.Compression compression) throws IOException {
     try (final InputStream is = Files.newInputStream(path)) {
       return this.read(is, compression);
     }
   }
 
   @Override
-  public @NotNull CompoundBinaryTag read(final @NotNull InputStream input, final BinaryTagIO.@NotNull Compression compression) throws IOException {
+  public CompoundBinaryTag read(final InputStream input, final BinaryTagIO.Compression compression) throws IOException {
     try (final DataInputStream dis = new DataInputStream(new BufferedInputStream(compression.decompress(closeShield(input))))) {
       return this.read((DataInput) dis);
     }
   }
 
   @Override
-  public @NotNull CompoundBinaryTag read(@NotNull DataInput input) throws IOException {
+  public CompoundBinaryTag read(DataInput input) throws IOException {
     if (!(input instanceof TrackingDataInput)) {
       input = new TrackingDataInput(input, this.maxBytes);
     }
@@ -73,21 +74,21 @@ final class BinaryTagReaderImpl implements BinaryTagIO.Reader {
   }
 
   @Override
-  public Map.@NotNull Entry<String, CompoundBinaryTag> readNamed(final @NotNull Path path, final BinaryTagIO.@NotNull Compression compression) throws IOException {
+  public Map.Entry<String, CompoundBinaryTag> readNamed(final Path path, final BinaryTagIO.Compression compression) throws IOException {
     try (final InputStream is = Files.newInputStream(path)) {
       return this.readNamed(is, compression);
     }
   }
 
   @Override
-  public Map.@NotNull Entry<String, CompoundBinaryTag> readNamed(final @NotNull InputStream input, final BinaryTagIO.@NotNull Compression compression) throws IOException {
+  public Map.Entry<String, CompoundBinaryTag> readNamed(final InputStream input, final BinaryTagIO.Compression compression) throws IOException {
     try (final DataInputStream dis = new DataInputStream(new BufferedInputStream(compression.decompress(closeShield(input))))) {
       return this.readNamed((DataInput) dis);
     }
   }
 
   @Override
-  public Map.@NotNull Entry<String, CompoundBinaryTag> readNamed(final @NotNull DataInput input) throws IOException {
+  public Map.Entry<String, CompoundBinaryTag> readNamed(final DataInput input) throws IOException {
     final BinaryTagType<? extends BinaryTag> type = BinaryTagType.binaryTagType(input.readByte());
     requireCompound(type);
     final String name = input.readUTF();
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagType.java b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagType.java
index f33c33a280..dd80b8cb2b 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagType.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagType.java
@@ -30,8 +30,8 @@
 import java.util.List;
 import java.util.function.Predicate;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A binary tag type.
@@ -39,6 +39,7 @@
  * @param <T> the tag type
  * @since 4.0.0
  */
+@NullMarked
 public abstract class BinaryTagType<T extends BinaryTag> implements Predicate<BinaryTagType<? extends BinaryTag>> {
   private static final List<BinaryTagType<? extends BinaryTag>> TYPES = new ArrayList<>();
 
@@ -60,7 +61,7 @@ public abstract class BinaryTagType<T extends BinaryTag> implements Predicate<Bi
    * @throws IOException if an exception was encountered while reading
    * @since 4.0.0
    */
-  public abstract @NotNull T read(final @NotNull DataInput input) throws IOException;
+  public abstract T read(final DataInput input) throws IOException;
 
   /**
    * Writes a tag.
@@ -70,14 +71,14 @@ public abstract class BinaryTagType<T extends BinaryTag> implements Predicate<Bi
    * @throws IOException if an exception was encountered while writing
    * @since 4.0.0
    */
-  public abstract void write(final @NotNull T tag, final @NotNull DataOutput output) throws IOException;
+  public abstract void write(final T tag, final DataOutput output) throws IOException;
 
   @SuppressWarnings("unchecked") // HACK: generics suck
   static <T extends BinaryTag> void writeUntyped(final BinaryTagType<? extends BinaryTag> type, final T tag, final DataOutput output) throws IOException {
     ((BinaryTagType<T>) type).write(tag, output);
   }
 
-  static @NotNull BinaryTagType<? extends BinaryTag> binaryTagType(final byte id) {
+  static BinaryTagType<? extends BinaryTag> binaryTagType(final byte id) {
     for (int i = 0; i < TYPES.size(); i++) {
       final BinaryTagType<? extends BinaryTag> type = TYPES.get(i);
       if (type.id() == id) {
@@ -89,15 +90,15 @@ static <T extends BinaryTag> void writeUntyped(final BinaryTagType<? extends Bin
 
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull BinaryTagType<? extends BinaryTag> of(final byte id) {
+  static BinaryTagType<? extends BinaryTag> of(final byte id) {
     return binaryTagType(id);
   }
 
-  static <T extends BinaryTag> @NotNull BinaryTagType<T> register(final Class<T> type, final byte id, final Reader<T> reader, final @Nullable Writer<T> writer) {
+  static <T extends BinaryTag> BinaryTagType<T> register(final Class<T> type, final byte id, final Reader<T> reader, final @Nullable Writer<T> writer) {
     return register(new Impl<>(type, id, reader, writer));
   }
 
-  static <T extends NumberBinaryTag> @NotNull BinaryTagType<T> registerNumeric(final Class<T> type, final byte id, final Reader<T> reader, final Writer<T> writer) {
+  static <T extends NumberBinaryTag> BinaryTagType<T> registerNumeric(final Class<T> type, final byte id, final Reader<T> reader, final Writer<T> writer) {
     return register(new Impl.Numeric<>(type, id, reader, writer));
   }
 
@@ -112,7 +113,7 @@ private static <T extends BinaryTag, Y extends BinaryTagType<T>> Y register(fina
    * @param <T> the tag type
    */
   interface Reader<T extends BinaryTag> {
-    @NotNull T read(final @NotNull DataInput input) throws IOException;
+    T read(final DataInput input) throws IOException;
   }
 
   /**
@@ -121,7 +122,7 @@ interface Reader<T extends BinaryTag> {
    * @param <T> the tag type
    */
   interface Writer<T extends BinaryTag> {
-    void write(final @NotNull T tag, final @NotNull DataOutput output) throws IOException;
+    void write(final T tag, final DataOutput output) throws IOException;
   }
 
   @Override
@@ -143,12 +144,12 @@ static class Impl<T extends BinaryTag> extends BinaryTagType<T> {
     }
 
     @Override
-    public final @NotNull T read(final @NotNull DataInput input) throws IOException {
+    public final T read(final DataInput input) throws IOException {
       return this.reader.read(input);
     }
 
     @Override
-    public final void write(final @NotNull T tag, final @NotNull DataOutput output) throws IOException {
+    public final void write(final T tag, final DataOutput output) throws IOException {
       if (this.writer != null) this.writer.write(tag, output);
     }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagWriterImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagWriterImpl.java
index b01c09ab5b..5574c32282 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagWriterImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/BinaryTagWriterImpl.java
@@ -31,50 +31,51 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static net.kyori.adventure.nbt.IOStreamUtil.closeShield;
 
+@NullMarked
 final class BinaryTagWriterImpl implements BinaryTagIO.Writer {
   static final BinaryTagIO.Writer INSTANCE = new BinaryTagWriterImpl();
 
   @Override
-  public void write(final @NotNull CompoundBinaryTag tag, final @NotNull Path path, final BinaryTagIO.@NotNull Compression compression) throws IOException {
+  public void write(final CompoundBinaryTag tag, final Path path, final BinaryTagIO.Compression compression) throws IOException {
     try (final OutputStream os = Files.newOutputStream(path)) {
       this.write(tag, os, compression);
     }
   }
 
   @Override
-  public void write(final @NotNull CompoundBinaryTag tag, final @NotNull OutputStream output, final BinaryTagIO.@NotNull Compression compression) throws IOException {
+  public void write(final CompoundBinaryTag tag, final OutputStream output, final BinaryTagIO.Compression compression) throws IOException {
     try (final DataOutputStream dos = new DataOutputStream(new BufferedOutputStream(compression.compress(closeShield(output))))) {
       this.write(tag, (DataOutput) dos);
     }
   }
 
   @Override
-  public void write(final @NotNull CompoundBinaryTag tag, final @NotNull DataOutput output) throws IOException {
+  public void write(final CompoundBinaryTag tag, final DataOutput output) throws IOException {
     output.writeByte(BinaryTagTypes.COMPOUND.id());
     output.writeUTF(""); // write empty name
     BinaryTagTypes.COMPOUND.write(tag, output);
   }
 
   @Override
-  public void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag, final @NotNull Path path, final BinaryTagIO.@NotNull Compression compression) throws IOException {
+  public void writeNamed(final Map.Entry<String, CompoundBinaryTag> tag, final Path path, final BinaryTagIO.Compression compression) throws IOException {
     try (final OutputStream os = Files.newOutputStream(path)) {
       this.writeNamed(tag, os, compression);
     }
   }
 
   @Override
-  public void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag, final @NotNull OutputStream output, final BinaryTagIO.@NotNull Compression compression) throws IOException {
+  public void writeNamed(final Map.Entry<String, CompoundBinaryTag> tag, final OutputStream output, final BinaryTagIO.Compression compression) throws IOException {
     try (final DataOutputStream dos = new DataOutputStream(new BufferedOutputStream(compression.compress(closeShield(output))))) {
       this.writeNamed(tag, (DataOutput) dos);
     }
   }
 
   @Override
-  public void writeNamed(final Map.@NotNull Entry<String, CompoundBinaryTag> tag, final @NotNull DataOutput output) throws IOException {
+  public void writeNamed(final Map.Entry<String, CompoundBinaryTag> tag, final DataOutput output) throws IOException {
     output.writeByte(BinaryTagTypes.COMPOUND.id());
     output.writeUTF(tag.getKey());
     BinaryTagTypes.COMPOUND.write(tag.getValue(), output);
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ByteArrayBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/ByteArrayBinaryTag.java
index 54423ba945..87cb849b5c 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ByteArrayBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ByteArrayBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding a {@code byte}-array value.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface ByteArrayBinaryTag extends ArrayBinaryTag, Iterable<Byte> {
   /**
    * Creates a binary tag holding a {@code byte}-array value.
@@ -39,7 +40,7 @@ public interface ByteArrayBinaryTag extends ArrayBinaryTag, Iterable<Byte> {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull ByteArrayBinaryTag byteArrayBinaryTag(final byte@NotNull... value) {
+  static ByteArrayBinaryTag byteArrayBinaryTag(final byte... value) {
     return new ByteArrayBinaryTagImpl(value);
   }
 
@@ -53,12 +54,12 @@ public interface ByteArrayBinaryTag extends ArrayBinaryTag, Iterable<Byte> {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull ByteArrayBinaryTag of(final byte@NotNull... value) {
+  static ByteArrayBinaryTag of(final byte... value) {
     return new ByteArrayBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<ByteArrayBinaryTag> type() {
+  default BinaryTagType<ByteArrayBinaryTag> type() {
     return BinaryTagTypes.BYTE_ARRAY;
   }
 
@@ -70,7 +71,7 @@ public interface ByteArrayBinaryTag extends ArrayBinaryTag, Iterable<Byte> {
    * @return the value
    * @since 4.0.0
    */
-  byte@NotNull[] value();
+  byte[] value();
 
   /**
    * Get the size of the array.
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ByteArrayBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/ByteArrayBinaryTagImpl.java
index 2bbf8b5ba8..026281a746 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ByteArrayBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ByteArrayBinaryTagImpl.java
@@ -28,10 +28,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "\"byte[\" + this.value.length + \"]\"", childrenArray = "this.value", hasChildren = "this.value.length > 0")
+@NullMarked
 final class ByteArrayBinaryTagImpl extends ArrayBinaryTagImpl implements ByteArrayBinaryTag {
   final byte[] value;
 
@@ -40,7 +41,7 @@ final class ByteArrayBinaryTagImpl extends ArrayBinaryTagImpl implements ByteArr
   }
 
   @Override
-  public byte@NotNull[] value() {
+  public byte[] value() {
     return Arrays.copyOf(this.value, this.value.length);
   }
 
@@ -74,7 +75,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ByteBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/ByteBinaryTag.java
index 51bed228c6..a6ed89c736 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ByteBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ByteBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding a {@code byte} value.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface ByteBinaryTag extends NumberBinaryTag {
   /**
    * A tag with the value {@code 0}.
@@ -53,7 +54,7 @@ public interface ByteBinaryTag extends NumberBinaryTag {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull ByteBinaryTag byteBinaryTag(final byte value) {
+  static ByteBinaryTag byteBinaryTag(final byte value) {
     if (value == 0) {
       return ZERO;
     } else if (value == 1) {
@@ -73,12 +74,12 @@ public interface ByteBinaryTag extends NumberBinaryTag {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull ByteBinaryTag of(final byte value) {
+  static ByteBinaryTag of(final byte value) {
     return byteBinaryTag(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<ByteBinaryTag> type() {
+  default BinaryTagType<ByteBinaryTag> type() {
     return BinaryTagTypes.BYTE;
   }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ByteBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/ByteBinaryTagImpl.java
index 943e4b8e08..8a164ade32 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ByteBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ByteBinaryTagImpl.java
@@ -26,10 +26,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "\"0x\" + Integer.toString(this.value, 16)", hasChildren = "false")
+@NullMarked
 final class ByteBinaryTagImpl extends AbstractBinaryTag implements ByteBinaryTag {
   private final byte value;
 
@@ -86,7 +87,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTag.java
index 635059ddf1..21a3480f9a 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTag.java
@@ -26,14 +26,15 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Binary tag holding a mapping of string keys to {@link BinaryTag} values.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface CompoundBinaryTag extends BinaryTag, CompoundTagSetter<CompoundBinaryTag>, Iterable<Map.Entry<String, ? extends BinaryTag>> {
   /**
    * Gets an empty compound tag.
@@ -41,7 +42,7 @@ public interface CompoundBinaryTag extends BinaryTag, CompoundTagSetter<Compound
    * @return an empty tag
    * @since 4.0.0
    */
-  static @NotNull CompoundBinaryTag empty() {
+  static CompoundBinaryTag empty() {
     return CompoundBinaryTagImpl.EMPTY;
   }
 
@@ -54,7 +55,7 @@ public interface CompoundBinaryTag extends BinaryTag, CompoundTagSetter<Compound
    * @return a compound tag
    * @since 4.4.0
    */
-  static @NotNull CompoundBinaryTag from(final @NotNull Map<String, ? extends BinaryTag> tags) {
+  static CompoundBinaryTag from(final Map<String, ? extends BinaryTag> tags) {
     if (tags.isEmpty()) return empty();
     return new CompoundBinaryTagImpl(new HashMap<>(tags)); // explicitly copy
   }
@@ -65,12 +66,12 @@ public interface CompoundBinaryTag extends BinaryTag, CompoundTagSetter<Compound
    * @return a new builder
    * @since 4.0.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new CompoundTagBuilder();
   }
 
   @Override
-  default @NotNull BinaryTagType<CompoundBinaryTag> type() {
+  default BinaryTagType<CompoundBinaryTag> type() {
     return BinaryTagTypes.COMPOUND;
   }
 
@@ -80,7 +81,7 @@ public interface CompoundBinaryTag extends BinaryTag, CompoundTagSetter<Compound
    * @return the keys
    * @since 4.0.0
    */
-  @NotNull Set<String> keySet();
+  Set<String> keySet();
 
   /**
    * Gets a tag.
@@ -109,7 +110,7 @@ public interface CompoundBinaryTag extends BinaryTag, CompoundTagSetter<Compound
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default boolean getBoolean(final @NotNull String key) {
+  default boolean getBoolean(final String key) {
     return this.getBoolean(key, false);
   }
 
@@ -124,7 +125,7 @@ default boolean getBoolean(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default boolean getBoolean(final @NotNull String key, final boolean defaultValue) {
+  default boolean getBoolean(final String key, final boolean defaultValue) {
     // != 0 might look weird, but it is what vanilla does
     return this.getByte(key) != 0 || defaultValue;
   }
@@ -137,7 +138,7 @@ default boolean getBoolean(final @NotNull String key, final boolean defaultValue
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default byte getByte(final @NotNull String key) {
+  default byte getByte(final String key) {
     return this.getByte(key, (byte) 0);
   }
 
@@ -150,7 +151,7 @@ default byte getByte(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  byte getByte(final @NotNull String key, final byte defaultValue);
+  byte getByte(final String key, final byte defaultValue);
 
   /**
    * Gets a short.
@@ -160,7 +161,7 @@ default byte getByte(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default short getShort(final @NotNull String key) {
+  default short getShort(final String key) {
     return this.getShort(key, (short) 0);
   }
 
@@ -173,7 +174,7 @@ default short getShort(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  short getShort(final @NotNull String key, final short defaultValue);
+  short getShort(final String key, final short defaultValue);
 
   /**
    * Gets an int.
@@ -183,7 +184,7 @@ default short getShort(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default int getInt(final @NotNull String key) {
+  default int getInt(final String key) {
     return this.getInt(key, 0);
   }
 
@@ -196,7 +197,7 @@ default int getInt(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  int getInt(final @NotNull String key, final int defaultValue);
+  int getInt(final String key, final int defaultValue);
 
   /**
    * Gets a long.
@@ -206,7 +207,7 @@ default int getInt(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default long getLong(final @NotNull String key) {
+  default long getLong(final String key) {
     return this.getLong(key, 0L);
   }
 
@@ -219,7 +220,7 @@ default long getLong(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  long getLong(final @NotNull String key, final long defaultValue);
+  long getLong(final String key, final long defaultValue);
 
   /**
    * Gets a float.
@@ -229,7 +230,7 @@ default long getLong(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default float getFloat(final @NotNull String key) {
+  default float getFloat(final String key) {
     return this.getFloat(key, 0f);
   }
 
@@ -242,7 +243,7 @@ default float getFloat(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  float getFloat(final @NotNull String key, final float defaultValue);
+  float getFloat(final String key, final float defaultValue);
 
   /**
    * Gets a double.
@@ -252,7 +253,7 @@ default float getFloat(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default double getDouble(final @NotNull String key) {
+  default double getDouble(final String key) {
     return this.getDouble(key, 0d);
   }
 
@@ -265,7 +266,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  double getDouble(final @NotNull String key, final double defaultValue);
+  double getDouble(final String key, final double defaultValue);
 
   /**
    * Gets an array of bytes.
@@ -275,7 +276,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  byte@NotNull[] getByteArray(final @NotNull String key);
+  byte[] getByteArray(final String key);
 
   /**
    * Gets an array of bytes.
@@ -285,7 +286,7 @@ default double getDouble(final @NotNull String key) {
    * @return the array of bytes, or {@code defaultValue}
    * @since 4.0.0
    */
-  byte@NotNull[] getByteArray(final @NotNull String key, final byte@NotNull[] defaultValue);
+  byte[] getByteArray(final String key, final byte[] defaultValue);
 
   /**
    * Gets a string.
@@ -295,7 +296,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default @NotNull String getString(final @NotNull String key) {
+  default String getString(final String key) {
     return this.getString(key, "");
   }
 
@@ -308,7 +309,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  @NotNull String getString(final @NotNull String key, final @NotNull String defaultValue);
+  String getString(final String key, final String defaultValue);
 
   /**
    * Gets a list.
@@ -318,7 +319,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default @NotNull ListBinaryTag getList(final @NotNull String key) {
+  default ListBinaryTag getList(final String key) {
     return this.getList(key, ListBinaryTag.empty());
   }
 
@@ -331,7 +332,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  @NotNull ListBinaryTag getList(final @NotNull String key, final @NotNull ListBinaryTag defaultValue);
+  ListBinaryTag getList(final String key, final ListBinaryTag defaultValue);
 
   /**
    * Gets a list, ensuring that the type is the same as {@code type}.
@@ -343,7 +344,7 @@ default double getDouble(final @NotNull String key) {
    *     does not match {@code expectedType}
    * @since 4.0.0
    */
-  default @NotNull ListBinaryTag getList(final @NotNull String key, final @NotNull BinaryTagType<? extends BinaryTag> expectedType) {
+  default ListBinaryTag getList(final String key, final BinaryTagType<? extends BinaryTag> expectedType) {
     return this.getList(key, expectedType, ListBinaryTag.empty());
   }
 
@@ -358,7 +359,7 @@ default double getDouble(final @NotNull String key) {
    *     does not match {@code expectedType}
    * @since 4.0.0
    */
-  @NotNull ListBinaryTag getList(final @NotNull String key, final @NotNull BinaryTagType<? extends BinaryTag> expectedType, final @NotNull ListBinaryTag defaultValue);
+  ListBinaryTag getList(final String key, final BinaryTagType<? extends BinaryTag> expectedType, final ListBinaryTag defaultValue);
 
   /**
    * Gets a compound.
@@ -368,7 +369,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  default @NotNull CompoundBinaryTag getCompound(final @NotNull String key) {
+  default CompoundBinaryTag getCompound(final String key) {
     return this.getCompound(key, empty());
   }
 
@@ -381,7 +382,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  @NotNull CompoundBinaryTag getCompound(final @NotNull String key, final @NotNull CompoundBinaryTag defaultValue);
+  CompoundBinaryTag getCompound(final String key, final CompoundBinaryTag defaultValue);
 
   /**
    * Gets an array of ints.
@@ -391,7 +392,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  int@NotNull[] getIntArray(final @NotNull String key);
+  int[] getIntArray(final String key);
 
   /**
    * Gets an array of ints.
@@ -401,7 +402,7 @@ default double getDouble(final @NotNull String key) {
    * @return the array of ints, or {@code defaultValue}
    * @since 4.0.0
    */
-  int@NotNull[] getIntArray(final @NotNull String key, final int@NotNull[] defaultValue);
+  int[] getIntArray(final String key, final int[] defaultValue);
 
   /**
    * Gets an array of longs.
@@ -411,7 +412,7 @@ default double getDouble(final @NotNull String key) {
    *     with the specified key, or has a tag with a different type
    * @since 4.0.0
    */
-  long@NotNull[] getLongArray(final @NotNull String key);
+  long[] getLongArray(final String key);
 
   /**
    * Gets an array of longs.
@@ -421,7 +422,7 @@ default double getDouble(final @NotNull String key) {
    * @return the array of longs, or {@code defaultValue}
    * @since 4.0.0
    */
-  long@NotNull[] getLongArray(final @NotNull String key, final long@NotNull[] defaultValue);
+  long[] getLongArray(final String key, final long[] defaultValue);
 
   /**
    * A compound tag builder.
@@ -435,6 +436,6 @@ interface Builder extends CompoundTagSetter<Builder> {
      * @return a compound tag
      * @since 4.0.0
      */
-    @NotNull CompoundBinaryTag build();
+    CompoundBinaryTag build();
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTagImpl.java
index abff122872..980a130a2d 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundBinaryTagImpl.java
@@ -32,12 +32,13 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
 @Debug.Renderer(text = "\"CompoundBinaryTag[length=\" + this.tags.size() + \"]\"", childrenArray = "this.tags.entrySet().toArray()", hasChildren = "!this.tags.isEmpty()")
+@NullMarked
 final class CompoundBinaryTagImpl extends AbstractBinaryTag implements CompoundBinaryTag {
   static final CompoundBinaryTag EMPTY = new CompoundBinaryTagImpl(Collections.emptyMap());
   private final Map<String, BinaryTag> tags;
@@ -48,13 +49,13 @@ final class CompoundBinaryTagImpl extends AbstractBinaryTag implements CompoundB
     this.hashCode = tags.hashCode();
   }
 
-  public boolean contains(final @NotNull String key, final @NotNull BinaryTagType<?> type) {
+  public boolean contains(final String key, final BinaryTagType<?> type) {
     final @Nullable BinaryTag tag = this.tags.get(key);
     return tag != null && type.test(tag.type());
   }
 
   @Override
-  public @NotNull Set<String> keySet() {
+  public Set<String> keySet() {
     return Collections.unmodifiableSet(this.tags.keySet());
   }
 
@@ -69,12 +70,12 @@ public int size() {
   }
 
   @Override
-  public @NotNull CompoundBinaryTag put(final @NotNull String key, final @NotNull BinaryTag tag) {
+  public CompoundBinaryTag put(final String key, final BinaryTag tag) {
     return this.edit(map -> map.put(key, tag));
   }
 
   @Override
-  public @NotNull CompoundBinaryTag put(final @NotNull CompoundBinaryTag tag) {
+  public CompoundBinaryTag put(final CompoundBinaryTag tag) {
     return this.edit(map -> {
       for (final String key : tag.keySet()) {
         map.put(key, tag.get(key));
@@ -83,12 +84,12 @@ public int size() {
   }
 
   @Override
-  public @NotNull CompoundBinaryTag put(final @NotNull Map<String, ? extends BinaryTag> tags) {
+  public CompoundBinaryTag put(final Map<String, ? extends BinaryTag> tags) {
     return this.edit(map -> map.putAll(tags));
   }
 
   @Override
-  public @NotNull CompoundBinaryTag remove(final @NotNull String key, final @Nullable Consumer<? super BinaryTag> removed) {
+  public CompoundBinaryTag remove(final String key, final @Nullable Consumer<? super BinaryTag> removed) {
     if (!this.tags.containsKey(key)) {
       return this;
     }
@@ -101,7 +102,7 @@ public int size() {
   }
 
   @Override
-  public byte getByte(final @NotNull String key, final byte defaultValue) {
+  public byte getByte(final String key, final byte defaultValue) {
     if (this.contains(key, BinaryTagTypes.BYTE)) {
       return ((NumberBinaryTag) this.tags.get(key)).byteValue();
     }
@@ -109,7 +110,7 @@ public byte getByte(final @NotNull String key, final byte defaultValue) {
   }
 
   @Override
-  public short getShort(final @NotNull String key, final short defaultValue) {
+  public short getShort(final String key, final short defaultValue) {
     if (this.contains(key, BinaryTagTypes.SHORT)) {
       return ((NumberBinaryTag) this.tags.get(key)).shortValue();
     }
@@ -117,7 +118,7 @@ public short getShort(final @NotNull String key, final short defaultValue) {
   }
 
   @Override
-  public int getInt(final @NotNull String key, final int defaultValue) {
+  public int getInt(final String key, final int defaultValue) {
     if (this.contains(key, BinaryTagTypes.INT)) {
       return ((NumberBinaryTag) this.tags.get(key)).intValue();
     }
@@ -125,7 +126,7 @@ public int getInt(final @NotNull String key, final int defaultValue) {
   }
 
   @Override
-  public long getLong(final @NotNull String key, final long defaultValue) {
+  public long getLong(final String key, final long defaultValue) {
     if (this.contains(key, BinaryTagTypes.LONG)) {
       return ((NumberBinaryTag) this.tags.get(key)).longValue();
     }
@@ -133,7 +134,7 @@ public long getLong(final @NotNull String key, final long defaultValue) {
   }
 
   @Override
-  public float getFloat(final @NotNull String key, final float defaultValue) {
+  public float getFloat(final String key, final float defaultValue) {
     if (this.contains(key, BinaryTagTypes.FLOAT)) {
       return ((NumberBinaryTag) this.tags.get(key)).floatValue();
     }
@@ -141,7 +142,7 @@ public float getFloat(final @NotNull String key, final float defaultValue) {
   }
 
   @Override
-  public double getDouble(final @NotNull String key, final double defaultValue) {
+  public double getDouble(final String key, final double defaultValue) {
     if (this.contains(key, BinaryTagTypes.DOUBLE)) {
       return ((NumberBinaryTag) this.tags.get(key)).doubleValue();
     }
@@ -149,7 +150,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public byte@NotNull[] getByteArray(final @NotNull String key) {
+  public byte[] getByteArray(final String key) {
     if (this.contains(key, BinaryTagTypes.BYTE_ARRAY)) {
       return ((ByteArrayBinaryTag) this.tags.get(key)).value();
     }
@@ -157,7 +158,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public byte@NotNull[] getByteArray(final @NotNull String key, final byte@NotNull[] defaultValue) {
+  public byte[] getByteArray(final String key, final byte[] defaultValue) {
     if (this.contains(key, BinaryTagTypes.BYTE_ARRAY)) {
       return ((ByteArrayBinaryTag) this.tags.get(key)).value();
     }
@@ -165,7 +166,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public @NotNull String getString(final @NotNull String key, final @NotNull String defaultValue) {
+  public String getString(final String key, final String defaultValue) {
     if (this.contains(key, BinaryTagTypes.STRING)) {
       return ((StringBinaryTag) this.tags.get(key)).value();
     }
@@ -173,7 +174,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public @NotNull ListBinaryTag getList(final @NotNull String key, final @NotNull ListBinaryTag defaultValue) {
+  public ListBinaryTag getList(final String key, final ListBinaryTag defaultValue) {
     if (this.contains(key, BinaryTagTypes.LIST)) {
       return (ListBinaryTag) this.tags.get(key);
     }
@@ -181,7 +182,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public @NotNull ListBinaryTag getList(final @NotNull String key, final @NotNull BinaryTagType<? extends BinaryTag> expectedType, final @NotNull ListBinaryTag defaultValue) {
+  public ListBinaryTag getList(final String key, final BinaryTagType<? extends BinaryTag> expectedType, final ListBinaryTag defaultValue) {
     if (this.contains(key, BinaryTagTypes.LIST)) {
       final ListBinaryTag tag = (ListBinaryTag) this.tags.get(key);
       if (expectedType.test(tag.elementType())) {
@@ -192,7 +193,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public @NotNull CompoundBinaryTag getCompound(final @NotNull String key, final @NotNull CompoundBinaryTag defaultValue) {
+  public CompoundBinaryTag getCompound(final String key, final CompoundBinaryTag defaultValue) {
     if (this.contains(key, BinaryTagTypes.COMPOUND)) {
       return (CompoundBinaryTag) this.tags.get(key);
     }
@@ -200,7 +201,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public int@NotNull[] getIntArray(final @NotNull String key) {
+  public int[] getIntArray(final String key) {
     if (this.contains(key, BinaryTagTypes.INT_ARRAY)) {
       return ((IntArrayBinaryTag) this.tags.get(key)).value();
     }
@@ -208,7 +209,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public int@NotNull[] getIntArray(final @NotNull String key, final int@NotNull[] defaultValue) {
+  public int[] getIntArray(final String key, final int[] defaultValue) {
     if (this.contains(key, BinaryTagTypes.INT_ARRAY)) {
       return ((IntArrayBinaryTag) this.tags.get(key)).value();
     }
@@ -216,7 +217,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public long@NotNull[] getLongArray(final @NotNull String key) {
+  public long[] getLongArray(final String key) {
     if (this.contains(key, BinaryTagTypes.LONG_ARRAY)) {
       return ((LongArrayBinaryTag) this.tags.get(key)).value();
     }
@@ -224,7 +225,7 @@ public double getDouble(final @NotNull String key, final double defaultValue) {
   }
 
   @Override
-  public long@NotNull[] getLongArray(final @NotNull String key, final long@NotNull[] defaultValue) {
+  public long[] getLongArray(final String key, final long[] defaultValue) {
     if (this.contains(key, BinaryTagTypes.LONG_ARRAY)) {
       return ((LongArrayBinaryTag) this.tags.get(key)).value();
     }
@@ -248,18 +249,18 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("tags", this.tags));
   }
 
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public @NotNull Iterator<Map.Entry<String, ? extends BinaryTag>> iterator() {
+  public Iterator<Map.Entry<String, ? extends BinaryTag>> iterator() {
     return (Iterator) this.tags.entrySet().iterator();
   }
 
   @Override
-  public void forEach(final @NotNull Consumer<? super Map.Entry<String, ? extends BinaryTag>> action) {
+  public void forEach(final Consumer<? super Map.Entry<String, ? extends BinaryTag>> action) {
     this.tags.entrySet().forEach(requireNonNull(action, "action"));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagBuilder.java b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagBuilder.java
index c9fca4238b..6ba233eede 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagBuilder.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagBuilder.java
@@ -26,9 +26,10 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class CompoundTagBuilder implements CompoundBinaryTag.Builder {
   private @Nullable Map<String, BinaryTag> tags;
 
@@ -40,13 +41,13 @@ private Map<String, BinaryTag> tags() {
   }
 
   @Override
-  public CompoundBinaryTag.@NotNull Builder put(final @NotNull String key, final @NotNull BinaryTag tag) {
+  public CompoundBinaryTag.Builder put(final String key, final BinaryTag tag) {
     this.tags().put(key, tag);
     return this;
   }
 
   @Override
-  public CompoundBinaryTag.@NotNull Builder put(final @NotNull CompoundBinaryTag tag) {
+  public CompoundBinaryTag.Builder put(final CompoundBinaryTag tag) {
     final Map<String, BinaryTag> tags = this.tags();
     for (final String key : tag.keySet()) {
       tags.put(key, tag.get(key));
@@ -55,13 +56,13 @@ private Map<String, BinaryTag> tags() {
   }
 
   @Override
-  public CompoundBinaryTag.@NotNull Builder put(final @NotNull Map<String, ? extends BinaryTag> tags) {
+  public CompoundBinaryTag.Builder put(final Map<String, ? extends BinaryTag> tags) {
     this.tags().putAll(tags);
     return this;
   }
 
   @Override
-  public CompoundBinaryTag.@NotNull Builder remove(final @NotNull String key, final @Nullable Consumer<? super BinaryTag> removed) {
+  public CompoundBinaryTag.Builder remove(final String key, final @Nullable Consumer<? super BinaryTag> removed) {
     if (this.tags != null) {
       final BinaryTag tag = this.tags.remove(key);
       if (removed != null) {
@@ -72,7 +73,7 @@ private Map<String, BinaryTag> tags() {
   }
 
   @Override
-  public @NotNull CompoundBinaryTag build() {
+  public CompoundBinaryTag build() {
     if (this.tags == null) return CompoundBinaryTag.empty();
     return new CompoundBinaryTagImpl(new HashMap<>(this.tags));
   }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagSetter.java b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagSetter.java
index 74a3bf972f..e1f64790b3 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagSetter.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/CompoundTagSetter.java
@@ -25,8 +25,8 @@
 
 import java.util.Map;
 import java.util.function.Consumer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Common methods between {@link CompoundBinaryTag} and {@link CompoundBinaryTag.Builder}.
@@ -34,6 +34,7 @@
  * @param <R> the return type
  * @since 4.0.0
  */
+@NullMarked
 public interface CompoundTagSetter<R> {
   /**
    * Inserts a tag.
@@ -43,7 +44,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  @NotNull R put(final @NotNull String key, final @NotNull BinaryTag tag);
+  R put(final String key, final BinaryTag tag);
 
   /**
    * Inserts the tags in {@code tag}, overwriting any that are in {@code this}.
@@ -52,7 +53,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.6.0
    */
-  @NotNull R put(final @NotNull CompoundBinaryTag tag);
+  R put(final CompoundBinaryTag tag);
 
   /**
    * Inserts some tags.
@@ -61,7 +62,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.4.0
    */
-  @NotNull R put(final @NotNull Map<String, ? extends BinaryTag> tags);
+  R put(final Map<String, ? extends BinaryTag> tags);
 
   /**
    * Removes a tag.
@@ -70,7 +71,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.4.0
    */
-  default @NotNull R remove(final @NotNull String key) {
+  default R remove(final String key) {
     return this.remove(key, null);
   }
 
@@ -82,7 +83,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.4.0
    */
-  @NotNull R remove(final @NotNull String key, final @Nullable Consumer<? super BinaryTag> removed);
+  R remove(final String key, final @Nullable Consumer<? super BinaryTag> removed);
 
   /**
    * Inserts a boolean.
@@ -94,7 +95,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putBoolean(final @NotNull String key, final boolean value) {
+  default R putBoolean(final String key, final boolean value) {
     return this.put(key, value ? ByteBinaryTag.ONE : ByteBinaryTag.ZERO);
   }
 
@@ -106,7 +107,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putByte(final @NotNull String key, final byte value) {
+  default R putByte(final String key, final byte value) {
     return this.put(key, ByteBinaryTag.byteBinaryTag(value));
   }
 
@@ -118,7 +119,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putShort(final @NotNull String key, final short value) {
+  default R putShort(final String key, final short value) {
     return this.put(key, ShortBinaryTag.shortBinaryTag(value));
   }
 
@@ -130,7 +131,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putInt(final @NotNull String key, final int value) {
+  default R putInt(final String key, final int value) {
     return this.put(key, IntBinaryTag.intBinaryTag(value));
   }
 
@@ -142,7 +143,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putLong(final @NotNull String key, final long value) {
+  default R putLong(final String key, final long value) {
     return this.put(key, LongBinaryTag.longBinaryTag(value));
   }
 
@@ -154,7 +155,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putFloat(final @NotNull String key, final float value) {
+  default R putFloat(final String key, final float value) {
     return this.put(key, FloatBinaryTag.floatBinaryTag(value));
   }
 
@@ -166,7 +167,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putDouble(final @NotNull String key, final double value) {
+  default R putDouble(final String key, final double value) {
     return this.put(key, DoubleBinaryTag.doubleBinaryTag(value));
   }
 
@@ -178,7 +179,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putByteArray(final @NotNull String key, final byte@NotNull[] value) {
+  default R putByteArray(final String key, final byte[] value) {
     return this.put(key, ByteArrayBinaryTag.byteArrayBinaryTag(value));
   }
 
@@ -190,7 +191,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putString(final @NotNull String key, final @NotNull String value) {
+  default R putString(final String key, final String value) {
     return this.put(key, StringBinaryTag.stringBinaryTag(value));
   }
 
@@ -202,7 +203,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putIntArray(final @NotNull String key, final int@NotNull[] value) {
+  default R putIntArray(final String key, final int[] value) {
     return this.put(key, IntArrayBinaryTag.intArrayBinaryTag(value));
   }
 
@@ -214,7 +215,7 @@ public interface CompoundTagSetter<R> {
    * @return a compound tag
    * @since 4.0.0
    */
-  default @NotNull R putLongArray(final @NotNull String key, final long@NotNull[] value) {
+  default R putLongArray(final String key, final long[] value) {
     return this.put(key, LongArrayBinaryTag.longArrayBinaryTag(value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/DoubleBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/DoubleBinaryTag.java
index b0724e38f9..bece0f2f43 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/DoubleBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/DoubleBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding a {@code double} value.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface DoubleBinaryTag extends NumberBinaryTag {
   /**
    * Creates a binary tag holding a {@code double} value.
@@ -39,7 +40,7 @@ public interface DoubleBinaryTag extends NumberBinaryTag {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull DoubleBinaryTag doubleBinaryTag(final double value) {
+  static DoubleBinaryTag doubleBinaryTag(final double value) {
     return new DoubleBinaryTagImpl(value);
   }
 
@@ -53,12 +54,12 @@ public interface DoubleBinaryTag extends NumberBinaryTag {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull DoubleBinaryTag of(final double value) {
+  static DoubleBinaryTag of(final double value) {
     return new DoubleBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<DoubleBinaryTag> type() {
+  default BinaryTagType<DoubleBinaryTag> type() {
     return BinaryTagTypes.DOUBLE;
   }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/DoubleBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/DoubleBinaryTagImpl.java
index 6633b2535b..b077c173d2 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/DoubleBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/DoubleBinaryTagImpl.java
@@ -26,10 +26,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "String.valueOf(this.value) + \"d\"", hasChildren = "false")
+@NullMarked
 final class DoubleBinaryTagImpl extends AbstractBinaryTag implements DoubleBinaryTag {
   private final double value;
 
@@ -86,7 +87,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/EndBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/EndBinaryTag.java
index 7655119155..73626606b4 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/EndBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/EndBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An end tag.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface EndBinaryTag extends BinaryTag {
   /**
    * Gets the end tag.
@@ -38,7 +39,7 @@ public interface EndBinaryTag extends BinaryTag {
    * @return the end tag
    * @since 4.14.0
    */
-  static @NotNull EndBinaryTag endBinaryTag() {
+  static EndBinaryTag endBinaryTag() {
     return EndBinaryTagImpl.INSTANCE;
   }
 
@@ -51,12 +52,12 @@ public interface EndBinaryTag extends BinaryTag {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull EndBinaryTag get() {
+  static EndBinaryTag get() {
     return EndBinaryTagImpl.INSTANCE;
   }
 
   @Override
-  default @NotNull BinaryTagType<EndBinaryTag> type() {
+  default BinaryTagType<EndBinaryTag> type() {
     return BinaryTagTypes.END;
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/FloatBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/FloatBinaryTag.java
index e834233f44..b133068a89 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/FloatBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/FloatBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding a {@code float} value.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface FloatBinaryTag extends NumberBinaryTag {
   /**
    * Creates a binary tag holding a {@code float} value.
@@ -39,7 +40,7 @@ public interface FloatBinaryTag extends NumberBinaryTag {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull FloatBinaryTag floatBinaryTag(final float value) {
+  static FloatBinaryTag floatBinaryTag(final float value) {
     return new FloatBinaryTagImpl(value);
   }
 
@@ -53,12 +54,12 @@ public interface FloatBinaryTag extends NumberBinaryTag {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull FloatBinaryTag of(final float value) {
+  static FloatBinaryTag of(final float value) {
     return new FloatBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<FloatBinaryTag> type() {
+  default BinaryTagType<FloatBinaryTag> type() {
     return BinaryTagTypes.FLOAT;
   }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/FloatBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/FloatBinaryTagImpl.java
index 65e0ae157d..e9f16de702 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/FloatBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/FloatBinaryTagImpl.java
@@ -26,10 +26,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "String.valueOf(this.value) + \"f\"", hasChildren = "false")
+@NullMarked
 final class FloatBinaryTagImpl extends AbstractBinaryTag implements FloatBinaryTag {
   private final float value;
 
@@ -86,7 +87,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/IntArrayBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/IntArrayBinaryTag.java
index 89b34ba36c..6d3cf36200 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/IntArrayBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/IntArrayBinaryTag.java
@@ -28,7 +28,7 @@
 import java.util.function.IntConsumer;
 import java.util.stream.IntStream;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding an {@code int}-array value.
@@ -36,6 +36,7 @@
  * @since 4.0.0
  * @sinceMinecraft 1.2.1
  */
+@NullMarked
 public interface IntArrayBinaryTag extends ArrayBinaryTag, Iterable<Integer> {
   /**
    * Creates a binary tag holding an {@code int}-array value.
@@ -44,7 +45,7 @@ public interface IntArrayBinaryTag extends ArrayBinaryTag, Iterable<Integer> {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull IntArrayBinaryTag intArrayBinaryTag(final int@NotNull... value) {
+  static IntArrayBinaryTag intArrayBinaryTag(final int... value) {
     return new IntArrayBinaryTagImpl(value);
   }
 
@@ -58,12 +59,12 @@ public interface IntArrayBinaryTag extends ArrayBinaryTag, Iterable<Integer> {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull IntArrayBinaryTag of(final int@NotNull... value) {
+  static IntArrayBinaryTag of(final int... value) {
     return new IntArrayBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<IntArrayBinaryTag> type() {
+  default BinaryTagType<IntArrayBinaryTag> type() {
     return BinaryTagTypes.INT_ARRAY;
   }
 
@@ -75,7 +76,7 @@ public interface IntArrayBinaryTag extends ArrayBinaryTag, Iterable<Integer> {
    * @return the value
    * @since 4.0.0
    */
-  int@NotNull[] value();
+  int[] value();
 
   /**
    * Get the length of the array.
@@ -103,10 +104,10 @@ public interface IntArrayBinaryTag extends ArrayBinaryTag, Iterable<Integer> {
    * @since 4.2.0
    */
   @Override
-  PrimitiveIterator.@NotNull OfInt iterator();
+  PrimitiveIterator.OfInt iterator();
 
   @Override
-  Spliterator.@NotNull OfInt spliterator();
+  Spliterator.OfInt spliterator();
 
   /**
    * Create a stream whose elements are the elements of this array tag.
@@ -114,7 +115,7 @@ public interface IntArrayBinaryTag extends ArrayBinaryTag, Iterable<Integer> {
    * @return a new stream
    * @since 4.2.0
    */
-  @NotNull IntStream stream();
+  IntStream stream();
 
   /**
    * Perform an action for every int in the backing array.
@@ -122,5 +123,5 @@ public interface IntArrayBinaryTag extends ArrayBinaryTag, Iterable<Integer> {
    * @param action the action to perform
    * @since 4.2.0
    */
-  void forEachInt(final @NotNull IntConsumer action);
+  void forEachInt(final IntConsumer action);
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/IntArrayBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/IntArrayBinaryTagImpl.java
index 729b491ec7..26d6e32b2e 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/IntArrayBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/IntArrayBinaryTagImpl.java
@@ -32,10 +32,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "\"int[\" + this.value.length + \"]\"", childrenArray = "this.value", hasChildren = "this.value.length > 0")
+@NullMarked
 final class IntArrayBinaryTagImpl extends ArrayBinaryTagImpl implements IntArrayBinaryTag {
   final int[] value;
 
@@ -44,7 +45,7 @@ final class IntArrayBinaryTagImpl extends ArrayBinaryTagImpl implements IntArray
   }
 
   @Override
-  public int@NotNull[] value() {
+  public int[] value() {
     return Arrays.copyOf(this.value, this.value.length);
   }
 
@@ -60,7 +61,7 @@ public int get(final int index) {
   }
 
   @Override
-  public PrimitiveIterator.@NotNull OfInt iterator() {
+  public PrimitiveIterator.OfInt iterator() {
     return new PrimitiveIterator.OfInt() {
       private int index;
 
@@ -80,17 +81,17 @@ public int nextInt() {
   }
 
   @Override
-  public Spliterator.@NotNull OfInt spliterator() {
+  public Spliterator.OfInt spliterator() {
     return Arrays.spliterator(this.value);
   }
 
   @Override
-  public @NotNull IntStream stream() {
+  public IntStream stream() {
     return Arrays.stream(this.value);
   }
 
   @Override
-  public void forEachInt(final @NotNull IntConsumer action) {
+  public void forEachInt(final IntConsumer action) {
     for (int i = 0, length = this.value.length; i < length; i++) {
       action.accept(this.value[i]);
     }
@@ -115,7 +116,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/IntBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/IntBinaryTag.java
index 51eb0ad3c5..b8145ae914 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/IntBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/IntBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding an {@code int} value.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface IntBinaryTag extends NumberBinaryTag {
   /**
    * Creates a binary tag holding an {@code int} value.
@@ -39,7 +40,7 @@ public interface IntBinaryTag extends NumberBinaryTag {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull IntBinaryTag intBinaryTag(final int value) {
+  static IntBinaryTag intBinaryTag(final int value) {
     return new IntBinaryTagImpl(value);
   }
 
@@ -53,12 +54,12 @@ public interface IntBinaryTag extends NumberBinaryTag {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull IntBinaryTag of(final int value) {
+  static IntBinaryTag of(final int value) {
     return new IntBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<IntBinaryTag> type() {
+  default BinaryTagType<IntBinaryTag> type() {
     return BinaryTagTypes.INT;
   }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/IntBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/IntBinaryTagImpl.java
index f2831bc730..e83cd55721 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/IntBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/IntBinaryTagImpl.java
@@ -26,10 +26,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "String.valueOf(this.value) + \"i\"", hasChildren = "false")
+@NullMarked
 final class IntBinaryTagImpl extends AbstractBinaryTag implements IntBinaryTag {
   private final int value;
 
@@ -86,7 +87,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ListBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/ListBinaryTag.java
index fa8095aa9f..d2299579da 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ListBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ListBinaryTag.java
@@ -27,15 +27,16 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A list of zero or more values of a single tag type.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>, BinaryTag, Iterable<BinaryTag> {
   /**
    * Gets an empty list tag.
@@ -43,7 +44,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @return an empty tag
    * @since 4.0.0
    */
-  static @NotNull ListBinaryTag empty() {
+  static ListBinaryTag empty() {
     return ListBinaryTagImpl.EMPTY;
   }
 
@@ -57,7 +58,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @throws IllegalArgumentException if {@code tags} has different tag types within
    * @since 4.4.0
    */
-  static @NotNull ListBinaryTag from(final @NotNull Iterable<? extends BinaryTag> tags) {
+  static ListBinaryTag from(final Iterable<? extends BinaryTag> tags) {
     return builder().add(tags).build();
   }
 
@@ -67,7 +68,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @return a new builder
    * @since 4.0.0
    */
-  static @NotNull Builder<BinaryTag> builder() {
+  static Builder<BinaryTag> builder() {
     return new ListTagBuilder<>();
   }
 
@@ -80,7 +81,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @throws IllegalArgumentException if {@code type} is {@link BinaryTagTypes#END}
    * @since 4.0.0
    */
-  static <T extends BinaryTag> @NotNull Builder<T> builder(final @NotNull BinaryTagType<T> type) {
+  static <T extends BinaryTag> Builder<T> builder(final BinaryTagType<T> type) {
     if (type == BinaryTagTypes.END) throw new IllegalArgumentException("Cannot create a list of " + BinaryTagTypes.END);
     return new ListTagBuilder<>(type);
   }
@@ -96,7 +97,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @throws IllegalArgumentException if {@code type} is {@link BinaryTagTypes#END}
    * @since 4.14.0
    */
-  static @NotNull ListBinaryTag listBinaryTag(final @NotNull BinaryTagType<? extends BinaryTag> type, final @NotNull List<BinaryTag> tags) {
+  static ListBinaryTag listBinaryTag(final BinaryTagType<? extends BinaryTag> type, final List<BinaryTag> tags) {
     if (tags.isEmpty()) return empty();
     if (type == BinaryTagTypes.END) throw new IllegalArgumentException("Cannot create a list of " + BinaryTagTypes.END);
     return new ListBinaryTagImpl(type, tags);
@@ -116,12 +117,12 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull ListBinaryTag of(final @NotNull BinaryTagType<? extends BinaryTag> type, final @NotNull List<BinaryTag> tags) {
+  static ListBinaryTag of(final BinaryTagType<? extends BinaryTag> type, final List<BinaryTag> tags) {
     return listBinaryTag(type, tags);
   }
 
   @Override
-  default @NotNull BinaryTagType<ListBinaryTag> type() {
+  default BinaryTagType<ListBinaryTag> type() {
     return BinaryTagTypes.LIST;
   }
 
@@ -133,7 +134,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @deprecated since 4.4.0, use {@link #elementType()} instead
    */
   @Deprecated
-  default @NotNull BinaryTagType<? extends BinaryTag> listType() {
+  default BinaryTagType<? extends BinaryTag> listType() {
     return this.elementType();
   }
 
@@ -143,7 +144,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @return the type
    * @since 4.4.0
    */
-  @NotNull BinaryTagType<? extends BinaryTag> elementType();
+  BinaryTagType<? extends BinaryTag> elementType();
 
   /**
    * Gets the size.
@@ -161,7 +162,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @throws IndexOutOfBoundsException if the index is out of range
    * @since 4.0.0
    */
-  @NotNull BinaryTag get(final @Range(from = 0, to = Integer.MAX_VALUE) int index);
+  BinaryTag get(final @Range(from = 0, to = Integer.MAX_VALUE) int index);
 
   /**
    * Sets the tag at index {@code index} to {@code tag}, optionally providing {@code removedConsumer} with the tag previously at index {@code index}.
@@ -172,7 +173,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @return a list tag
    * @since 4.0.0
    */
-  @NotNull ListBinaryTag set(final int index, final @NotNull BinaryTag tag, final @Nullable Consumer<? super BinaryTag> removed);
+  ListBinaryTag set(final int index, final BinaryTag tag, final @Nullable Consumer<? super BinaryTag> removed);
 
   /**
    * Removes the tag at index {@code index}, optionally providing {@code removedConsumer} with the tag previously at index {@code index}.
@@ -182,7 +183,7 @@ public interface ListBinaryTag extends ListTagSetter<ListBinaryTag, BinaryTag>,
    * @return a list tag
    * @since 4.0.0
    */
-  @NotNull ListBinaryTag remove(final int index, final @Nullable Consumer<? super BinaryTag> removed);
+  ListBinaryTag remove(final int index, final @Nullable Consumer<? super BinaryTag> removed);
 
   /**
    * Gets a byte.
@@ -353,7 +354,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the array of bytes, or a zero-length array
    * @since 4.0.0
    */
-  default byte@NotNull[] getByteArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
+  default byte[] getByteArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.BYTE_ARRAY) {
       return ((ByteArrayBinaryTag) tag).value();
@@ -369,7 +370,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the array of bytes, or {@code defaultValue}
    * @since 4.0.0
    */
-  default byte@NotNull[] getByteArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final byte@NotNull[] defaultValue) {
+  default byte[] getByteArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final byte[] defaultValue) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.BYTE_ARRAY) {
       return ((ByteArrayBinaryTag) tag).value();
@@ -384,7 +385,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the string value, or {@code ""}
    * @since 4.0.0
    */
-  default @NotNull String getString(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
+  default String getString(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
     return this.getString(index, "");
   }
 
@@ -396,7 +397,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the string value, or {@code defaultValue}
    * @since 4.0.0
    */
-  default @NotNull String getString(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final @NotNull String defaultValue) {
+  default String getString(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final String defaultValue) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.STRING) {
       return ((StringBinaryTag) tag).value();
@@ -411,7 +412,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the list, or an empty list if the tag at index {@code index} is not a list tag
    * @since 4.4.0
    */
-  default @NotNull ListBinaryTag getList(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
+  default ListBinaryTag getList(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
     return this.getList(index, null, ListBinaryTag.empty());
   }
 
@@ -423,7 +424,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the list, or an empty list if the tag at index {@code index} is not a list tag, or if the list tag's element type is not {@code elementType}
    * @since 4.4.0
    */
-  default @NotNull ListBinaryTag getList(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final @Nullable BinaryTagType<?> elementType) {
+  default ListBinaryTag getList(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final @Nullable BinaryTagType<?> elementType) {
     return this.getList(index, elementType, ListBinaryTag.empty());
   }
 
@@ -435,7 +436,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the list, or {@code defaultValue} if the tag at index {@code index} is not a list tag
    * @since 4.4.0
    */
-  default @NotNull ListBinaryTag getList(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final @NotNull ListBinaryTag defaultValue) {
+  default ListBinaryTag getList(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final ListBinaryTag defaultValue) {
     return this.getList(index, null, defaultValue);
   }
 
@@ -450,7 +451,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the list, or {@code defaultValue} if the tag at index {@code index} is not a list tag, or if the list tag's element type is not {@code elementType}
    * @since 4.4.0
    */
-  default @NotNull ListBinaryTag getList(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final @Nullable BinaryTagType<?> elementType, final @NotNull ListBinaryTag defaultValue) {
+  default ListBinaryTag getList(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final @Nullable BinaryTagType<?> elementType, final ListBinaryTag defaultValue) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.LIST) {
       final ListBinaryTag list = (ListBinaryTag) tag;
@@ -468,7 +469,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the compound, or a new compound
    * @since 4.0.0
    */
-  default @NotNull CompoundBinaryTag getCompound(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
+  default CompoundBinaryTag getCompound(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
     return this.getCompound(index, CompoundBinaryTag.empty());
   }
 
@@ -480,7 +481,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the compound, or {@code defaultValue}
    * @since 4.0.0
    */
-  default @NotNull CompoundBinaryTag getCompound(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final @NotNull CompoundBinaryTag defaultValue) {
+  default CompoundBinaryTag getCompound(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final CompoundBinaryTag defaultValue) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.COMPOUND) {
       return (CompoundBinaryTag) tag;
@@ -495,7 +496,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the array of ints, or a zero-length array
    * @since 4.0.0
    */
-  default int@NotNull[] getIntArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
+  default int[] getIntArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.INT_ARRAY) {
       return ((IntArrayBinaryTag) tag).value();
@@ -511,7 +512,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the array of ints, or {@code defaultValue}
    * @since 4.0.0
    */
-  default int@NotNull[] getIntArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final int@NotNull[] defaultValue) {
+  default int[] getIntArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final int[] defaultValue) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.INT_ARRAY) {
       return ((IntArrayBinaryTag) tag).value();
@@ -526,7 +527,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the array of longs, or a zero-length array
    * @since 4.0.0
    */
-  default long@NotNull[] getLongArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
+  default long[] getLongArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.LONG_ARRAY) {
       return ((LongArrayBinaryTag) tag).value();
@@ -542,7 +543,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return the array of longs, or {@code defaultValue}
    * @since 4.0.0
    */
-  default long@NotNull[] getLongArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final long@NotNull[] defaultValue) {
+  default long[] getLongArray(final @Range(from = 0, to = Integer.MAX_VALUE) int index, final long[] defaultValue) {
     final BinaryTag tag = this.get(index);
     if (tag.type() == BinaryTagTypes.LONG_ARRAY) {
       return ((LongArrayBinaryTag) tag).value();
@@ -556,7 +557,7 @@ default double getDouble(final @Range(from = 0, to = Integer.MAX_VALUE) int inde
    * @return a new stream
    * @since 4.2.0
    */
-  @NotNull Stream<BinaryTag> stream();
+  Stream<BinaryTag> stream();
 
   /**
    * A list tag builder.
@@ -571,6 +572,6 @@ interface Builder<T extends BinaryTag> extends ListTagSetter<Builder<T>, T> {
      * @return a list tag
      * @since 4.0.0
      */
-    @NotNull ListBinaryTag build();
+    ListBinaryTag build();
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ListBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/ListBinaryTagImpl.java
index 5d46dc1224..7e2ddd3a51 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ListBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ListBinaryTagImpl.java
@@ -34,11 +34,12 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "\"ListBinaryTag[type=\" + this.type.toString() + \"]\"", childrenArray = "this.tags.toArray()", hasChildren = "!this.tags.isEmpty()")
+@NullMarked
 final class ListBinaryTagImpl extends AbstractBinaryTag implements ListBinaryTag {
   static final ListBinaryTag EMPTY = new ListBinaryTagImpl(BinaryTagTypes.END, Collections.emptyList());
   private final List<BinaryTag> tags;
@@ -52,7 +53,7 @@ final class ListBinaryTagImpl extends AbstractBinaryTag implements ListBinaryTag
   }
 
   @Override
-  public @NotNull BinaryTagType<? extends BinaryTag> elementType() {
+  public BinaryTagType<? extends BinaryTag> elementType() {
     return this.elementType;
   }
 
@@ -62,12 +63,12 @@ public int size() {
   }
 
   @Override
-  public @NotNull BinaryTag get(@Range(from = 0, to = Integer.MAX_VALUE) final int index) {
+  public BinaryTag get(@Range(from = 0, to = Integer.MAX_VALUE) final int index) {
     return this.tags.get(index);
   }
 
   @Override
-  public @NotNull ListBinaryTag set(final int index, final @NotNull BinaryTag newTag, final @Nullable Consumer<? super BinaryTag> removed) {
+  public ListBinaryTag set(final int index, final BinaryTag newTag, final @Nullable Consumer<? super BinaryTag> removed) {
     return this.edit(tags -> {
       final BinaryTag oldTag = tags.set(index, newTag);
       if (removed != null) {
@@ -77,7 +78,7 @@ public int size() {
   }
 
   @Override
-  public @NotNull ListBinaryTag remove(final int index, final @Nullable Consumer<? super BinaryTag> removed) {
+  public ListBinaryTag remove(final int index, final @Nullable Consumer<? super BinaryTag> removed) {
     return this.edit(tags -> {
       final BinaryTag oldTag = tags.remove(index);
       if (removed != null) {
@@ -87,7 +88,7 @@ public int size() {
   }
 
   @Override
-  public @NotNull ListBinaryTag add(final BinaryTag tag) {
+  public ListBinaryTag add(final BinaryTag tag) {
     noAddEnd(tag);
     if (this.elementType != BinaryTagTypes.END) {
       mustBeSameType(tag, this.elementType);
@@ -96,7 +97,7 @@ public int size() {
   }
 
   @Override
-  public @NotNull ListBinaryTag add(final Iterable<? extends BinaryTag> tagsToAdd) {
+  public ListBinaryTag add(final Iterable<? extends BinaryTag> tagsToAdd) {
     if (tagsToAdd instanceof Collection<?> && ((Collection<?>) tagsToAdd).isEmpty()) {
       return this;
     }
@@ -147,7 +148,7 @@ private ListBinaryTag edit(final Consumer<List<BinaryTag>> consumer, final @Null
   }
 
   @Override
-  public @NotNull Stream<BinaryTag> stream() {
+  public Stream<BinaryTag> stream() {
     return this.tags.stream();
   }
 
@@ -193,7 +194,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("tags", this.tags),
       ExaminableProperty.of("type", this.elementType)
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ListTagBuilder.java b/nbt/src/main/java/net/kyori/adventure/nbt/ListTagBuilder.java
index 13c0674029..eb7c52571a 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ListTagBuilder.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ListTagBuilder.java
@@ -25,9 +25,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class ListTagBuilder<T extends BinaryTag> implements ListBinaryTag.Builder<T> {
   private @Nullable List<BinaryTag> tags;
   private BinaryTagType<? extends BinaryTag> elementType;
@@ -41,7 +42,7 @@ final class ListTagBuilder<T extends BinaryTag> implements ListBinaryTag.Builder
   }
 
   @Override
-  public ListBinaryTag.@NotNull Builder<T> add(final BinaryTag tag) {
+  public ListBinaryTag.Builder<T> add(final BinaryTag tag) {
     ListBinaryTagImpl.noAddEnd(tag);
     // set the type if it has not yet been set
     if (this.elementType == BinaryTagTypes.END) {
@@ -57,7 +58,7 @@ final class ListTagBuilder<T extends BinaryTag> implements ListBinaryTag.Builder
   }
 
   @Override
-  public ListBinaryTag.@NotNull Builder<T> add(final Iterable<? extends T> tagsToAdd) {
+  public ListBinaryTag.Builder<T> add(final Iterable<? extends T> tagsToAdd) {
     for (final T tag : tagsToAdd) {
       this.add(tag);
     }
@@ -65,7 +66,7 @@ final class ListTagBuilder<T extends BinaryTag> implements ListBinaryTag.Builder
   }
 
   @Override
-  public @NotNull ListBinaryTag build() {
+  public ListBinaryTag build() {
     if (this.tags == null) return ListBinaryTag.empty();
     return new ListBinaryTagImpl(this.elementType, new ArrayList<>(this.tags));
   }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ListTagSetter.java b/nbt/src/main/java/net/kyori/adventure/nbt/ListTagSetter.java
index 1a580e1751..e82e4c7e86 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ListTagSetter.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ListTagSetter.java
@@ -23,7 +23,7 @@
  */
 package net.kyori.adventure.nbt;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Common methods between {@link ListBinaryTag} and {@link ListBinaryTag.Builder}.
@@ -32,6 +32,7 @@
  * @param <T> the element type
  * @since 4.0.0
  */
+@NullMarked
 public interface ListTagSetter<R, T extends BinaryTag> {
   /**
    * Adds a tag.
@@ -40,7 +41,7 @@ public interface ListTagSetter<R, T extends BinaryTag> {
    * @return a list tag
    * @since 4.0.0
    */
-  @NotNull R add(final T tag);
+  R add(final T tag);
 
   /**
    * Adds multiple tags.
@@ -49,5 +50,5 @@ public interface ListTagSetter<R, T extends BinaryTag> {
    * @return a list tag
    * @since 4.4.0
    */
-  @NotNull R add(final Iterable<? extends T> tags);
+  R add(final Iterable<? extends T> tags);
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/LongArrayBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/LongArrayBinaryTag.java
index 48851846de..fce672fb9a 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/LongArrayBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/LongArrayBinaryTag.java
@@ -28,7 +28,7 @@
 import java.util.function.LongConsumer;
 import java.util.stream.LongStream;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding a {@code long}-array value.
@@ -36,6 +36,7 @@
  * @since 4.0.0
  * @sinceMinecraft 1.12
  */
+@NullMarked
 public interface LongArrayBinaryTag extends ArrayBinaryTag, Iterable<Long> {
   /**
    * Creates a binary tag holding a {@code long}-array value.
@@ -44,7 +45,7 @@ public interface LongArrayBinaryTag extends ArrayBinaryTag, Iterable<Long> {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull LongArrayBinaryTag longArrayBinaryTag(final long@NotNull... value) {
+  static LongArrayBinaryTag longArrayBinaryTag(final long... value) {
     return new LongArrayBinaryTagImpl(value);
   }
 
@@ -58,12 +59,12 @@ public interface LongArrayBinaryTag extends ArrayBinaryTag, Iterable<Long> {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull LongArrayBinaryTag of(final long@NotNull... value) {
+  static LongArrayBinaryTag of(final long... value) {
     return new LongArrayBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<LongArrayBinaryTag> type() {
+  default BinaryTagType<LongArrayBinaryTag> type() {
     return BinaryTagTypes.LONG_ARRAY;
   }
 
@@ -75,7 +76,7 @@ public interface LongArrayBinaryTag extends ArrayBinaryTag, Iterable<Long> {
    * @return the value
    * @since 4.0.0
    */
-  long@NotNull[] value();
+  long[] value();
 
   /**
    * Gets the length of the array.
@@ -103,10 +104,10 @@ public interface LongArrayBinaryTag extends ArrayBinaryTag, Iterable<Long> {
    * @since 4.2.0
    */
   @Override
-  PrimitiveIterator.@NotNull OfLong iterator();
+  PrimitiveIterator.OfLong iterator();
 
   @Override
-  Spliterator.@NotNull OfLong spliterator();
+  Spliterator.OfLong spliterator();
 
   /**
    * Create a stream whose elements are the elements of this array tag.
@@ -114,7 +115,7 @@ public interface LongArrayBinaryTag extends ArrayBinaryTag, Iterable<Long> {
    * @return a new stream
    * @since 4.2.0
    */
-  @NotNull LongStream stream();
+  LongStream stream();
 
   /**
    * Perform an action for every long in the backing array.
@@ -122,5 +123,5 @@ public interface LongArrayBinaryTag extends ArrayBinaryTag, Iterable<Long> {
    * @param action the action to perform
    * @since 4.2.0
    */
-  void forEachLong(final @NotNull LongConsumer action);
+  void forEachLong(final LongConsumer action);
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/LongArrayBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/LongArrayBinaryTagImpl.java
index 1dce10f66e..3ef5c410df 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/LongArrayBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/LongArrayBinaryTagImpl.java
@@ -32,10 +32,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "\"long[\" + this.value.length + \"]\"", childrenArray = "this.value", hasChildren = "this.value.length > 0")
+@NullMarked
 final class LongArrayBinaryTagImpl extends ArrayBinaryTagImpl implements LongArrayBinaryTag {
   final long[] value;
 
@@ -44,7 +45,7 @@ final class LongArrayBinaryTagImpl extends ArrayBinaryTagImpl implements LongArr
   }
 
   @Override
-  public long@NotNull[] value() {
+  public long[] value() {
     return Arrays.copyOf(this.value, this.value.length);
   }
 
@@ -60,7 +61,7 @@ public long get(final int index) {
   }
 
   @Override
-  public PrimitiveIterator.@NotNull OfLong iterator() {
+  public PrimitiveIterator.OfLong iterator() {
     return new PrimitiveIterator.OfLong() {
       private int index;
 
@@ -80,17 +81,17 @@ public long nextLong() {
   }
 
   @Override
-  public Spliterator.@NotNull OfLong spliterator() {
+  public Spliterator.OfLong spliterator() {
     return Arrays.spliterator(this.value);
   }
 
   @Override
-  public @NotNull LongStream stream() {
+  public LongStream stream() {
     return Arrays.stream(this.value);
   }
 
   @Override
-  public void forEachLong(final @NotNull LongConsumer action) {
+  public void forEachLong(final LongConsumer action) {
     for (int i = 0, length = this.value.length; i < length; i++) {
       action.accept(this.value[i]);
     }
@@ -115,7 +116,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/LongBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/LongBinaryTag.java
index 364b62561e..2e27734d1e 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/LongBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/LongBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding a {@code long} value.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface LongBinaryTag extends NumberBinaryTag {
   /**
    * Creates a binary tag holding a {@code long} value.
@@ -39,7 +40,7 @@ public interface LongBinaryTag extends NumberBinaryTag {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull LongBinaryTag longBinaryTag(final long value) {
+  static LongBinaryTag longBinaryTag(final long value) {
     return new LongBinaryTagImpl(value);
   }
 
@@ -53,12 +54,12 @@ public interface LongBinaryTag extends NumberBinaryTag {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull LongBinaryTag of(final long value) {
+  static LongBinaryTag of(final long value) {
     return new LongBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<LongBinaryTag> type() {
+  default BinaryTagType<LongBinaryTag> type() {
     return BinaryTagTypes.LONG;
   }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/LongBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/LongBinaryTagImpl.java
index 9b8bd13de1..5a8150cd31 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/LongBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/LongBinaryTagImpl.java
@@ -26,10 +26,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "String.valueOf(this.value) + \"l\"", hasChildren = "false")
+@NullMarked
 final class LongBinaryTagImpl extends AbstractBinaryTag implements LongBinaryTag {
   private final long value;
 
@@ -86,7 +87,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/NumberBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/NumberBinaryTag.java
index 18b20dfea3..195dde7e31 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/NumberBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/NumberBinaryTag.java
@@ -23,16 +23,17 @@
  */
 package net.kyori.adventure.nbt;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A numeric binary tag.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface NumberBinaryTag extends BinaryTag {
   @Override
-  @NotNull BinaryTagType<? extends NumberBinaryTag> type();
+  BinaryTagType<? extends NumberBinaryTag> type();
 
   /**
    * Gets the value as a {@code byte}.
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ShortBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/ShortBinaryTag.java
index 0f14ef9eec..7415e0b2c5 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ShortBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ShortBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding a {@code short} value.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface ShortBinaryTag extends NumberBinaryTag {
   /**
    * Creates a binary tag holding a {@code short} value.
@@ -39,7 +40,7 @@ public interface ShortBinaryTag extends NumberBinaryTag {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull ShortBinaryTag shortBinaryTag(final short value) {
+  static ShortBinaryTag shortBinaryTag(final short value) {
     return new ShortBinaryTagImpl(value);
   }
 
@@ -53,12 +54,12 @@ public interface ShortBinaryTag extends NumberBinaryTag {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull ShortBinaryTag of(final short value) {
+  static ShortBinaryTag of(final short value) {
     return new ShortBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<ShortBinaryTag> type() {
+  default BinaryTagType<ShortBinaryTag> type() {
     return BinaryTagTypes.SHORT;
   }
 
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/ShortBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/ShortBinaryTagImpl.java
index fe9b449263..460b544dae 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/ShortBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/ShortBinaryTagImpl.java
@@ -26,10 +26,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "String.valueOf(this.value) + \"s\"", hasChildren = "false")
+@NullMarked
 final class ShortBinaryTagImpl extends AbstractBinaryTag implements ShortBinaryTag {
   private final short value;
 
@@ -86,7 +87,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/StringBinaryTag.java b/nbt/src/main/java/net/kyori/adventure/nbt/StringBinaryTag.java
index eb67294c2a..0af11df403 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/StringBinaryTag.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/StringBinaryTag.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.nbt;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A binary tag holding a {@link String} value.
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface StringBinaryTag extends BinaryTag {
   /**
    * Creates a binary tag holding a {@link String} value.
@@ -39,7 +40,7 @@ public interface StringBinaryTag extends BinaryTag {
    * @return a binary tag
    * @since 4.14.0
    */
-  static @NotNull StringBinaryTag stringBinaryTag(final @NotNull String value) {
+  static StringBinaryTag stringBinaryTag(final String value) {
     return new StringBinaryTagImpl(value);
   }
 
@@ -53,12 +54,12 @@ public interface StringBinaryTag extends BinaryTag {
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull StringBinaryTag of(final @NotNull String value) {
+  static StringBinaryTag of(final String value) {
     return new StringBinaryTagImpl(value);
   }
 
   @Override
-  default @NotNull BinaryTagType<StringBinaryTag> type() {
+  default BinaryTagType<StringBinaryTag> type() {
     return BinaryTagTypes.STRING;
   }
 
@@ -68,5 +69,5 @@ public interface StringBinaryTag extends BinaryTag {
    * @return the value
    * @since 4.0.0
    */
-  @NotNull String value();
+  String value();
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/StringBinaryTagImpl.java b/nbt/src/main/java/net/kyori/adventure/nbt/StringBinaryTagImpl.java
index c0562533e9..05f666cd98 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/StringBinaryTagImpl.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/StringBinaryTagImpl.java
@@ -26,10 +26,11 @@
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.Debug;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Debug.Renderer(text = "\"\\\"\" + this.value + \"\\\"\"", hasChildren = "false")
+@NullMarked
 final class StringBinaryTagImpl extends AbstractBinaryTag implements StringBinaryTag {
   private final String value;
 
@@ -38,7 +39,7 @@ final class StringBinaryTagImpl extends AbstractBinaryTag implements StringBinar
   }
 
   @Override
-  public @NotNull String value() {
+  public String value() {
     return this.value;
   }
 
@@ -56,7 +57,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/TagStringIO.java b/nbt/src/main/java/net/kyori/adventure/nbt/TagStringIO.java
index cc7a502e18..3e3280949a 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/TagStringIO.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/TagStringIO.java
@@ -26,13 +26,14 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Arrays;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A holder for string tag format options.
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class TagStringIO {
   private static final TagStringIO INSTANCE = new TagStringIO(new Builder());
 
@@ -42,7 +43,7 @@ public final class TagStringIO {
    * @return the basic instance
    * @since 4.0.0
    */
-  public static @NotNull TagStringIO get() {
+  public static TagStringIO get() {
     return INSTANCE;
   }
 
@@ -52,7 +53,7 @@ public final class TagStringIO {
    * @return a builder
    * @since 4.0.0
    */
-  public static @NotNull Builder builder() {
+  public static Builder builder() {
     return new Builder();
   }
 
@@ -60,7 +61,7 @@ public final class TagStringIO {
   private final boolean emitLegacy;
   private final String indent;
 
-  private TagStringIO(final @NotNull Builder builder) {
+  private TagStringIO(final Builder builder) {
     this.acceptLegacy = builder.acceptLegacy;
     this.emitLegacy = builder.emitLegacy;
     this.indent = builder.indent;
@@ -148,7 +149,7 @@ public static class Builder {
      * @return this builder
      * @since 4.0.0
      */
-    public @NotNull Builder indent(final int spaces) {
+    public Builder indent(final int spaces) {
       if (spaces == 0) {
         this.indent = "";
       } else if ((this.indent.length() > 0 && this.indent.charAt(0) != ' ') || spaces != this.indent.length()) {
@@ -168,7 +169,7 @@ public static class Builder {
      * @return this builder
      * @since 4.0.0
      */
-    public @NotNull Builder indentTab(final int tabs) {
+    public Builder indentTab(final int tabs) {
       if (tabs == 0) {
         this.indent = "";
       } else if ((this.indent.length() > 0 && this.indent.charAt(0) != '\t') || tabs != this.indent.length()) {
@@ -191,7 +192,7 @@ public static class Builder {
      * @return this builder
      * @since 4.0.0
      */
-    public @NotNull Builder acceptLegacy(final boolean legacy) {
+    public Builder acceptLegacy(final boolean legacy) {
       this.acceptLegacy = legacy;
       return this;
     }
@@ -203,7 +204,7 @@ public static class Builder {
      * @return this builder
      * @since 4.0.0
      */
-    public @NotNull Builder emitLegacy(final boolean legacy) {
+    public Builder emitLegacy(final boolean legacy) {
       this.emitLegacy = legacy;
       return this;
     }
@@ -214,7 +215,7 @@ public static class Builder {
      * @return new IO configuration
      * @since 4.0.0
      */
-    public @NotNull TagStringIO build() {
+    public TagStringIO build() {
       return new TagStringIO(this);
     }
   }
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/TagStringWriter.java b/nbt/src/main/java/net/kyori/adventure/nbt/TagStringWriter.java
index daad12097a..996fdc376a 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/TagStringWriter.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/TagStringWriter.java
@@ -32,6 +32,7 @@
  *
  * <p>Details on the format are described in the package documentation.</p>
  */
+
 final class TagStringWriter implements AutoCloseable {
   private final Appendable out;
   private final String indent; // TODO: pretty-printing
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/TrackingDataInput.java b/nbt/src/main/java/net/kyori/adventure/nbt/TrackingDataInput.java
index ee91b09618..ef55397636 100644
--- a/nbt/src/main/java/net/kyori/adventure/nbt/TrackingDataInput.java
+++ b/nbt/src/main/java/net/kyori/adventure/nbt/TrackingDataInput.java
@@ -25,9 +25,10 @@
 
 import java.io.DataInput;
 import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class TrackingDataInput implements DataInput, BinaryTagScope {
   private static final int MAX_DEPTH = 512;
   private final DataInput input;
@@ -86,13 +87,13 @@ private void ensureMaxLength(final long expected) throws IOException {
   }
 
   @Override
-  public void readFully(final byte@NotNull[] array) throws IOException {
+  public void readFully(final byte[] array) throws IOException {
     this.counter += array.length;
     this.input.readFully(array);
   }
 
   @Override
-  public void readFully(final byte@NotNull[] array, final int off, final int len) throws IOException {
+  public void readFully(final byte[] array, final int off, final int len) throws IOException {
     this.counter += len;
     this.input.readFully(array, off, len);
   }
@@ -172,7 +173,7 @@ public double readDouble() throws IOException {
   }
 
   @Override
-  public @NotNull String readUTF() throws IOException {
+  public String readUTF() throws IOException {
     final String result = this.input.readUTF();
     this.counter += (result.length() * 2L) + 2; // not entirely accurate, but the closest we can get without doing implementation details
     return result;
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/BlockNBTPosSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/BlockNBTPosSerializer.java
index f1ef7f2f65..139796631b 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/BlockNBTPosSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/BlockNBTPosSerializer.java
@@ -28,9 +28,10 @@
 import net.kyori.adventure.text.BlockNBTComponent;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.ScalarSerializer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class BlockNBTPosSerializer extends ScalarSerializer<BlockNBTComponent.Pos> {
   static final BlockNBTPosSerializer INSTANCE = new BlockNBTPosSerializer();
 
@@ -39,7 +40,7 @@ private BlockNBTPosSerializer() {
   }
 
   @Override
-  public BlockNBTComponent.Pos deserialize(final @NotNull TypeToken<?> type, final @NotNull Object obj) throws ObjectMappingException {
+  public BlockNBTComponent.Pos deserialize(final TypeToken<?> type, final Object obj) throws ObjectMappingException {
     try {
       return BlockNBTComponent.Pos.fromString(obj.toString());
     } catch (final IllegalArgumentException ex) {
@@ -48,7 +49,7 @@ public BlockNBTComponent.Pos deserialize(final @NotNull TypeToken<?> type, final
   }
 
   @Override
-  public Object serialize(final BlockNBTComponent.@NotNull Pos item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final BlockNBTComponent.Pos item, final Predicate<Class<?>> typeSupported) {
     return item.asString();
   }
 }
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/BookTypeSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/BookTypeSerializer.java
index 8fa7d553ad..d1802d3458 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/BookTypeSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/BookTypeSerializer.java
@@ -30,10 +30,11 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class BookTypeSerializer implements TypeSerializer<Book> {
   static final TypeToken<Book> TYPE = TypeToken.of(Book.class);
   static final BookTypeSerializer INSTANCE = new BookTypeSerializer();
@@ -45,7 +46,7 @@ private BookTypeSerializer() {
   }
 
   @Override
-  public Book deserialize(final @NotNull TypeToken<?> type, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public Book deserialize(final TypeToken<?> type, final ConfigurationNode value) throws ObjectMappingException {
     final Component title = value.getNode(TITLE).getValue(ComponentTypeSerializer.TYPE);
     final Component author = value.getNode(AUTHOR).getValue(ComponentTypeSerializer.TYPE);
     final List<Component> pages = value.getNode(PAGES).getValue(ComponentTypeSerializer.LIST_TYPE);
@@ -56,7 +57,7 @@ public Book deserialize(final @NotNull TypeToken<?> type, final @NotNull Configu
   }
 
   @Override
-  public void serialize(final @NotNull TypeToken<?> type, final @Nullable Book obj, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public void serialize(final TypeToken<?> type, final @Nullable Book obj, final ConfigurationNode value) throws ObjectMappingException {
     if (obj == null) {
       value.setValue(null);
       return;
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ComponentTypeSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ComponentTypeSerializer.java
index 66505e4014..9ddd7708bc 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ComponentTypeSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ComponentTypeSerializer.java
@@ -44,10 +44,11 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class ComponentTypeSerializer implements TypeSerializer<Component> {
   static final TypeToken<Component> TYPE = TypeToken.of(Component.class);
   @SuppressWarnings("serial")
@@ -78,11 +79,11 @@ final class ComponentTypeSerializer implements TypeSerializer<Component> {
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull TypeToken<?> type, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public Component deserialize(final TypeToken<?> type, final ConfigurationNode value) throws ObjectMappingException {
     return this.deserialize0(value);
   }
 
-  private @NotNull BuildableComponent<?, ?> deserialize0(final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  private BuildableComponent<?, ?> deserialize0(final ConfigurationNode value) throws ObjectMappingException {
     // Try to read as a string
     if (!value.isList() && !value.isMap()) {
       final String str = value.getString();
@@ -190,7 +191,7 @@ final class ComponentTypeSerializer implements TypeSerializer<Component> {
   }
 
   @Override
-  public void serialize(final @NotNull TypeToken<?> type, final @Nullable Component src, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public void serialize(final TypeToken<?> type, final @Nullable Component src, final ConfigurationNode value) throws ObjectMappingException {
     value.setValue(null);
     if (src == null) {
       return;
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ConfigurateComponentSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ConfigurateComponentSerializer.java
index 2672182802..6a33eccc1d 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ConfigurateComponentSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ConfigurateComponentSerializer.java
@@ -28,7 +28,7 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializerCollection;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A serializer that will output to Configurate {@link ConfigurationNode}s.
@@ -42,6 +42,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface ConfigurateComponentSerializer extends ComponentSerializer<Component, Component, ConfigurationNode> {
   /**
    * Get an instance with default settings.
@@ -49,7 +50,7 @@ public interface ConfigurateComponentSerializer extends ComponentSerializer<Comp
    * @return the shared default instance
    * @since 4.0.0
    */
-  static @NotNull ConfigurateComponentSerializer configurate() {
+  static ConfigurateComponentSerializer configurate() {
     return ConfigurateComponentSerializerImpl.INSTANCE;
   }
 
@@ -59,7 +60,7 @@ public interface ConfigurateComponentSerializer extends ComponentSerializer<Comp
    * @return a new builder
    * @since 4.0.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new ConfigurateComponentSerializerImpl.Builder();
   }
 
@@ -72,7 +73,7 @@ public interface ConfigurateComponentSerializer extends ComponentSerializer<Comp
    * @return input collection
    * @since 4.0.0
    */
-  @NotNull TypeSerializerCollection addSerializersTo(final @NotNull TypeSerializerCollection collection);
+  TypeSerializerCollection addSerializersTo(final TypeSerializerCollection collection);
 
   /**
    * A builder for a configurate serializer instance.
@@ -91,7 +92,7 @@ interface Builder {
      * @return this builder
      * @since 4.0.0
      */
-    @NotNull Builder scalarSerializer(final @NotNull ComponentSerializer<Component, ?, String> stringSerializer);
+    Builder scalarSerializer(final ComponentSerializer<Component, ?, String> stringSerializer);
 
     /**
      * If the {@link #scalarSerializer(ComponentSerializer)} is set, output components as serialized strings
@@ -104,7 +105,7 @@ interface Builder {
      * @return this builder
      * @since 4.0.0
      */
-    @NotNull Builder outputStringComponents(final boolean stringComponents);
+    Builder outputStringComponents(final boolean stringComponents);
 
     /**
      * Create a new component serializer instance.
@@ -112,6 +113,6 @@ interface Builder {
      * @return new serializer
      * @since 4.0.0
      */
-    @NotNull ConfigurateComponentSerializer build();
+    ConfigurateComponentSerializer build();
   }
 }
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ConfigurateComponentSerializerImpl.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ConfigurateComponentSerializerImpl.java
index 1e523ccf58..40625a4ec4 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ConfigurateComponentSerializerImpl.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/ConfigurateComponentSerializerImpl.java
@@ -36,19 +36,20 @@
 import ninja.leaping.configurate.ConfigurationOptions;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializerCollection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class ConfigurateComponentSerializerImpl implements ConfigurateComponentSerializer {
   private final ConfigurationOptions ownNodeOptions;
   private final @Nullable ComponentSerializer<Component, ?, String> stringSerializer;
   private final boolean serializeStringComponents;
   static final ConfigurateComponentSerializer INSTANCE = new Builder().build();
 
-  private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
+  private ConfigurateComponentSerializerImpl(final Builder builder) {
     this.stringSerializer = builder.stringSerializer;
     this.serializeStringComponents = builder.outputStringComponents;
     this.ownNodeOptions = ConfigurationOptions.defaults()
@@ -57,7 +58,7 @@ private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull ConfigurationNode input) {
+  public Component deserialize(final ConfigurationNode input) {
     try {
       final @Nullable Component deserialized = input.getValue(ComponentTypeSerializer.TYPE);
       if (deserialized != null) {
@@ -70,7 +71,7 @@ private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
   }
 
   @Override
-  public @NotNull ConfigurationNode serialize(final @NotNull Component component) {
+  public ConfigurationNode serialize(final Component component) {
     final ConfigurationNode base = ConfigurationNode.root(this.ownNodeOptions);
     try {
       base.setValue(ComponentTypeSerializer.TYPE, component);
@@ -82,7 +83,7 @@ private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
 
   @Override
   @SuppressWarnings("serial")
-  public @NotNull TypeSerializerCollection addSerializersTo(final @NotNull TypeSerializerCollection serializers) {
+  public TypeSerializerCollection addSerializersTo(final TypeSerializerCollection serializers) {
     return serializers
       .register(BookTypeSerializer.TYPE, BookTypeSerializer.INSTANCE)
       .register(TitleSerializer.TYPE, TitleSerializer.INSTANCE)
@@ -112,19 +113,19 @@ static class Builder implements ConfigurateComponentSerializer.Builder {
     }
 
     @Override
-    public ConfigurateComponentSerializer.@NotNull Builder scalarSerializer(final @NotNull ComponentSerializer<Component, ?, String> stringSerializer) {
+    public ConfigurateComponentSerializer.Builder scalarSerializer(final ComponentSerializer<Component, ?, String> stringSerializer) {
       this.stringSerializer = requireNonNull(stringSerializer, "stringSerializer");
       return this;
     }
 
     @Override
-    public ConfigurateComponentSerializer.@NotNull Builder outputStringComponents(final boolean stringComponents) {
+    public ConfigurateComponentSerializer.Builder outputStringComponents(final boolean stringComponents) {
       this.outputStringComponents = stringComponents;
       return this;
     }
 
     @Override
-    public @NotNull ConfigurateComponentSerializer build() {
+    public ConfigurateComponentSerializer build() {
       return new ConfigurateComponentSerializerImpl(this);
     }
   }
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/DurationSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/DurationSerializer.java
index 2e30d66745..5fa9e97e2d 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/DurationSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/DurationSerializer.java
@@ -29,7 +29,7 @@
 import java.util.function.Predicate;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.ScalarSerializer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A serializer for the JDK {@link Duration} type.
@@ -37,6 +37,7 @@
  * <p>This will eventually be incorporated into upstream Configurate</p>
  */
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class DurationSerializer extends ScalarSerializer<Duration> {
   static final DurationSerializer INSTANCE = new DurationSerializer();
 
@@ -45,7 +46,7 @@ private DurationSerializer() {
   }
 
   @Override
-  public Duration deserialize(final @NotNull TypeToken<?> type, final @NotNull Object obj) throws ObjectMappingException {
+  public Duration deserialize(final TypeToken<?> type, final Object obj) throws ObjectMappingException {
     if (obj instanceof CharSequence) {
       String value = obj.toString();
       if (!value.startsWith("P") && !value.startsWith("p")) {
@@ -62,7 +63,7 @@ public Duration deserialize(final @NotNull TypeToken<?> type, final @NotNull Obj
   }
 
   @Override
-  public Object serialize(final @NotNull Duration item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final Duration item, final Predicate<Class<?>> typeSupported) {
     return item.toString();
   }
 }
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/HoverEventShowEntitySerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/HoverEventShowEntitySerializer.java
index d31ae0a667..bf989b5dd5 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/HoverEventShowEntitySerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/HoverEventShowEntitySerializer.java
@@ -31,10 +31,11 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class HoverEventShowEntitySerializer implements TypeSerializer<HoverEvent.ShowEntity> {
   static final HoverEventShowEntitySerializer INSTANCE = new HoverEventShowEntitySerializer();
   static final TypeToken<HoverEvent.ShowEntity> TYPE = TypeToken.of(HoverEvent.ShowEntity.class);
@@ -48,7 +49,7 @@ private HoverEventShowEntitySerializer() {
   }
 
   @Override
-  public HoverEvent.ShowEntity deserialize(final @NotNull TypeToken<?> type, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public HoverEvent.ShowEntity deserialize(final TypeToken<?> type, final ConfigurationNode value) throws ObjectMappingException {
     final Key typeId = value.getNode(ENTITY_TYPE).getValue(KeySerializer.INSTANCE.type());
     final UUID id = value.getNode(ID).getValue(UUID_TYPE);
     if (typeId == null || id == null) {
@@ -60,7 +61,7 @@ public HoverEvent.ShowEntity deserialize(final @NotNull TypeToken<?> type, final
   }
 
   @Override
-  public void serialize(final @NotNull TypeToken<?> type, final HoverEvent.@Nullable ShowEntity obj, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public void serialize(final TypeToken<?> type, final HoverEvent.@Nullable ShowEntity obj, final ConfigurationNode value) throws ObjectMappingException {
     if (obj == null) {
       value.setValue(null);
       return;
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/HoverEventShowItemSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/HoverEventShowItemSerializer.java
index 03741bba24..73d40dfa1a 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/HoverEventShowItemSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/HoverEventShowItemSerializer.java
@@ -30,10 +30,11 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class HoverEventShowItemSerializer implements TypeSerializer<HoverEvent.ShowItem> {
   static final HoverEventShowItemSerializer INSTANCE = new HoverEventShowItemSerializer();
   static final TypeToken<HoverEvent.ShowItem> TYPE = TypeToken.of(HoverEvent.ShowItem.class);
@@ -46,7 +47,7 @@ private HoverEventShowItemSerializer() {
   }
 
   @Override
-  public HoverEvent.ShowItem deserialize(final @NotNull TypeToken<?> type, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public HoverEvent.ShowItem deserialize(final TypeToken<?> type, final ConfigurationNode value) throws ObjectMappingException {
     final Key id = value.getNode(ID).getValue(KeySerializer.INSTANCE.type());
     if (id == null) {
       throw new ObjectMappingException("An id is required to deserialize the show_item hover event");
@@ -58,7 +59,7 @@ public HoverEvent.ShowItem deserialize(final @NotNull TypeToken<?> type, final @
   }
 
   @Override
-  public void serialize(final @NotNull TypeToken<?> type, final HoverEvent.@Nullable ShowItem obj, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public void serialize(final TypeToken<?> type, final HoverEvent.@Nullable ShowItem obj, final ConfigurationNode value) throws ObjectMappingException {
     if (obj == null) {
       value.setValue(null);
       return;
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/IndexSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/IndexSerializer.java
index 7a23b03660..5dd37e25e0 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/IndexSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/IndexSerializer.java
@@ -28,19 +28,20 @@
 import net.kyori.adventure.util.Index;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.ScalarSerializer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class IndexSerializer<T> extends ScalarSerializer<T> {
   private final Index<String, T> idx;
 
-  IndexSerializer(final @NotNull TypeToken<T> type, final @NotNull Index<String, T> idx) {
+  IndexSerializer(final TypeToken<T> type, final Index<String, T> idx) {
     super(type);
     this.idx = idx;
   }
 
   @Override
-  public @NotNull T deserialize(final @NotNull TypeToken<?> type, final @NotNull Object obj) throws ObjectMappingException {
+  public T deserialize(final TypeToken<?> type, final Object obj) throws ObjectMappingException {
     final T value = this.idx.value(obj.toString());
     if (value == null) {
       throw new ObjectMappingException("No value for key '" + obj + "' in index for type " + this.type());
@@ -49,7 +50,7 @@ final class IndexSerializer<T> extends ScalarSerializer<T> {
   }
 
   @Override
-  public Object serialize(final @NotNull T item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final T item, final Predicate<Class<?>> typeSupported) {
     return this.idx.key(item);
   }
 }
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/KeySerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/KeySerializer.java
index 97e74f6be1..ac3b8a031d 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/KeySerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/KeySerializer.java
@@ -30,9 +30,10 @@
 import ninja.leaping.configurate.objectmapping.InvalidTypeException;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.ScalarSerializer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class KeySerializer extends ScalarSerializer<Key> {
   static final KeySerializer INSTANCE = new KeySerializer();
 
@@ -41,7 +42,7 @@ private KeySerializer() {
   }
 
   @Override
-  public @NotNull Key deserialize(final @NotNull TypeToken<?> type, final @NotNull Object obj) throws ObjectMappingException {
+  public Key deserialize(final TypeToken<?> type, final Object obj) throws ObjectMappingException {
     if (!(obj instanceof CharSequence)) {
       throw new InvalidTypeException(type);
     }
@@ -53,7 +54,7 @@ private KeySerializer() {
   }
 
   @Override
-  public @NotNull Object serialize(final @NotNull Key item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final Key item, final Predicate<Class<?>> typeSupported) {
     return item.asString();
   }
 }
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/SoundSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/SoundSerializer.java
index 8f20fd33f0..90a9613b39 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/SoundSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/SoundSerializer.java
@@ -30,10 +30,11 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class SoundSerializer implements TypeSerializer<Sound> {
   static final TypeToken<Sound> TYPE = TypeToken.of(Sound.class);
   static final TypeToken<Sound.Source> SOURCE_TYPE = TypeToken.of(Sound.Source.class);
@@ -49,7 +50,7 @@ private SoundSerializer() {
   }
 
   @Override
-  public @Nullable Sound deserialize(final @NotNull TypeToken<?> type, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public @Nullable Sound deserialize(final TypeToken<?> type, final ConfigurationNode value) throws ObjectMappingException {
     if (value.isEmpty()) {
       return null;
     }
@@ -75,7 +76,7 @@ private SoundSerializer() {
   }
 
   @Override
-  public void serialize(final @NotNull TypeToken<?> type, final @Nullable Sound obj, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public void serialize(final TypeToken<?> type, final @Nullable Sound obj, final ConfigurationNode value) throws ObjectMappingException {
     if (obj == null) {
       value.setValue(null);
       return;
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/SoundStopSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/SoundStopSerializer.java
index 28ea1590a9..b0d6edbb58 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/SoundStopSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/SoundStopSerializer.java
@@ -31,8 +31,7 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
 final class SoundStopSerializer implements TypeSerializer<SoundStop> {
@@ -46,7 +45,7 @@ private SoundStopSerializer() {
   }
 
   @Override
-  public SoundStop deserialize(final @NotNull TypeToken<?> type, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public SoundStop deserialize(final TypeToken<?> type, final ConfigurationNode value) throws ObjectMappingException {
     if (value.isEmpty()) {
       return SoundStop.all();
     } else {
@@ -61,7 +60,7 @@ public SoundStop deserialize(final @NotNull TypeToken<?> type, final @NotNull Co
   }
 
   @Override
-  public void serialize(final @NotNull TypeToken<?> type, final @Nullable SoundStop obj, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public void serialize(final TypeToken<?> type, final @Nullable SoundStop obj, final ConfigurationNode value) throws ObjectMappingException {
     value.getNode(SOUND).setValue(KeySerializer.INSTANCE.type(), obj == null ? null : obj.sound());
     value.getNode(SOURCE).setValue(SoundSerializer.SOURCE_TYPE, obj == null ? null : obj.source());
     if (value.isEmpty()) {
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/StyleSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/StyleSerializer.java
index 8999a648de..50b10b3bce 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/StyleSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/StyleSerializer.java
@@ -34,10 +34,11 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class StyleSerializer implements TypeSerializer<Style> {
   static final TypeToken<Style> TYPE = TypeToken.of(Style.class);
   static final StyleSerializer INSTANCE = new StyleSerializer();
@@ -63,7 +64,7 @@ private StyleSerializer() {
   }
 
   @Override
-  public @NotNull Style deserialize(final @NotNull TypeToken<?> type, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public Style deserialize(final TypeToken<?> type, final ConfigurationNode value) throws ObjectMappingException {
     if (value.isVirtual()) {
       return Style.empty();
     }
@@ -129,7 +130,7 @@ private StyleSerializer() {
   }
 
   @Override
-  public void serialize(final @NotNull TypeToken<?> type, @Nullable Style obj, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public void serialize(final TypeToken<?> type, @Nullable Style obj, final ConfigurationNode value) throws ObjectMappingException {
     if (obj == null) {
       obj = Style.empty();
     }
@@ -172,7 +173,7 @@ public void serialize(final @NotNull TypeToken<?> type, @Nullable Style obj, fin
     }
   }
 
-  private static <T> @NotNull T nonNull(final @Nullable T value, final @NotNull String type) throws ObjectMappingException {
+  private static <T> T nonNull(final @Nullable T value, final String type) throws ObjectMappingException {
     if (value == null) {
       throw new ObjectMappingException(type + " was null in an unexpected location");
     }
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TextColorSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TextColorSerializer.java
index 73b3174600..9682215ca8 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TextColorSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TextColorSerializer.java
@@ -29,9 +29,10 @@
 import net.kyori.adventure.text.format.TextColor;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.ScalarSerializer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class TextColorSerializer extends ScalarSerializer<TextColor> {
   static final TextColorSerializer INSTANCE = new TextColorSerializer();
 
@@ -40,7 +41,7 @@ private TextColorSerializer() {
   }
 
   @Override
-  public TextColor deserialize(final @NotNull TypeToken<?> type, final @NotNull Object obj) throws ObjectMappingException {
+  public TextColor deserialize(final TypeToken<?> type, final Object obj) throws ObjectMappingException {
     if (obj instanceof Number) { // numerical values
       return TextColor.color(((Number) obj).intValue());
     } else if (!(obj instanceof CharSequence)) {
@@ -60,7 +61,7 @@ public TextColor deserialize(final @NotNull TypeToken<?> type, final @NotNull Ob
   }
 
   @Override
-  public Object serialize(final @NotNull TextColor item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final TextColor item, final Predicate<Class<?>> typeSupported) {
     if (item instanceof NamedTextColor) { // TODO: Downsampling
       return NamedTextColor.NAMES.key((NamedTextColor) item);
     } else {
diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java
index 6308ed7a2f..4bda751ddc 100644
--- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java
+++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java
@@ -31,10 +31,11 @@
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage") // TypeToken
+@NullMarked
 final class TitleSerializer implements TypeSerializer<Title> {
   static final TypeToken<Title> TYPE = TypeToken.of(Title.class);
   static final TitleSerializer INSTANCE = new TitleSerializer();
@@ -51,7 +52,7 @@ private TitleSerializer() {
   static final String FADE_OUT = "fade-out";
 
   @Override
-  public @Nullable Title deserialize(final @NotNull TypeToken<?> type, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public @Nullable Title deserialize(final TypeToken<?> type, final ConfigurationNode value) throws ObjectMappingException {
     if (value.isEmpty()) {
       return null;
     }
@@ -70,7 +71,7 @@ private TitleSerializer() {
   }
 
   @Override
-  public void serialize(final @NotNull TypeToken<?> type, final @Nullable Title obj, final @NotNull ConfigurationNode value) throws ObjectMappingException {
+  public void serialize(final TypeToken<?> type, final @Nullable Title obj, final ConfigurationNode value) throws ObjectMappingException {
     if (obj == null) {
       value.setValue(null);
       return;
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/BlockNBTPosSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/BlockNBTPosSerializer.java
index 3ab3675782..7ead7081b8 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/BlockNBTPosSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/BlockNBTPosSerializer.java
@@ -26,10 +26,11 @@
 import java.lang.reflect.Type;
 import java.util.function.Predicate;
 import net.kyori.adventure.text.BlockNBTComponent;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.spongepowered.configurate.serialize.ScalarSerializer;
 import org.spongepowered.configurate.serialize.SerializationException;
 
+@NullMarked
 final class BlockNBTPosSerializer extends ScalarSerializer<BlockNBTComponent.Pos> {
   static final BlockNBTPosSerializer INSTANCE = new BlockNBTPosSerializer();
 
@@ -38,7 +39,7 @@ private BlockNBTPosSerializer() {
   }
 
   @Override
-  public BlockNBTComponent.Pos deserialize(final @NotNull Type type, final @NotNull Object obj) throws SerializationException {
+  public BlockNBTComponent.Pos deserialize(final Type type, final Object obj) throws SerializationException {
     try {
       return BlockNBTComponent.Pos.fromString(obj.toString());
     } catch (final IllegalArgumentException ex) {
@@ -47,7 +48,7 @@ public BlockNBTComponent.Pos deserialize(final @NotNull Type type, final @NotNul
   }
 
   @Override
-  public Object serialize(final BlockNBTComponent.@NotNull Pos item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final BlockNBTComponent.Pos item, final Predicate<Class<?>> typeSupported) {
     return item.asString();
   }
 }
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/BookTypeSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/BookTypeSerializer.java
index fbca9769fe..cf0f5e9033 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/BookTypeSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/BookTypeSerializer.java
@@ -27,12 +27,13 @@
 import java.util.List;
 import net.kyori.adventure.inventory.Book;
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
+@NullMarked
 final class BookTypeSerializer implements TypeSerializer<Book> {
   static final BookTypeSerializer INSTANCE = new BookTypeSerializer();
   static final String TITLE = "title";
@@ -43,7 +44,7 @@ private BookTypeSerializer() {
   }
 
   @Override
-  public Book deserialize(final @NotNull Type type, final @NotNull ConfigurationNode value) throws SerializationException {
+  public Book deserialize(final Type type, final ConfigurationNode value) throws SerializationException {
     final Component title = value.node(TITLE).get(Component.class);
     final Component author = value.node(AUTHOR).get(Component.class);
     final List<Component> pages = value.node(PAGES).get(ComponentTypeSerializer.LIST_TYPE);
@@ -54,7 +55,7 @@ public Book deserialize(final @NotNull Type type, final @NotNull ConfigurationNo
   }
 
   @Override
-  public void serialize(final @NotNull Type type, final @Nullable Book obj, final @NotNull ConfigurationNode value) throws SerializationException {
+  public void serialize(final Type type, final @Nullable Book obj, final ConfigurationNode value) throws SerializationException {
     if (obj == null) {
       value.set(null);
       return;
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ComponentTypeSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ComponentTypeSerializer.java
index 3d62d0bbb3..1282bd06fe 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ComponentTypeSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ComponentTypeSerializer.java
@@ -42,12 +42,13 @@
 import net.kyori.adventure.text.TranslatableComponent;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
+@NullMarked
 final class ComponentTypeSerializer implements TypeSerializer<Component> {
   static final TypeToken<List<Component>> LIST_TYPE = new TypeToken<List<Component>>() {};
   static final String TEXT = "text";
@@ -76,11 +77,11 @@ final class ComponentTypeSerializer implements TypeSerializer<Component> {
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull Type type, final @NotNull ConfigurationNode value) throws SerializationException {
+  public Component deserialize(final Type type, final ConfigurationNode value) throws SerializationException {
     return this.deserialize0(value);
   }
 
-  private @NotNull BuildableComponent<?, ?> deserialize0(final @NotNull ConfigurationNode value) throws SerializationException {
+  private BuildableComponent<?, ?> deserialize0(final ConfigurationNode value) throws SerializationException {
     // Try to read as a string
     if (!value.isList() && !value.isMap()) {
       final String str = value.getString();
@@ -188,7 +189,7 @@ final class ComponentTypeSerializer implements TypeSerializer<Component> {
   }
 
   @Override
-  public void serialize(final @NotNull Type type, final @Nullable Component src, final @NotNull ConfigurationNode value) throws SerializationException {
+  public void serialize(final Type type, final @Nullable Component src, final ConfigurationNode value) throws SerializationException {
     value.set(null);
     if (src == null) {
       return;
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializer.java
index 90d96423ca..7272edbba9 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializer.java
@@ -25,7 +25,7 @@
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 import org.spongepowered.configurate.serialize.TypeSerializerCollection;
@@ -42,6 +42,7 @@
  *
  * @since 4.2.0
  */
+@NullMarked
 public interface ConfigurateComponentSerializer extends ComponentSerializer<Component, Component, ConfigurationNode> {
   /**
    * Get an instance with default settings.
@@ -49,7 +50,7 @@ public interface ConfigurateComponentSerializer extends ComponentSerializer<Comp
    * @return the shared default instance
    * @since 4.2.0
    */
-  static @NotNull ConfigurateComponentSerializer configurate() {
+  static ConfigurateComponentSerializer configurate() {
     return ConfigurateComponentSerializerImpl.INSTANCE;
   }
 
@@ -59,7 +60,7 @@ public interface ConfigurateComponentSerializer extends ComponentSerializer<Comp
    * @return a new builder
    * @since 4.2.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new ConfigurateComponentSerializerImpl.Builder();
   }
 
@@ -69,7 +70,7 @@ public interface ConfigurateComponentSerializer extends ComponentSerializer<Comp
    * @return a collection containing Adventure serializers
    * @since 4.2.0
    */
-  @NotNull TypeSerializerCollection serializers();
+  TypeSerializerCollection serializers();
 
   /**
    * A builder for a configurate serializer instance.
@@ -88,7 +89,7 @@ interface Builder {
      * @return this builder
      * @since 4.2.0
      */
-    @NotNull Builder scalarSerializer(final @NotNull ComponentSerializer<Component, ?, String> stringSerializer);
+    Builder scalarSerializer(final ComponentSerializer<Component, ?, String> stringSerializer);
 
     /**
      * If the {@link #scalarSerializer(ComponentSerializer)} is set, output components as serialized strings
@@ -101,7 +102,7 @@ interface Builder {
      * @return this builder
      * @since 4.2.0
      */
-    @NotNull Builder outputStringComponents(final boolean stringComponents);
+    Builder outputStringComponents(final boolean stringComponents);
 
     /**
      * Create a new component serializer instance.
@@ -109,6 +110,6 @@ interface Builder {
      * @return new serializer
      * @since 4.2.0
      */
-    @NotNull ConfigurateComponentSerializer build();
+    ConfigurateComponentSerializer build();
   }
 }
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializerImpl.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializerImpl.java
index afd0fed0f5..3a12a8c2b9 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializerImpl.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializerImpl.java
@@ -34,8 +34,8 @@
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import net.kyori.adventure.title.Title;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.BasicConfigurationNode;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.ConfigurationOptions;
@@ -45,6 +45,7 @@
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class ConfigurateComponentSerializerImpl implements ConfigurateComponentSerializer {
   static final ConfigurateComponentSerializer INSTANCE = new Builder().build();
   private final TypeSerializerCollection serializers;
@@ -52,7 +53,7 @@ final class ConfigurateComponentSerializerImpl implements ConfigurateComponentSe
   private final @Nullable ComponentSerializer<Component, ?, String> stringSerializer;
   private final boolean serializeStringComponents;
 
-  private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
+  private ConfigurateComponentSerializerImpl(final Builder builder) {
     this.stringSerializer = builder.stringSerializer;
     this.serializeStringComponents = builder.outputStringComponents;
     this.serializers = this.makeSerializers(TypeSerializerCollection.defaults().childBuilder());
@@ -62,7 +63,7 @@ private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull ConfigurationNode input) {
+  public Component deserialize(final ConfigurationNode input) {
     try {
       final @Nullable Component deserialized = input.get(Component.class);
       if (deserialized != null) {
@@ -75,7 +76,7 @@ private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
   }
 
   @Override
-  public @NotNull ConfigurationNode serialize(final @NotNull Component component) {
+  public ConfigurationNode serialize(final Component component) {
     final ConfigurationNode base = BasicConfigurationNode.root(this.ownNodeOptions);
     try {
       base.set(Component.class, component);
@@ -85,7 +86,7 @@ private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
     return base;
   }
 
-  private @NotNull TypeSerializerCollection makeSerializers(final TypeSerializerCollection.@NotNull Builder serializers) {
+  private TypeSerializerCollection makeSerializers(final TypeSerializerCollection.Builder serializers) {
     return serializers
       .register(Book.class, BookTypeSerializer.INSTANCE)
       .register(Title.class, TitleSerializer.INSTANCE)
@@ -109,7 +110,7 @@ private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
   }
 
   @Override
-  public @NotNull TypeSerializerCollection serializers() {
+  public TypeSerializerCollection serializers() {
     return this.serializers;
   }
 
@@ -121,19 +122,19 @@ static class Builder implements ConfigurateComponentSerializer.Builder {
     }
 
     @Override
-    public ConfigurateComponentSerializer.@NotNull Builder scalarSerializer(final @NotNull ComponentSerializer<Component, ?, String> stringSerializer) {
+    public ConfigurateComponentSerializer.Builder scalarSerializer(final ComponentSerializer<Component, ?, String> stringSerializer) {
       this.stringSerializer = requireNonNull(stringSerializer, "stringSerializer");
       return this;
     }
 
     @Override
-    public ConfigurateComponentSerializer.@NotNull Builder outputStringComponents(final boolean stringComponents) {
+    public ConfigurateComponentSerializer.Builder outputStringComponents(final boolean stringComponents) {
       this.outputStringComponents = stringComponents;
       return this;
     }
 
     @Override
-    public @NotNull ConfigurateComponentSerializer build() {
+    public ConfigurateComponentSerializer build() {
       return new ConfigurateComponentSerializerImpl(this);
     }
   }
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/DurationSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/DurationSerializer.java
index d27a915655..6f2587b9c6 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/DurationSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/DurationSerializer.java
@@ -27,7 +27,7 @@
 import java.time.Duration;
 import java.time.format.DateTimeParseException;
 import java.util.function.Predicate;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.spongepowered.configurate.serialize.ScalarSerializer;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -36,6 +36,7 @@
  *
  * <p>This will eventually be incorporated into upstream Configurate.</p>
  */
+@NullMarked
 final class DurationSerializer extends ScalarSerializer<Duration> {
   static final DurationSerializer INSTANCE = new DurationSerializer();
 
@@ -44,7 +45,7 @@ private DurationSerializer() {
   }
 
   @Override
-  public Duration deserialize(final @NotNull Type type, final @NotNull Object obj) throws SerializationException {
+  public Duration deserialize(final Type type, final Object obj) throws SerializationException {
     if (obj instanceof CharSequence) {
       String value = obj.toString();
       if (!value.startsWith("P") && !value.startsWith("p")) {
@@ -61,7 +62,7 @@ public Duration deserialize(final @NotNull Type type, final @NotNull Object obj)
   }
 
   @Override
-  public Object serialize(final @NotNull Duration item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final Duration item, final Predicate<Class<?>> typeSupported) {
     return item.toString();
   }
 }
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/HoverEventShowEntitySerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/HoverEventShowEntitySerializer.java
index 814086050d..007ba771fa 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/HoverEventShowEntitySerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/HoverEventShowEntitySerializer.java
@@ -28,12 +28,13 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
+@NullMarked
 final class HoverEventShowEntitySerializer implements TypeSerializer<HoverEvent.ShowEntity> {
   static final HoverEventShowEntitySerializer INSTANCE = new HoverEventShowEntitySerializer();
 
@@ -45,7 +46,7 @@ private HoverEventShowEntitySerializer() {
   }
 
   @Override
-  public HoverEvent.ShowEntity deserialize(final @NotNull Type type, final @NotNull ConfigurationNode value) throws SerializationException {
+  public HoverEvent.ShowEntity deserialize(final Type type, final ConfigurationNode value) throws SerializationException {
     final Key typeId = value.node(ENTITY_TYPE).get(Key.class);
     final UUID id = value.node(ID).get(UUID.class);
     if (typeId == null || id == null) {
@@ -57,7 +58,7 @@ public HoverEvent.ShowEntity deserialize(final @NotNull Type type, final @NotNul
   }
 
   @Override
-  public void serialize(final @NotNull Type type, final HoverEvent.@Nullable ShowEntity obj, final @NotNull ConfigurationNode value) throws SerializationException {
+  public void serialize(final Type type, final HoverEvent.@Nullable ShowEntity obj, final ConfigurationNode value) throws SerializationException {
     if (obj == null) {
       value.set(null);
       return;
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/HoverEventShowItemSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/HoverEventShowItemSerializer.java
index c9721752b3..a1da26d24e 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/HoverEventShowItemSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/HoverEventShowItemSerializer.java
@@ -27,12 +27,13 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.nbt.api.BinaryTagHolder;
 import net.kyori.adventure.text.event.HoverEvent;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
+@NullMarked
 final class HoverEventShowItemSerializer implements TypeSerializer<HoverEvent.ShowItem> {
   static final HoverEventShowItemSerializer INSTANCE = new HoverEventShowItemSerializer();
 
@@ -44,7 +45,7 @@ private HoverEventShowItemSerializer() {
   }
 
   @Override
-  public HoverEvent.ShowItem deserialize(final @NotNull Type type, final @NotNull ConfigurationNode value) throws SerializationException {
+  public HoverEvent.ShowItem deserialize(final Type type, final ConfigurationNode value) throws SerializationException {
     final Key id = value.node(ID).get(Key.class);
     if (id == null) {
       throw new SerializationException("An id is required to deserialize the show_item hover event");
@@ -56,7 +57,7 @@ public HoverEvent.ShowItem deserialize(final @NotNull Type type, final @NotNull
   }
 
   @Override
-  public void serialize(final @NotNull Type type, final HoverEvent.@Nullable ShowItem obj, final @NotNull ConfigurationNode value) throws SerializationException {
+  public void serialize(final Type type, final HoverEvent.@Nullable ShowItem obj, final ConfigurationNode value) throws SerializationException {
     if (obj == null) {
       value.set(null);
       return;
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/IndexSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/IndexSerializer.java
index e3354e82ec..d66196fa58 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/IndexSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/IndexSerializer.java
@@ -27,20 +27,21 @@
 import java.lang.reflect.Type;
 import java.util.function.Predicate;
 import net.kyori.adventure.util.Index;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.spongepowered.configurate.serialize.ScalarSerializer;
 import org.spongepowered.configurate.serialize.SerializationException;
 
+@NullMarked
 final class IndexSerializer<T> extends ScalarSerializer<T> {
   private final Index<String, T> idx;
 
-  IndexSerializer(final @NotNull TypeToken<T> type, final @NotNull Index<String, T> idx) {
+  IndexSerializer(final TypeToken<T> type, final Index<String, T> idx) {
     super(type);
     this.idx = idx;
   }
 
   @Override
-  public @NotNull T deserialize(final @NotNull Type type, final @NotNull Object obj) throws SerializationException {
+  public T deserialize(final Type type, final Object obj) throws SerializationException {
     final T value = this.idx.value(obj.toString());
     if (value == null) {
       throw new SerializationException("No value for key '" + obj + "' in index for type " + this.type());
@@ -49,7 +50,7 @@ final class IndexSerializer<T> extends ScalarSerializer<T> {
   }
 
   @Override
-  public Object serialize(final @NotNull T item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final T item, final Predicate<Class<?>> typeSupported) {
     return this.idx.key(item);
   }
 }
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/KeySerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/KeySerializer.java
index 04fd776e07..feac74cf17 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/KeySerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/KeySerializer.java
@@ -27,11 +27,12 @@
 import java.util.function.Predicate;
 import net.kyori.adventure.key.InvalidKeyException;
 import net.kyori.adventure.key.Key;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.spongepowered.configurate.serialize.CoercionFailedException;
 import org.spongepowered.configurate.serialize.ScalarSerializer;
 import org.spongepowered.configurate.serialize.SerializationException;
 
+@NullMarked
 final class KeySerializer extends ScalarSerializer<Key> {
   static final KeySerializer INSTANCE = new KeySerializer();
 
@@ -40,7 +41,7 @@ private KeySerializer() {
   }
 
   @Override
-  public @NotNull Key deserialize(final @NotNull Type type, final @NotNull Object obj) throws SerializationException {
+  public Key deserialize(final Type type, final Object obj) throws SerializationException {
     if (!(obj instanceof CharSequence)) {
       throw new CoercionFailedException(obj, "string");
     }
@@ -52,7 +53,7 @@ private KeySerializer() {
   }
 
   @Override
-  public @NotNull Object serialize(final @NotNull Key item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final Key item, final Predicate<Class<?>> typeSupported) {
     return item.asString();
   }
 }
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/SoundSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/SoundSerializer.java
index 97b07e10d3..f8915fd5cb 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/SoundSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/SoundSerializer.java
@@ -27,12 +27,13 @@
 import java.util.OptionalLong;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.sound.Sound;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
+@NullMarked
 final class SoundSerializer implements TypeSerializer<Sound> {
   static final SoundSerializer INSTANCE = new SoundSerializer();
 
@@ -46,7 +47,7 @@ private SoundSerializer() {
   }
 
   @Override
-  public @Nullable Sound deserialize(final @NotNull Type type, final @NotNull ConfigurationNode value) throws SerializationException {
+  public @Nullable Sound deserialize(final Type type, final ConfigurationNode value) throws SerializationException {
     if (value.empty()) {
       return null;
     }
@@ -71,7 +72,7 @@ private SoundSerializer() {
   }
 
   @Override
-  public void serialize(final @NotNull Type type, final @Nullable Sound obj, final @NotNull ConfigurationNode value) throws SerializationException {
+  public void serialize(final Type type, final @Nullable Sound obj, final ConfigurationNode value) throws SerializationException {
     if (obj == null) {
       value.set(null);
       return;
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/SoundStopSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/SoundStopSerializer.java
index 7754f83cbd..96559f91aa 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/SoundStopSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/SoundStopSerializer.java
@@ -28,12 +28,13 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.sound.Sound;
 import net.kyori.adventure.sound.SoundStop;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
+@NullMarked
 final class SoundStopSerializer implements TypeSerializer<SoundStop> {
   static final SoundStopSerializer INSTANCE = new SoundStopSerializer();
 
@@ -44,7 +45,7 @@ private SoundStopSerializer() {
   }
 
   @Override
-  public SoundStop deserialize(final @NotNull Type type, final @NotNull ConfigurationNode value) throws SerializationException {
+  public SoundStop deserialize(final Type type, final ConfigurationNode value) throws SerializationException {
     if (value.empty()) {
       return SoundStop.all();
     } else {
@@ -59,7 +60,7 @@ public SoundStop deserialize(final @NotNull Type type, final @NotNull Configurat
   }
 
   @Override
-  public void serialize(final @NotNull Type type, final @Nullable SoundStop obj, final @NotNull ConfigurationNode value) throws SerializationException {
+  public void serialize(final Type type, final @Nullable SoundStop obj, final ConfigurationNode value) throws SerializationException {
     value.node(SOUND).set(Key.class, obj == null ? null : obj.sound());
     value.node(SOURCE).set(Sound.Source.class, obj == null ? null : obj.source());
     if (value.empty()) {
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/StyleSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/StyleSerializer.java
index 4812e6b13a..e7e01fa9e7 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/StyleSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/StyleSerializer.java
@@ -32,13 +32,14 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.ConfigurationOptions;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
+@NullMarked
 final class StyleSerializer implements TypeSerializer<Style> {
   static final StyleSerializer INSTANCE = new StyleSerializer();
 
@@ -60,7 +61,7 @@ private StyleSerializer() {
   }
 
   @Override
-  public @NotNull Style deserialize(final @NotNull Type type, final @NotNull ConfigurationNode value) throws SerializationException {
+  public Style deserialize(final Type type, final ConfigurationNode value) throws SerializationException {
     if (value.virtual()) {
       return Style.empty();
     }
@@ -126,7 +127,7 @@ private StyleSerializer() {
   }
 
   @Override
-  public void serialize(final @NotNull Type type, @Nullable Style obj, final @NotNull ConfigurationNode value) throws SerializationException {
+  public void serialize(final Type type, @Nullable Style obj, final ConfigurationNode value) throws SerializationException {
     if (obj == null) {
       obj = Style.empty();
     }
@@ -169,7 +170,7 @@ public void serialize(final @NotNull Type type, @Nullable Style obj, final @NotN
     }
   }
 
-  private static <T> @NotNull T nonNull(final @Nullable T value, final @NotNull String type) throws SerializationException {
+  private static <T> T nonNull(final @Nullable T value, final String type) throws SerializationException {
     if (value == null) {
       throw new SerializationException(type + " was null in an unexpected location");
     }
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TextColorSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TextColorSerializer.java
index 4b1d9e8a07..d421719043 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TextColorSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TextColorSerializer.java
@@ -27,10 +27,11 @@
 import java.util.function.Predicate;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.spongepowered.configurate.serialize.ScalarSerializer;
 import org.spongepowered.configurate.serialize.SerializationException;
 
+@NullMarked
 final class TextColorSerializer extends ScalarSerializer<TextColor> {
   static final TextColorSerializer INSTANCE = new TextColorSerializer();
 
@@ -39,7 +40,7 @@ private TextColorSerializer() {
   }
 
   @Override
-  public TextColor deserialize(final @NotNull Type type, final @NotNull Object obj) throws SerializationException {
+  public TextColor deserialize(final Type type, final Object obj) throws SerializationException {
     if (obj instanceof Number) { // numerical values
       return TextColor.color(((Number) obj).intValue());
     } else if (!(obj instanceof CharSequence)) {
@@ -59,7 +60,7 @@ public TextColor deserialize(final @NotNull Type type, final @NotNull Object obj
   }
 
   @Override
-  public Object serialize(final @NotNull TextColor item, final @NotNull Predicate<Class<?>> typeSupported) {
+  public Object serialize(final TextColor item, final Predicate<Class<?>> typeSupported) {
     if (item instanceof NamedTextColor) { // TODO: Downsampling
       return NamedTextColor.NAMES.key((NamedTextColor) item);
     } else {
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java
index 584588226c..75bdbef742 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java
@@ -28,12 +28,13 @@
 import java.util.Objects;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.title.Title;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
+@NullMarked
 final class TitleSerializer implements TypeSerializer<Title> {
   static final TitleSerializer INSTANCE = new TitleSerializer();
 
@@ -49,7 +50,7 @@ private TitleSerializer() {
   static final String FADE_OUT = "fade-out";
 
   @Override
-  public @Nullable Title deserialize(final @NotNull Type type, final @NotNull ConfigurationNode value) throws SerializationException {
+  public @Nullable Title deserialize(final Type type, final ConfigurationNode value) throws SerializationException {
     if (value.empty()) {
       return null;
     }
@@ -68,7 +69,7 @@ private TitleSerializer() {
   }
 
   @Override
-  public void serialize(final @NotNull Type type, final @Nullable Title obj, final @NotNull ConfigurationNode value) throws SerializationException {
+  public void serialize(final Type type, final @Nullable Title obj, final ConfigurationNode value) throws SerializationException {
     if (obj == null) {
       value.set(null);
       return;
diff --git a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/ComponentLogger.java b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/ComponentLogger.java
index ac3656bf13..c95c8838f0 100644
--- a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/ComponentLogger.java
+++ b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/ComponentLogger.java
@@ -24,8 +24,8 @@
 package net.kyori.adventure.text.logger.slf4j;
 
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
 
@@ -40,6 +40,7 @@
  *
  * @since 4.11.0
  */
+@NullMarked
 public interface ComponentLogger extends Logger {
   /**
    * Get a logger instance with the name of the calling class.
@@ -51,7 +52,7 @@ public interface ComponentLogger extends Logger {
    * @return a logger with the name of the calling class
    * @since 4.11.0
    */
-  static @NotNull ComponentLogger logger() {
+  static ComponentLogger logger() {
     return logger(CallerClassFinder.callingClassName());
   }
 
@@ -64,7 +65,7 @@ public interface ComponentLogger extends Logger {
    * @return a logger with the provided name
    * @since 4.11.0
    */
-  static @NotNull ComponentLogger logger(final @NotNull String name) {
+  static ComponentLogger logger(final String name) {
     return Handler.logger(requireNonNull(name, "name"));
   }
 
@@ -77,7 +78,7 @@ public interface ComponentLogger extends Logger {
    * @return a logger with the name of the calling class
    * @since 4.11.0
    */
-  static @NotNull ComponentLogger logger(final @NotNull Class<?> clazz) {
+  static ComponentLogger logger(final Class<?> clazz) {
     return logger(clazz.getName());
   }
 
@@ -87,7 +88,7 @@ public interface ComponentLogger extends Logger {
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void trace(final @NotNull Component msg);
+  void trace(final Component msg);
 
   /**
    * Log a message at the TRACE level according to the specified format
@@ -100,7 +101,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void trace(final @NotNull Component format, final @Nullable Object arg);
+  void trace(final Component format, final @Nullable Object arg);
 
   /**
    * Log a message at the TRACE level according to the specified format
@@ -114,7 +115,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void trace(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void trace(final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * Log a message at the TRACE level according to the specified format
@@ -130,7 +131,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void trace(final @NotNull Component format, final @Nullable Object @NotNull... arguments);
+  void trace(final Component format, final @Nullable Object... arguments);
 
   /**
    * Log an exception (throwable) at the TRACE level with an
@@ -140,7 +141,7 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void trace(final @NotNull Component msg, final @Nullable Throwable t);
+  void trace(final Component msg, final @Nullable Throwable t);
 
   /**
    * Log a message with the specific Marker at the TRACE level.
@@ -149,7 +150,7 @@ public interface ComponentLogger extends Logger {
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void trace(final @NotNull Marker marker, final @NotNull Component msg);
+  void trace(final Marker marker, final Component msg);
 
   /**
    * This method is similar to {@link #trace(Component, Object)} method except that the
@@ -160,7 +161,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void trace(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg);
+  void trace(final Marker marker, final Component format, final @Nullable Object arg);
 
   /**
    * This method is similar to {@link #trace(Component, Object, Object)}
@@ -173,7 +174,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void trace(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void trace(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * This method is similar to {@link #trace(Component, Object...)}
@@ -185,7 +186,7 @@ public interface ComponentLogger extends Logger {
    * @param argArray an array of arguments
    * @since 4.11.0
    */
-  void trace(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object @NotNull... argArray);
+  void trace(final Marker marker, final Component format, final @Nullable Object... argArray);
 
   /**
    * This method is similar to {@link #trace(Component, Throwable)} method except that the
@@ -196,7 +197,7 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void trace(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t);
+  void trace(final Marker marker, final Component msg, final @Nullable Throwable t);
 
   /**
    * Log a message at the DEBUG level.
@@ -204,7 +205,7 @@ public interface ComponentLogger extends Logger {
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void debug(final @NotNull Component msg);
+  void debug(final Component msg);
 
   /**
    * Log a message at the DEBUG level according to the specified format
@@ -217,7 +218,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void debug(final @NotNull Component format, final @Nullable Object arg);
+  void debug(final Component format, final @Nullable Object arg);
 
   /**
    * Log a message at the DEBUG level according to the specified format
@@ -231,7 +232,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void debug(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void debug(final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * Log a message at the DEBUG level according to the specified format
@@ -248,7 +249,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void debug(final @NotNull Component format, final @Nullable Object @NotNull... arguments);
+  void debug(final Component format, final @Nullable Object... arguments);
 
   /**
    * Log an exception (throwable) at the DEBUG level with an
@@ -258,7 +259,7 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void debug(final @NotNull Component msg, final @Nullable Throwable t);
+  void debug(final Component msg, final @Nullable Throwable t);
 
   /**
    * Log a message with the specific Marker at the DEBUG level.
@@ -267,7 +268,7 @@ public interface ComponentLogger extends Logger {
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void debug(final @NotNull Marker marker, final @NotNull Component msg);
+  void debug(final Marker marker, final Component msg);
 
   /**
    * This method is similar to {@link #debug(Component, Object)} method except that the
@@ -278,7 +279,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void debug(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg);
+  void debug(final Marker marker, final Component format, final @Nullable Object arg);
 
   /**
    * This method is similar to {@link #debug(Component, Object, Object)}
@@ -291,7 +292,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void debug(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void debug(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * This method is similar to {@link #debug(Component, Object...)}
@@ -303,7 +304,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void debug(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object @NotNull... arguments);
+  void debug(final Marker marker, final Component format, final @Nullable Object... arguments);
 
   /**
    * This method is similar to {@link #debug(Component, Throwable)} method except that the
@@ -314,7 +315,7 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void debug(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t);
+  void debug(final Marker marker, final Component msg, final @Nullable Throwable t);
 
   /**
    * Log a message at the INFO level.
@@ -322,7 +323,7 @@ public interface ComponentLogger extends Logger {
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void info(final @NotNull Component msg);
+  void info(final Component msg);
 
   /**
    * Log a message at the INFO level according to the specified format
@@ -335,7 +336,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void info(final @NotNull Component format, final @Nullable Object arg);
+  void info(final Component format, final @Nullable Object arg);
 
   /**
    * Log a message at the INFO level according to the specified format
@@ -349,7 +350,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void info(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void info(final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * Log a message at the INFO level according to the specified format
@@ -366,7 +367,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void info(final @NotNull Component format, final @Nullable Object@NotNull... arguments);
+  void info(final Component format, final @Nullable Object... arguments);
 
   /**
    * Log an exception (throwable) at the INFO level with an
@@ -376,7 +377,7 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void info(final @NotNull Component msg, final @Nullable Throwable t);
+  void info(final Component msg, final @Nullable Throwable t);
 
   /**
    * Log a message with the specific Marker at the INFO level.
@@ -385,7 +386,7 @@ public interface ComponentLogger extends Logger {
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void info(final @NotNull Marker marker, final @NotNull Component msg);
+  void info(final Marker marker, final Component msg);
 
   /**
    * This method is similar to {@link #info(Component, Object)} method except that the
@@ -396,7 +397,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void info(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg);
+  void info(final Marker marker, final Component format, final @Nullable Object arg);
 
   /**
    * This method is similar to {@link #info(Component, Object, Object)}
@@ -409,7 +410,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void info(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void info(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * This method is similar to {@link #info(Component, Object...)}
@@ -421,7 +422,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void info(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object@NotNull... arguments);
+  void info(final Marker marker, final Component format, final @Nullable Object... arguments);
 
   /**
    * This method is similar to {@link #info(Component, Throwable)} method
@@ -432,7 +433,7 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void info(final @NotNull Marker marker, final @NotNull Component msg, final @NotNull Throwable t);
+  void info(final Marker marker, final Component msg, final Throwable t);
 
   /**
    * Log a message at the WARN level.
@@ -440,7 +441,7 @@ public interface ComponentLogger extends Logger {
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void warn(final @NotNull Component msg);
+  void warn(final Component msg);
 
   /**
    * Log a message at the WARN level according to the specified format
@@ -453,7 +454,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void warn(final @NotNull Component format, final @Nullable Object arg);
+  void warn(final Component format, final @Nullable Object arg);
 
   /**
    * Log a message at the WARN level according to the specified format
@@ -470,7 +471,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void warn(final @NotNull Component format, final @Nullable Object@NotNull... arguments);
+  void warn(final Component format, final @Nullable Object... arguments);
 
   /**
    * Log a message at the WARN level according to the specified format
@@ -484,7 +485,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void warn(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void warn(final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * Log an exception (throwable) at the WARN level with an
@@ -494,16 +495,16 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void warn(final @NotNull Component msg, final @NotNull Throwable t);
+  void warn(final Component msg, final Throwable t);
 
   /**
-   * Log a message with the specific final @NotNull Marker at the WARN level.
+   * Log a message with the specific final Marker at the WARN level.
    *
    * @param marker The marker specific to this log statement
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void warn(final @NotNull Marker marker, final @NotNull Component msg);
+  void warn(final Marker marker, final Component msg);
 
   /**
    * This method is similar to {@link #warn(Component, Object)} method except that the
@@ -514,7 +515,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void warn(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg);
+  void warn(final Marker marker, final Component format, final @Nullable Object arg);
 
   /**
    * This method is similar to {@link #warn(Component, Object, Object)}
@@ -527,7 +528,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void warn(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void warn(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * This method is similar to {@link #warn(Component, Object...)}
@@ -539,7 +540,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void warn(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object@NotNull... arguments);
+  void warn(final Marker marker, final Component format, final @Nullable Object... arguments);
 
   /**
    * This method is similar to {@link #warn(Component, Throwable)} method
@@ -550,7 +551,7 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void warn(final @NotNull Marker marker, final @NotNull Component msg, final @NotNull Throwable t);
+  void warn(final Marker marker, final Component msg, final Throwable t);
 
   /**
    * Log a message at the ERROR level.
@@ -558,7 +559,7 @@ public interface ComponentLogger extends Logger {
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void error(final @NotNull Component msg);
+  void error(final Component msg);
 
   /**
    * Log a message at the ERROR level according to the specified format
@@ -571,7 +572,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void error(final @NotNull Component format, final @Nullable Object arg);
+  void error(final Component format, final @Nullable Object arg);
 
   /**
    * Log a message at the ERROR level according to the specified format
@@ -585,7 +586,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void error(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void error(final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * Log a message at the ERROR level according to the specified format
@@ -602,7 +603,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void error(final @NotNull Component format, final @Nullable Object@NotNull... arguments);
+  void error(final Component format, final @Nullable Object... arguments);
 
   /**
    * Log an exception (throwable) at the ERROR level with an
@@ -612,16 +613,16 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void error(final @NotNull Component msg, final @NotNull Throwable t);
+  void error(final Component msg, final Throwable t);
 
   /**
-   * Log a message with the specific final @NotNull Marker at the ERROR level.
+   * Log a message with the specific final Marker at the ERROR level.
    *
    * @param marker The marker specific to this log statement
    * @param msg the message string to be logged
    * @since 4.11.0
    */
-  void error(final @NotNull Marker marker, final @NotNull Component msg);
+  void error(final Marker marker, final Component msg);
 
   /**
    * This method is similar to {@link #error(Component, Object)} method except that the
@@ -632,7 +633,7 @@ public interface ComponentLogger extends Logger {
    * @param arg the argument
    * @since 4.11.0
    */
-  void error(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg);
+  void error(final Marker marker, final Component format, final @Nullable Object arg);
 
   /**
    * This method is similar to {@link #error(Component, Object, Object)}
@@ -645,7 +646,7 @@ public interface ComponentLogger extends Logger {
    * @param arg2 the second argument
    * @since 4.11.0
    */
-  void error(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2);
+  void error(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2);
 
   /**
    * This method is similar to {@link #error(Component, Object...)}
@@ -657,7 +658,7 @@ public interface ComponentLogger extends Logger {
    * @param arguments a list of 3 or more arguments
    * @since 4.11.0
    */
-  void error(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object@NotNull... arguments);
+  void error(final Marker marker, final Component format, final @Nullable Object... arguments);
 
   /**
    * This method is similar to {@link #error(Component, Throwable)}
@@ -669,5 +670,5 @@ public interface ComponentLogger extends Logger {
    * @param t the exception (throwable) to log
    * @since 4.11.0
    */
-  void error(final @NotNull Marker marker, final @NotNull Component msg, final @NotNull Throwable t);
+  void error(final Marker marker, final Component msg, final Throwable t);
 }
diff --git a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/ComponentLoggerProvider.java b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/ComponentLoggerProvider.java
index 6bed9fc589..656a6e0253 100644
--- a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/ComponentLoggerProvider.java
+++ b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/ComponentLoggerProvider.java
@@ -26,7 +26,7 @@
 import java.util.function.Function;
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.slf4j.Logger;
 
 /**
@@ -35,6 +35,7 @@
  * @since 4.11.0
  */
 @ApiStatus.Internal // SPI for platform use only
+@NullMarked
 public interface ComponentLoggerProvider {
   /**
    * Create a component logger for the provided logger name.
@@ -44,7 +45,7 @@ public interface ComponentLoggerProvider {
    * @return a component logger with the provided name
    * @since 4.11.0
    */
-  @NotNull ComponentLogger logger(final @NotNull LoggerHelper helper, final @NotNull String name);
+  ComponentLogger logger(final LoggerHelper helper, final String name);
 
   /**
    * A factory for default implementations of component loggers.
@@ -60,7 +61,7 @@ interface LoggerHelper {
      * @return a plain serializer
      * @since 4.11.0
      */
-    @NotNull Function<Component, String> plainSerializer();
+    Function<Component, String> plainSerializer();
 
     /**
      * Create a component logger based on one which delegates to an underlying plain {@link Logger} implementation.
@@ -72,6 +73,6 @@ interface LoggerHelper {
      * @return a new logger
      * @since 4.11.0
      */
-    @NotNull ComponentLogger delegating(final @NotNull Logger base, final @NotNull Function<Component, String> serializer);
+    ComponentLogger delegating(final Logger base, final Function<Component, String> serializer);
   }
 }
diff --git a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/Handler.java b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/Handler.java
index 9e1b8b8b90..88456facb7 100644
--- a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/Handler.java
+++ b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/Handler.java
@@ -31,13 +31,14 @@
 import net.kyori.adventure.text.flattener.ComponentFlattener;
 import net.kyori.adventure.translation.GlobalTranslator;
 import net.kyori.adventure.util.Services;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Utility methods relating to creating component loggers.
  */
+@NullMarked
 final class Handler {
   private static final ComponentLoggerProvider PROVIDER = Services.service(ComponentLoggerProvider.class)
     .orElse(LoggerFactory.getILoggerFactory() instanceof ComponentLoggerProvider ? (ComponentLoggerProvider) LoggerFactory.getILoggerFactory() : new DefaultProvider());
@@ -53,7 +54,7 @@ static final class DefaultProvider implements ComponentLoggerProvider {
     private final Map<String, ComponentLogger> loggers = new ConcurrentHashMap<>();
 
     @Override
-    public @NotNull ComponentLogger logger(final @NotNull LoggerHelper helper, final @NotNull String name) {
+    public ComponentLogger logger(final LoggerHelper helper, final String name) {
       final ComponentLogger initial = this.loggers.get(name);
       if (initial != null) return initial;
 
@@ -71,7 +72,7 @@ static final class LoggerHelperImpl implements ComponentLoggerProvider.LoggerHel
     }
 
     @Override
-    public @NotNull Function<Component, String> plainSerializer() {
+    public Function<Component, String> plainSerializer() {
       return comp -> {
         final Component translated = GlobalTranslator.render(comp, Locale.getDefault());
         final StringBuilder contents = new StringBuilder();
@@ -81,7 +82,7 @@ static final class LoggerHelperImpl implements ComponentLoggerProvider.LoggerHel
     }
 
     @Override
-    public @NotNull ComponentLogger delegating(final @NotNull Logger base, final @NotNull Function<Component, String> serializer) {
+    public ComponentLogger delegating(final Logger base, final Function<Component, String> serializer) {
       return new WrappingComponentLoggerImpl(base, serializer);
     }
   }
diff --git a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/UnpackedComponentThrowable.java b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/UnpackedComponentThrowable.java
index 048462bdf5..8af5856343 100644
--- a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/UnpackedComponentThrowable.java
+++ b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/UnpackedComponentThrowable.java
@@ -26,7 +26,7 @@
 import java.util.function.Function;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.util.ComponentMessageThrowable;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A wrapper for exceptions that implement ComponentMessageThrowable.
diff --git a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/WrappingComponentLoggerImpl.java b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/WrappingComponentLoggerImpl.java
index e741082f70..44024a53a4 100644
--- a/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/WrappingComponentLoggerImpl.java
+++ b/text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/WrappingComponentLoggerImpl.java
@@ -27,8 +27,8 @@
 import java.util.function.Function;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.event.Level;
@@ -36,6 +36,7 @@
 import org.slf4j.spi.LoggingEventBuilder;
 import org.slf4j.spi.NOPLoggingEventBuilder;
 
+@NullMarked
 final class WrappingComponentLoggerImpl implements ComponentLogger {
   private static final String FQCN = WrappingComponentLoggerImpl.class.getName();
 
@@ -63,7 +64,7 @@ private Object maybeSerialize(final @Nullable Object input) {
     }
   }
 
-  private Object[] maybeSerialize(final @Nullable Object@NotNull... args) {
+  private Object[] maybeSerialize(final @Nullable Object... args) {
     Object[] writable = args;
     for (int i = 0; i < writable.length; i++) {
       if (writable[i] instanceof ComponentLike) {
@@ -147,12 +148,12 @@ public boolean isEnabledForLevel(final Level level) {
   }
 
   @Override
-  public @NotNull LoggingEventBuilder makeLoggingEventBuilder(final @NotNull Level level) {
+  public LoggingEventBuilder makeLoggingEventBuilder(final Level level) {
     return this.logger.makeLoggingEventBuilder(level);
   }
 
   @Override
-  public @NotNull LoggingEventBuilder atLevel(final @NotNull Level level) {
+  public LoggingEventBuilder atLevel(final Level level) {
     if (this.logger.isEnabledForLevel(level)) {
       return this.logger.makeLoggingEventBuilder(level);
     } else {
@@ -163,7 +164,7 @@ public boolean isEnabledForLevel(final Level level) {
   // Standard string methods, to process potential Component arguments
 
   @Override
-  public void trace(final @NotNull String format) {
+  public void trace(final String format) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -181,7 +182,7 @@ public void trace(final @NotNull String format) {
   }
 
   @Override
-  public void trace(final @NotNull String format, final @Nullable Object arg) {
+  public void trace(final String format, final @Nullable Object arg) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -199,7 +200,7 @@ public void trace(final @NotNull String format, final @Nullable Object arg) {
   }
 
   @Override
-  public void trace(final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void trace(final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -217,7 +218,7 @@ public void trace(final @NotNull String format, final @Nullable Object arg1, fin
   }
 
   @Override
-  public void trace(final @NotNull String format, final @Nullable Object @NotNull... arguments) {
+  public void trace(final String format, final @Nullable Object... arguments) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -235,7 +236,7 @@ public void trace(final @NotNull String format, final @Nullable Object @NotNull.
   }
 
   @Override
-  public void trace(final @NotNull String msg, final @Nullable Throwable t) {
+  public void trace(final String msg, final @Nullable Throwable t) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -253,7 +254,7 @@ public void trace(final @NotNull String msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull String msg) {
+  public void trace(final Marker marker, final String msg) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -271,7 +272,7 @@ public void trace(final @NotNull Marker marker, final @NotNull String msg) {
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg) {
+  public void trace(final Marker marker, final String format, final @Nullable Object arg) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -289,7 +290,7 @@ public void trace(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void trace(final Marker marker, final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -307,7 +308,7 @@ public void trace(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object @NotNull... argArray) {
+  public void trace(final Marker marker, final String format, final @Nullable Object... argArray) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -325,7 +326,7 @@ public void trace(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull String msg, final @Nullable Throwable t) {
+  public void trace(final Marker marker, final String msg, final @Nullable Throwable t) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -343,7 +344,7 @@ public void trace(final @NotNull Marker marker, final @NotNull String msg, final
   }
 
   @Override
-  public void debug(final @NotNull String format) {
+  public void debug(final String format) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -361,7 +362,7 @@ public void debug(final @NotNull String format) {
   }
 
   @Override
-  public void debug(final @NotNull String format, final @Nullable Object arg) {
+  public void debug(final String format, final @Nullable Object arg) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -379,7 +380,7 @@ public void debug(final @NotNull String format, final @Nullable Object arg) {
   }
 
   @Override
-  public void debug(final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void debug(final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -397,7 +398,7 @@ public void debug(final @NotNull String format, final @Nullable Object arg1, fin
   }
 
   @Override
-  public void debug(final @NotNull String format, final @Nullable Object @NotNull... arguments) {
+  public void debug(final String format, final @Nullable Object... arguments) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -415,7 +416,7 @@ public void debug(final @NotNull String format, final @Nullable Object @NotNull.
   }
 
   @Override
-  public void debug(final @NotNull String msg, final @Nullable Throwable t) {
+  public void debug(final String msg, final @Nullable Throwable t) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -433,7 +434,7 @@ public void debug(final @NotNull String msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull String msg) {
+  public void debug(final Marker marker, final String msg) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -451,7 +452,7 @@ public void debug(final @NotNull Marker marker, final @NotNull String msg) {
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg) {
+  public void debug(final Marker marker, final String format, final @Nullable Object arg) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -469,7 +470,7 @@ public void debug(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void debug(final Marker marker, final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -487,7 +488,7 @@ public void debug(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object @NotNull... argArray) {
+  public void debug(final Marker marker, final String format, final @Nullable Object... argArray) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -505,7 +506,7 @@ public void debug(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull String msg, final @Nullable Throwable t) {
+  public void debug(final Marker marker, final String msg, final @Nullable Throwable t) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -523,7 +524,7 @@ public void debug(final @NotNull Marker marker, final @NotNull String msg, final
   }
 
   @Override
-  public void info(final @NotNull String format) {
+  public void info(final String format) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -541,7 +542,7 @@ public void info(final @NotNull String format) {
   }
 
   @Override
-  public void info(final @NotNull String format, final @Nullable Object arg) {
+  public void info(final String format, final @Nullable Object arg) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -559,7 +560,7 @@ public void info(final @NotNull String format, final @Nullable Object arg) {
   }
 
   @Override
-  public void info(final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void info(final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -577,7 +578,7 @@ public void info(final @NotNull String format, final @Nullable Object arg1, fina
   }
 
   @Override
-  public void info(final @NotNull String format, final @Nullable Object @NotNull... arguments) {
+  public void info(final String format, final @Nullable Object... arguments) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -595,7 +596,7 @@ public void info(final @NotNull String format, final @Nullable Object @NotNull..
   }
 
   @Override
-  public void info(final @NotNull String msg, final @Nullable Throwable t) {
+  public void info(final String msg, final @Nullable Throwable t) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -613,7 +614,7 @@ public void info(final @NotNull String msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull String msg) {
+  public void info(final Marker marker, final String msg) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -631,7 +632,7 @@ public void info(final @NotNull Marker marker, final @NotNull String msg) {
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg) {
+  public void info(final Marker marker, final String format, final @Nullable Object arg) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -649,7 +650,7 @@ public void info(final @NotNull Marker marker, final @NotNull String format, fin
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void info(final Marker marker, final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -667,7 +668,7 @@ public void info(final @NotNull Marker marker, final @NotNull String format, fin
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object @NotNull... argArray) {
+  public void info(final Marker marker, final String format, final @Nullable Object... argArray) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -685,7 +686,7 @@ public void info(final @NotNull Marker marker, final @NotNull String format, fin
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull String msg, final @Nullable Throwable t) {
+  public void info(final Marker marker, final String msg, final @Nullable Throwable t) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -703,7 +704,7 @@ public void info(final @NotNull Marker marker, final @NotNull String msg, final
   }
 
   @Override
-  public void warn(final @NotNull String format) {
+  public void warn(final String format) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -721,7 +722,7 @@ public void warn(final @NotNull String format) {
   }
 
   @Override
-  public void warn(final @NotNull String format, final @Nullable Object arg) {
+  public void warn(final String format, final @Nullable Object arg) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -739,7 +740,7 @@ public void warn(final @NotNull String format, final @Nullable Object arg) {
   }
 
   @Override
-  public void warn(final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void warn(final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -757,7 +758,7 @@ public void warn(final @NotNull String format, final @Nullable Object arg1, fina
   }
 
   @Override
-  public void warn(final @NotNull String format, final @Nullable Object @NotNull... arguments) {
+  public void warn(final String format, final @Nullable Object... arguments) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -775,7 +776,7 @@ public void warn(final @NotNull String format, final @Nullable Object @NotNull..
   }
 
   @Override
-  public void warn(final @NotNull String msg, final @Nullable Throwable t) {
+  public void warn(final String msg, final @Nullable Throwable t) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -793,7 +794,7 @@ public void warn(final @NotNull String msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull String msg) {
+  public void warn(final Marker marker, final String msg) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -811,7 +812,7 @@ public void warn(final @NotNull Marker marker, final @NotNull String msg) {
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg) {
+  public void warn(final Marker marker, final String format, final @Nullable Object arg) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -829,7 +830,7 @@ public void warn(final @NotNull Marker marker, final @NotNull String format, fin
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void warn(final Marker marker, final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -847,7 +848,7 @@ public void warn(final @NotNull Marker marker, final @NotNull String format, fin
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object @NotNull... argArray) {
+  public void warn(final Marker marker, final String format, final @Nullable Object... argArray) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -865,7 +866,7 @@ public void warn(final @NotNull Marker marker, final @NotNull String format, fin
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull String msg, final @Nullable Throwable t) {
+  public void warn(final Marker marker, final String msg, final @Nullable Throwable t) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -883,7 +884,7 @@ public void warn(final @NotNull Marker marker, final @NotNull String msg, final
   }
 
   @Override
-  public void error(final @NotNull String format) {
+  public void error(final String format) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -901,7 +902,7 @@ public void error(final @NotNull String format) {
   }
 
   @Override
-  public void error(final @NotNull String format, final @Nullable Object arg) {
+  public void error(final String format, final @Nullable Object arg) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -919,7 +920,7 @@ public void error(final @NotNull String format, final @Nullable Object arg) {
   }
 
   @Override
-  public void error(final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void error(final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -937,7 +938,7 @@ public void error(final @NotNull String format, final @Nullable Object arg1, fin
   }
 
   @Override
-  public void error(final @NotNull String format, final @Nullable Object @NotNull... arguments) {
+  public void error(final String format, final @Nullable Object... arguments) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -955,7 +956,7 @@ public void error(final @NotNull String format, final @Nullable Object @NotNull.
   }
 
   @Override
-  public void error(final @NotNull String msg, final @Nullable Throwable t) {
+  public void error(final String msg, final @Nullable Throwable t) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -973,7 +974,7 @@ public void error(final @NotNull String msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull String msg) {
+  public void error(final Marker marker, final String msg) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -991,7 +992,7 @@ public void error(final @NotNull Marker marker, final @NotNull String msg) {
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg) {
+  public void error(final Marker marker, final String format, final @Nullable Object arg) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1009,7 +1010,7 @@ public void error(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void error(final Marker marker, final String format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1027,7 +1028,7 @@ public void error(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull String format, final @Nullable Object @NotNull... argArray) {
+  public void error(final Marker marker, final String format, final @Nullable Object... argArray) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1045,7 +1046,7 @@ public void error(final @NotNull Marker marker, final @NotNull String format, fi
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull String msg, final @Nullable Throwable t) {
+  public void error(final Marker marker, final String msg, final @Nullable Throwable t) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1065,7 +1066,7 @@ public void error(final @NotNull Marker marker, final @NotNull String msg, final
   // Component-primary methods
 
   @Override
-  public void trace(final @NotNull Component format) {
+  public void trace(final Component format) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1083,7 +1084,7 @@ public void trace(final @NotNull Component format) {
   }
 
   @Override
-  public void trace(final @NotNull Component format, final @Nullable Object arg) {
+  public void trace(final Component format, final @Nullable Object arg) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1101,7 +1102,7 @@ public void trace(final @NotNull Component format, final @Nullable Object arg) {
   }
 
   @Override
-  public void trace(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void trace(final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1119,7 +1120,7 @@ public void trace(final @NotNull Component format, final @Nullable Object arg1,
   }
 
   @Override
-  public void trace(final @NotNull Component format, final @Nullable Object @NotNull... arguments) {
+  public void trace(final Component format, final @Nullable Object... arguments) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1137,7 +1138,7 @@ public void trace(final @NotNull Component format, final @Nullable Object @NotNu
   }
 
   @Override
-  public void trace(final @NotNull Component msg, final @Nullable Throwable t) {
+  public void trace(final Component msg, final @Nullable Throwable t) {
     if (!this.isTraceEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1155,7 +1156,7 @@ public void trace(final @NotNull Component msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull Component msg) {
+  public void trace(final Marker marker, final Component msg) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1173,7 +1174,7 @@ public void trace(final @NotNull Marker marker, final @NotNull Component msg) {
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg) {
+  public void trace(final Marker marker, final Component format, final @Nullable Object arg) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1191,7 +1192,7 @@ public void trace(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void trace(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1209,7 +1210,7 @@ public void trace(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object @NotNull... argArray) {
+  public void trace(final Marker marker, final Component format, final @Nullable Object... argArray) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1227,7 +1228,7 @@ public void trace(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void trace(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t) {
+  public void trace(final Marker marker, final Component msg, final @Nullable Throwable t) {
     if (!this.isTraceEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1245,7 +1246,7 @@ public void trace(final @NotNull Marker marker, final @NotNull Component msg, fi
   }
 
   @Override
-  public void debug(final @NotNull Component format) {
+  public void debug(final Component format) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1263,7 +1264,7 @@ public void debug(final @NotNull Component format) {
   }
 
   @Override
-  public void debug(final @NotNull Component format, final @Nullable Object arg) {
+  public void debug(final Component format, final @Nullable Object arg) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1281,7 +1282,7 @@ public void debug(final @NotNull Component format, final @Nullable Object arg) {
   }
 
   @Override
-  public void debug(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void debug(final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1299,7 +1300,7 @@ public void debug(final @NotNull Component format, final @Nullable Object arg1,
   }
 
   @Override
-  public void debug(final @NotNull Component format, final @Nullable Object @NotNull... arguments) {
+  public void debug(final Component format, final @Nullable Object... arguments) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1317,7 +1318,7 @@ public void debug(final @NotNull Component format, final @Nullable Object @NotNu
   }
 
   @Override
-  public void debug(final @NotNull Component msg, final @Nullable Throwable t) {
+  public void debug(final Component msg, final @Nullable Throwable t) {
     if (!this.isDebugEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1335,7 +1336,7 @@ public void debug(final @NotNull Component msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull Component msg) {
+  public void debug(final Marker marker, final Component msg) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1353,7 +1354,7 @@ public void debug(final @NotNull Marker marker, final @NotNull Component msg) {
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg) {
+  public void debug(final Marker marker, final Component format, final @Nullable Object arg) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1371,7 +1372,7 @@ public void debug(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void debug(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1389,7 +1390,7 @@ public void debug(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object @NotNull... argArray) {
+  public void debug(final Marker marker, final Component format, final @Nullable Object... argArray) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1407,7 +1408,7 @@ public void debug(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void debug(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t) {
+  public void debug(final Marker marker, final Component msg, final @Nullable Throwable t) {
     if (!this.isDebugEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1425,7 +1426,7 @@ public void debug(final @NotNull Marker marker, final @NotNull Component msg, fi
   }
 
   @Override
-  public void info(final @NotNull Component format) {
+  public void info(final Component format) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1443,7 +1444,7 @@ public void info(final @NotNull Component format) {
   }
 
   @Override
-  public void info(final @NotNull Component format, final @Nullable Object arg) {
+  public void info(final Component format, final @Nullable Object arg) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1461,7 +1462,7 @@ public void info(final @NotNull Component format, final @Nullable Object arg) {
   }
 
   @Override
-  public void info(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void info(final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1479,7 +1480,7 @@ public void info(final @NotNull Component format, final @Nullable Object arg1, f
   }
 
   @Override
-  public void info(final @NotNull Component format, final @Nullable Object @NotNull... arguments) {
+  public void info(final Component format, final @Nullable Object... arguments) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1497,7 +1498,7 @@ public void info(final @NotNull Component format, final @Nullable Object @NotNul
   }
 
   @Override
-  public void info(final @NotNull Component msg, final @Nullable Throwable t) {
+  public void info(final Component msg, final @Nullable Throwable t) {
     if (!this.isInfoEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1515,7 +1516,7 @@ public void info(final @NotNull Component msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull Component msg) {
+  public void info(final Marker marker, final Component msg) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1533,7 +1534,7 @@ public void info(final @NotNull Marker marker, final @NotNull Component msg) {
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg) {
+  public void info(final Marker marker, final Component format, final @Nullable Object arg) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1551,7 +1552,7 @@ public void info(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void info(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1569,7 +1570,7 @@ public void info(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object @NotNull... argArray) {
+  public void info(final Marker marker, final Component format, final @Nullable Object... argArray) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1587,7 +1588,7 @@ public void info(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void info(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t) {
+  public void info(final Marker marker, final Component msg, final @Nullable Throwable t) {
     if (!this.isInfoEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1605,7 +1606,7 @@ public void info(final @NotNull Marker marker, final @NotNull Component msg, fin
   }
 
   @Override
-  public void warn(final @NotNull Component format) {
+  public void warn(final Component format) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1623,7 +1624,7 @@ public void warn(final @NotNull Component format) {
   }
 
   @Override
-  public void warn(final @NotNull Component format, final @Nullable Object arg) {
+  public void warn(final Component format, final @Nullable Object arg) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1641,7 +1642,7 @@ public void warn(final @NotNull Component format, final @Nullable Object arg) {
   }
 
   @Override
-  public void warn(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void warn(final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1659,7 +1660,7 @@ public void warn(final @NotNull Component format, final @Nullable Object arg1, f
   }
 
   @Override
-  public void warn(final @NotNull Component format, final @Nullable Object @NotNull... arguments) {
+  public void warn(final Component format, final @Nullable Object... arguments) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1677,7 +1678,7 @@ public void warn(final @NotNull Component format, final @Nullable Object @NotNul
   }
 
   @Override
-  public void warn(final @NotNull Component msg, final @Nullable Throwable t) {
+  public void warn(final Component msg, final @Nullable Throwable t) {
     if (!this.isWarnEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1695,7 +1696,7 @@ public void warn(final @NotNull Component msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull Component msg) {
+  public void warn(final Marker marker, final Component msg) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1713,7 +1714,7 @@ public void warn(final @NotNull Marker marker, final @NotNull Component msg) {
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg) {
+  public void warn(final Marker marker, final Component format, final @Nullable Object arg) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1731,7 +1732,7 @@ public void warn(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void warn(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1749,7 +1750,7 @@ public void warn(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object @NotNull... argArray) {
+  public void warn(final Marker marker, final Component format, final @Nullable Object... argArray) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1767,7 +1768,7 @@ public void warn(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void warn(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t) {
+  public void warn(final Marker marker, final Component msg, final @Nullable Throwable t) {
     if (!this.isWarnEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1785,7 +1786,7 @@ public void warn(final @NotNull Marker marker, final @NotNull Component msg, fin
   }
 
   @Override
-  public void error(final @NotNull Component format) {
+  public void error(final Component format) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1803,7 +1804,7 @@ public void error(final @NotNull Component format) {
   }
 
   @Override
-  public void error(final @NotNull Component format, final @Nullable Object arg) {
+  public void error(final Component format, final @Nullable Object arg) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1821,7 +1822,7 @@ public void error(final @NotNull Component format, final @Nullable Object arg) {
   }
 
   @Override
-  public void error(final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void error(final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1839,7 +1840,7 @@ public void error(final @NotNull Component format, final @Nullable Object arg1,
   }
 
   @Override
-  public void error(final @NotNull Component format, final @Nullable Object @NotNull... arguments) {
+  public void error(final Component format, final @Nullable Object... arguments) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1857,7 +1858,7 @@ public void error(final @NotNull Component format, final @Nullable Object @NotNu
   }
 
   @Override
-  public void error(final @NotNull Component msg, final @Nullable Throwable t) {
+  public void error(final Component msg, final @Nullable Throwable t) {
     if (!this.isErrorEnabled()) return;
 
     if (this.isLocationAware) {
@@ -1875,7 +1876,7 @@ public void error(final @NotNull Component msg, final @Nullable Throwable t) {
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull Component msg) {
+  public void error(final Marker marker, final Component msg) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1893,7 +1894,7 @@ public void error(final @NotNull Marker marker, final @NotNull Component msg) {
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg) {
+  public void error(final Marker marker, final Component format, final @Nullable Object arg) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1911,7 +1912,7 @@ public void error(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
+  public void error(final Marker marker, final Component format, final @Nullable Object arg1, final @Nullable Object arg2) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1929,7 +1930,7 @@ public void error(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull Component format, final @Nullable Object @NotNull... argArray) {
+  public void error(final Marker marker, final Component format, final @Nullable Object... argArray) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
@@ -1947,7 +1948,7 @@ public void error(final @NotNull Marker marker, final @NotNull Component format,
   }
 
   @Override
-  public void error(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t) {
+  public void error(final Marker marker, final Component msg, final @Nullable Throwable t) {
     if (!this.isErrorEnabled(marker)) return;
 
     if (this.isLocationAware) {
diff --git a/text-logger-slf4j/src/test/java/net/kyori/adventure/text/logger/slf4j/ComponentLoggerTest.java b/text-logger-slf4j/src/test/java/net/kyori/adventure/text/logger/slf4j/ComponentLoggerTest.java
index 8e83d60e92..538bcde15b 100644
--- a/text-logger-slf4j/src/test/java/net/kyori/adventure/text/logger/slf4j/ComponentLoggerTest.java
+++ b/text-logger-slf4j/src/test/java/net/kyori/adventure/text/logger/slf4j/ComponentLoggerTest.java
@@ -32,7 +32,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.util.ComponentMessageThrowable;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ArgumentQueueImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ArgumentQueueImpl.java
index 316f320a43..44dd4714e0 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ArgumentQueueImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ArgumentQueueImpl.java
@@ -27,11 +27,12 @@
 import java.util.function.Supplier;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class ArgumentQueueImpl<T extends Tag.Argument> implements ArgumentQueue {
   private final Context context;
   final List<T> args;
@@ -43,7 +44,7 @@ final class ArgumentQueueImpl<T extends Tag.Argument> implements ArgumentQueue {
   }
 
   @Override
-  public @NotNull T pop() {
+  public T pop() {
     if (!this.hasNext()) {
       throw this.context.newException("Missing argument for this tag!", this);
     }
@@ -51,7 +52,7 @@ final class ArgumentQueueImpl<T extends Tag.Argument> implements ArgumentQueue {
   }
 
   @Override
-  public @NotNull T popOr(final @NotNull String errorMessage) {
+  public T popOr(final String errorMessage) {
     requireNonNull(errorMessage, "errorMessage");
     if (!this.hasNext()) {
       throw this.context.newException(errorMessage, this);
@@ -60,7 +61,7 @@ final class ArgumentQueueImpl<T extends Tag.Argument> implements ArgumentQueue {
   }
 
   @Override
-  public @NotNull T popOr(final @NotNull Supplier<String> errorMessage) {
+  public T popOr(final Supplier<String> errorMessage) {
     requireNonNull(errorMessage, "errorMessage");
     if (!this.hasNext()) {
       throw this.context.newException(requireNonNull(errorMessage.get(), "errorMessage.get()"), this);
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/Context.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/Context.java
index 66f59e2f2d..aadc84c356 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/Context.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/Context.java
@@ -27,8 +27,8 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Parser context for use within transformations.
@@ -38,6 +38,7 @@
  * @since 4.10.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface Context {
 
   /**
@@ -47,7 +48,7 @@ public interface Context {
    * @return the parsed message
    * @since 4.10.0
    */
-  @NotNull Component deserialize(final @NotNull String message);
+  Component deserialize(final String message);
 
   /**
    * Deserializes a MiniMessage string using all the settings of this context.
@@ -57,7 +58,7 @@ public interface Context {
    * @return the parsed message
    * @since 4.10.0
    */
-  @NotNull Component deserialize(final @NotNull String message, final @NotNull TagResolver resolver);
+  Component deserialize(final String message, final TagResolver resolver);
 
   /**
    * Deserializes a MiniMessage string using all the settings of this context.
@@ -67,7 +68,7 @@ public interface Context {
    * @return the parsed message
    * @since 4.10.0
    */
-  @NotNull Component deserialize(final @NotNull String message, final @NotNull TagResolver@NotNull... resolvers);
+  Component deserialize(final String message, final TagResolver... resolvers);
 
   /**
    * Create a new parsing exception.
@@ -77,9 +78,9 @@ public interface Context {
    * @return the new parsing exception
    * @since 4.10.0
    */
-  @NotNull ParsingException newException(
-    final @NotNull String message,
-    final @NotNull ArgumentQueue tags
+  ParsingException newException(
+    final String message,
+    final ArgumentQueue tags
   );
 
   /**
@@ -89,7 +90,7 @@ public interface Context {
    * @return the new parsing exception
    * @since 4.10.0
    */
-  @NotNull ParsingException newException(final @NotNull String message);
+  ParsingException newException(final String message);
 
   /**
    * Create a new parsing exception.
@@ -100,9 +101,9 @@ public interface Context {
    * @return the new parsing exception
    * @since 4.10.0
    */
-  @NotNull ParsingException newException(
-    final @NotNull String message,
+  ParsingException newException(
+    final String message,
     final @Nullable Throwable cause,
-    final @NotNull ArgumentQueue args
+    final ArgumentQueue args
   );
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ContextImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ContextImpl.java
index 66ac346b24..a9911ffd6d 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ContextImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ContextImpl.java
@@ -33,8 +33,8 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -44,6 +44,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 class ContextImpl implements Context {
   private static final Token[] EMPTY_TOKEN_ARRAY = new Token[0];
 
@@ -60,7 +61,7 @@ class ContextImpl implements Context {
     final Consumer<String> debugOutput,
     final String message,
     final MiniMessage miniMessage,
-    final @NotNull TagResolver extraTags,
+    final TagResolver extraTags,
     final UnaryOperator<String> preProcessor,
     final UnaryOperator<Component> postProcessor
   ) {
@@ -93,15 +94,15 @@ public Consumer<String> debugOutput() {
     return this.debugOutput;
   }
 
-  public @NotNull String message() {
+  public String message() {
     return this.message;
   }
 
-  void message(final @NotNull String message) {
+  void message(final String message) {
     this.message = message;
   }
 
-  public @NotNull TagResolver extraTags() {
+  public TagResolver extraTags() {
     return this.tagResolver;
   }
 
@@ -114,34 +115,34 @@ public UnaryOperator<String> preProcessor() {
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull String message) {
+  public Component deserialize(final String message) {
     return this.miniMessage.deserialize(requireNonNull(message, "message"), this.tagResolver);
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull String message, final @NotNull TagResolver resolver) {
+  public Component deserialize(final String message, final TagResolver resolver) {
     return this.miniMessage.deserialize(requireNonNull(message, "message"),
       TagResolver.builder().resolver(this.tagResolver).resolver(requireNonNull(resolver, "resolver")).build());
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull String message, final @NotNull TagResolver@NotNull... resolvers) {
+  public Component deserialize(final String message, final TagResolver... resolvers) {
     return this.miniMessage.deserialize(requireNonNull(message, "message"),
       TagResolver.builder().resolver(this.tagResolver).resolvers(requireNonNull(resolvers, "resolvers")).build());
   }
 
   @Override
-  public @NotNull ParsingException newException(final @NotNull String message) {
+  public ParsingException newException(final String message) {
     return new ParsingExceptionImpl(message, this.message, null, false, EMPTY_TOKEN_ARRAY);
   }
 
   @Override
-  public @NotNull ParsingException newException(final @NotNull String message, final @NotNull ArgumentQueue tags) {
+  public ParsingException newException(final String message, final ArgumentQueue tags) {
     return new ParsingExceptionImpl(message, this.message, null, false, tagsToTokens(((ArgumentQueueImpl<?>) tags).args));
   }
 
   @Override
-  public @NotNull ParsingException newException(final @NotNull String message, final @Nullable Throwable cause, final @NotNull ArgumentQueue tags) {
+  public ParsingException newException(final String message, final @Nullable Throwable cause, final ArgumentQueue tags) {
     return new ParsingExceptionImpl(message, this.message, cause, false, tagsToTokens(((ArgumentQueueImpl<?>) tags).args));
   }
 
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessage.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessage.java
index 21e2cea498..4b845a5a80 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessage.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessage.java
@@ -32,8 +32,8 @@
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import net.kyori.adventure.util.PlatformAPI;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * MiniMessage is a textual representation of components.
@@ -43,6 +43,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 public interface MiniMessage extends ComponentSerializer<Component, Component, String> {
   /**
    * Gets a simple instance with default settings.
@@ -50,7 +51,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return a simple instance
    * @since 4.10.0
    */
-  static @NotNull MiniMessage miniMessage() {
+  static MiniMessage miniMessage() {
     return MiniMessageImpl.Instances.INSTANCE;
   }
 
@@ -65,7 +66,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the output, with escaped tags
    * @since 4.10.0
    */
-  @NotNull String escapeTags(final @NotNull String input);
+  String escapeTags(final String input);
 
   /**
    * Escapes all known tags in the input message, so that they are ignored in deserialization.
@@ -77,7 +78,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the output, with escaped tags
    * @since 4.10.0
    */
-  @NotNull String escapeTags(final @NotNull String input, final @NotNull TagResolver tagResolver);
+  String escapeTags(final String input, final TagResolver tagResolver);
 
   /**
    * Escapes all known tags in the input message, so that they are ignored in deserialization.
@@ -89,7 +90,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the output, with escaped tags
    * @since 4.10.0
    */
-  default @NotNull String escapeTags(final @NotNull String input, final @NotNull TagResolver... tagResolvers) {
+  default String escapeTags(final String input, final TagResolver... tagResolvers) {
     return this.escapeTags(input, TagResolver.resolver(tagResolvers));
   }
 
@@ -104,7 +105,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the output, without tags
    * @since 4.10.0
    */
-  @NotNull String stripTags(final @NotNull String input);
+  String stripTags(final String input);
 
   /**
    * Removes all known tags in the input message, so that they are ignored in deserialization.
@@ -116,7 +117,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the output, without tags
    * @since 4.10.0
    */
-  @NotNull String stripTags(final @NotNull String input, final @NotNull TagResolver tagResolver);
+  String stripTags(final String input, final TagResolver tagResolver);
 
   /**
    * Removes all known tags in the input message, so that they are ignored in deserialization.
@@ -128,7 +129,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the output, without tags
    * @since 4.10.0
    */
-  default @NotNull String stripTags(final @NotNull String input, final @NotNull TagResolver... tagResolvers) {
+  default String stripTags(final String input, final TagResolver... tagResolvers) {
     return this.stripTags(input, TagResolver.resolver(tagResolvers));
   }
 
@@ -142,7 +143,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the output component
    * @since 4.10.0
    */
-  @NotNull Component deserialize(final @NotNull String input, final @NotNull TagResolver tagResolver);
+  Component deserialize(final String input, final TagResolver tagResolver);
 
   /**
    * Deserializes a string into a component, with a tag resolver to parse tags of the form {@code <key>}.
@@ -154,7 +155,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the output component
    * @since 4.10.0
    */
-  default @NotNull Component deserialize(final @NotNull String input, final @NotNull TagResolver... tagResolvers) {
+  default Component deserialize(final String input, final TagResolver... tagResolvers) {
     return this.deserialize(input, TagResolver.resolver(tagResolvers));
   }
 
@@ -166,7 +167,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the root of the resulting tree
    * @since 4.10.0
    */
-  Node.@NotNull Root deserializeToTree(final @NotNull String input);
+  Node.Root deserializeToTree(final String input);
 
   /**
    * Deserializes a string into a tree of parsed elements, with a tag resolver to parse tags of the form {@code <key>}.
@@ -179,7 +180,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the root of the resulting tree
    * @since 4.10.0
    */
-  Node.@NotNull Root deserializeToTree(final @NotNull String input, final @NotNull TagResolver tagResolver);
+  Node.Root deserializeToTree(final String input, final TagResolver tagResolver);
 
   /**
    * Deserializes a string into a tree of parsed elements, with a tag resolver to parse tags of the form {@code <key>}.
@@ -192,7 +193,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the root of the resulting tree
    * @since 4.10.0
    */
-  default Node.@NotNull Root deserializeToTree(final @NotNull String input, final @NotNull TagResolver... tagResolvers) {
+  default Node.Root deserializeToTree(final String input, final TagResolver... tagResolvers) {
     return this.deserializeToTree(input, TagResolver.resolver(tagResolvers));
   }
 
@@ -211,7 +212,7 @@ public interface MiniMessage extends ComponentSerializer<Component, Component, S
    * @return the base tag resolver
    * @since 4.15.0
    */
-  @NotNull TagResolver tags();
+  TagResolver tags();
 
   /**
    * Creates a new {@link MiniMessage.Builder}.
@@ -240,7 +241,7 @@ interface Builder extends AbstractBuilder<MiniMessage> {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder tags(final @NotNull TagResolver tags);
+    Builder tags(final TagResolver tags);
 
     /**
      * Add to the set of known tags this MiniMessage instance can use.
@@ -249,7 +250,7 @@ interface Builder extends AbstractBuilder<MiniMessage> {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder editTags(final @NotNull Consumer<TagResolver.Builder> adder);
+    Builder editTags(final Consumer<TagResolver.Builder> adder);
 
     /**
      * Enables strict mode (disabled by default).
@@ -264,7 +265,7 @@ interface Builder extends AbstractBuilder<MiniMessage> {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder strict(final boolean strict);
+    Builder strict(final boolean strict);
 
     /**
      * Print debug information to the given output (disabled by default).
@@ -278,7 +279,7 @@ interface Builder extends AbstractBuilder<MiniMessage> {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder debug(final @Nullable Consumer<String> debugOutput);
+    Builder debug(final @Nullable Consumer<String> debugOutput);
 
     /**
      * Specify a function that takes the component at the end of the parser process.
@@ -288,7 +289,7 @@ interface Builder extends AbstractBuilder<MiniMessage> {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder postProcessor(final @NotNull UnaryOperator<Component> postProcessor);
+    Builder postProcessor(final UnaryOperator<Component> postProcessor);
 
     /**
      * Specify a function that takes the string at the start of the parser process.
@@ -298,7 +299,7 @@ interface Builder extends AbstractBuilder<MiniMessage> {
      * @return this builder
      * @since 4.11.0
      */
-    @NotNull Builder preProcessor(final @NotNull UnaryOperator<String> preProcessor);
+    Builder preProcessor(final UnaryOperator<String> preProcessor);
 
     /**
      * Builds the serializer.
@@ -307,7 +308,7 @@ interface Builder extends AbstractBuilder<MiniMessage> {
      * @since 4.10.0
      */
     @Override
-    @NotNull MiniMessage build();
+    MiniMessage build();
   }
 
   /**
@@ -327,7 +328,7 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull MiniMessage miniMessage();
+    MiniMessage miniMessage();
 
     /**
      * Initialize a {@link Builder} before it is returned to the API caller.
@@ -337,6 +338,6 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull Consumer<Builder> builder();
+    Consumer<Builder> builder();
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageImpl.java
index 328f905c4b..197a80c46e 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageImpl.java
@@ -32,8 +32,8 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.minimessage.tree.Node;
 import net.kyori.adventure.util.Services;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -42,6 +42,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 final class MiniMessageImpl implements MiniMessage {
   private static final Optional<Provider> SERVICE = Services.service(Provider.class);
   static final Consumer<Builder> BUILDER = SERVICE
@@ -66,7 +67,7 @@ static final class Instances {
   private final UnaryOperator<String> preProcessor;
   final MiniMessageParser parser;
 
-  MiniMessageImpl(final @NotNull TagResolver resolver, final boolean strict, final @Nullable Consumer<String> debugOutput, final @NotNull UnaryOperator<String> preProcessor, final @NotNull UnaryOperator<Component> postProcessor) {
+  MiniMessageImpl(final TagResolver resolver, final boolean strict, final @Nullable Consumer<String> debugOutput, final UnaryOperator<String> preProcessor, final UnaryOperator<Component> postProcessor) {
     this.parser = new MiniMessageParser(resolver);
     this.strict = strict;
     this.debugOutput = debugOutput;
@@ -75,27 +76,27 @@ static final class Instances {
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull String input) {
+  public Component deserialize(final String input) {
     return this.parser.parseFormat(this.newContext(input, null));
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull String input, final @NotNull TagResolver tagResolver) {
+  public Component deserialize(final String input, final TagResolver tagResolver) {
     return this.parser.parseFormat(this.newContext(input, requireNonNull(tagResolver, "tagResolver")));
   }
 
   @Override
-  public Node.@NotNull Root deserializeToTree(final @NotNull String input) {
+  public Node.Root deserializeToTree(final String input) {
     return this.parser.parseToTree(this.newContext(input, null));
   }
 
   @Override
-  public Node.@NotNull Root deserializeToTree(final @NotNull String input, final @NotNull TagResolver tagResolver) {
+  public Node.Root deserializeToTree(final String input, final TagResolver tagResolver) {
     return this.parser.parseToTree(this.newContext(input, requireNonNull(tagResolver, "tagResolver")));
   }
 
   @Override
-  public @NotNull String serialize(final @NotNull Component component) {
+  public String serialize(final Component component) {
     return MiniMessageSerializer.serialize(component, this.serialResolver(null), this.strict);
   }
 
@@ -115,22 +116,22 @@ private SerializableResolver serialResolver(final @Nullable TagResolver extraRes
   }
 
   @Override
-  public @NotNull String escapeTags(final @NotNull String input) {
+  public String escapeTags(final String input) {
     return this.parser.escapeTokens(this.newContext(input, null));
   }
 
   @Override
-  public @NotNull String escapeTags(final @NotNull String input, final @NotNull TagResolver tagResolver) {
+  public String escapeTags(final String input, final TagResolver tagResolver) {
     return this.parser.escapeTokens(this.newContext(input, tagResolver));
   }
 
   @Override
-  public @NotNull String stripTags(final @NotNull String input) {
+  public String stripTags(final String input) {
     return this.parser.stripTokens(this.newContext(input, null));
   }
 
   @Override
-  public @NotNull String stripTags(final @NotNull String input, final @NotNull TagResolver tagResolver) {
+  public String stripTags(final String input, final TagResolver tagResolver) {
     return this.parser.stripTokens(this.newContext(input, tagResolver));
   }
 
@@ -140,11 +141,11 @@ public boolean strict() {
   }
 
   @Override
-  public @NotNull TagResolver tags() {
+  public TagResolver tags() {
     return this.parser.tagResolver;
   }
 
-  private @NotNull ContextImpl newContext(final @NotNull String input, final @Nullable TagResolver resolver) {
+  private ContextImpl newContext(final String input, final @Nullable TagResolver resolver) {
     requireNonNull(input, "input");
     if (resolver == null) {
       return ContextImpl.of(this.strict, this.debugOutput, input, this, TagResolver.empty(), this.preProcessor, this.postProcessor);
@@ -174,13 +175,13 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder tags(final @NotNull TagResolver tags) {
+    public Builder tags(final TagResolver tags) {
       this.tagResolver = requireNonNull(tags, "tags");
       return this;
     }
 
     @Override
-    public @NotNull Builder editTags(final @NotNull Consumer<TagResolver.Builder> adder) {
+    public Builder editTags(final Consumer<TagResolver.Builder> adder) {
       requireNonNull(adder, "adder");
       final TagResolver.Builder builder = TagResolver.builder().resolver(this.tagResolver);
       adder.accept(builder);
@@ -189,31 +190,31 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder strict(final boolean strict) {
+    public Builder strict(final boolean strict) {
       this.strict = strict;
       return this;
     }
 
     @Override
-    public @NotNull Builder debug(final @Nullable Consumer<String> debugOutput) {
+    public Builder debug(final @Nullable Consumer<String> debugOutput) {
       this.debug = debugOutput;
       return this;
     }
 
     @Override
-    public @NotNull Builder postProcessor(final @NotNull UnaryOperator<Component> postProcessor) {
+    public Builder postProcessor(final UnaryOperator<Component> postProcessor) {
       this.postProcessor = Objects.requireNonNull(postProcessor, "postProcessor");
       return this;
     }
 
     @Override
-    public @NotNull Builder preProcessor(final @NotNull UnaryOperator<String> preProcessor) {
+    public Builder preProcessor(final UnaryOperator<String> preProcessor) {
       this.preProcessor = Objects.requireNonNull(preProcessor, "preProcessor");
       return this;
     }
 
     @Override
-    public @NotNull MiniMessage build() {
+    public MiniMessage build() {
       return new MiniMessageImpl(this.tagResolver, this.strict, this.debug, this.preProcessor, this.postProcessor);
     }
   }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageParser.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageParser.java
index f88915455d..858a1dbd0b 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageParser.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageParser.java
@@ -45,9 +45,10 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.string.MultiLineStringExaminer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class MiniMessageParser {
   final TagResolver tagResolver;
 
@@ -59,13 +60,13 @@ final class MiniMessageParser {
     this.tagResolver = tagResolver;
   }
 
-  @NotNull String escapeTokens(final @NotNull ContextImpl context) {
+  String escapeTokens(final ContextImpl context) {
     final StringBuilder sb = new StringBuilder(context.message().length());
     this.escapeTokens(sb, context);
     return sb.toString();
   }
 
-  void escapeTokens(final StringBuilder sb, final @NotNull ContextImpl context) {
+  void escapeTokens(final StringBuilder sb, final ContextImpl context) {
     this.escapeTokens(sb, context.message(), context);
   }
 
@@ -86,17 +87,17 @@ private void escapeTokens(final StringBuilder sb, final String richMessage, fina
     });
   }
 
-  @NotNull String stripTokens(final @NotNull ContextImpl context) {
+  String stripTokens(final ContextImpl context) {
     final StringBuilder sb = new StringBuilder(context.message().length());
     this.processTokens(sb, context, (token, builder) -> {});
     return sb.toString();
   }
 
-  private void processTokens(final @NotNull StringBuilder sb, final @NotNull ContextImpl context, final BiConsumer<Token, StringBuilder> tagHandler) {
+  private void processTokens(final StringBuilder sb, final ContextImpl context, final BiConsumer<Token, StringBuilder> tagHandler) {
     this.processTokens(sb, context.message(), context, tagHandler);
   }
 
-  private void processTokens(final @NotNull StringBuilder sb, final @NotNull String richMessage, final @NotNull ContextImpl context, final BiConsumer<Token, StringBuilder> tagHandler) {
+  private void processTokens(final StringBuilder sb, final String richMessage, final ContextImpl context, final BiConsumer<Token, StringBuilder> tagHandler) {
     final TagResolver combinedResolver = TagResolver.resolver(this.tagResolver, context.extraTags());
     final List<Token> root = TokenParser.tokenize(richMessage, true);
     for (final Token token : root) {
@@ -125,7 +126,7 @@ private void processTokens(final @NotNull StringBuilder sb, final @NotNull Strin
     }
   }
 
-  @NotNull RootNode parseToTree(final @NotNull ContextImpl context) {
+  RootNode parseToTree(final ContextImpl context) {
     final TagResolver combinedResolver = TagResolver.resolver(this.tagResolver, context.extraTags());
     final String processedMessage = context.preProcessor().apply(context.message());
     final Consumer<String> debug = context.debugOutput();
@@ -205,12 +206,12 @@ private void processTokens(final @NotNull StringBuilder sb, final @NotNull Strin
     return root;
   }
 
-  @NotNull Component parseFormat(final @NotNull ContextImpl context) {
+  Component parseFormat(final ContextImpl context) {
     final ElementNode root = this.parseToTree(context);
     return Objects.requireNonNull(context.postProcessor().apply(this.treeToComponent(root, context)), "Post-processor must not return null");
   }
 
-  @NotNull Component treeToComponent(final @NotNull ElementNode node, final @NotNull ContextImpl context) {
+  Component treeToComponent(final ElementNode node, final ContextImpl context) {
     Component comp = Component.empty();
     Tag tag = null;
     if (node instanceof ValueNode) {
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageSerializer.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageSerializer.java
index 0d082fbddf..2b22af6a7f 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageSerializer.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/MiniMessageSerializer.java
@@ -35,11 +35,12 @@
 import net.kyori.adventure.text.minimessage.internal.serializer.QuotingOverride;
 import net.kyori.adventure.text.minimessage.internal.serializer.SerializableResolver;
 import net.kyori.adventure.text.minimessage.internal.serializer.TokenEmitter;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class MiniMessageSerializer {
   private MiniMessageSerializer() {
   }
@@ -49,7 +50,7 @@ private MiniMessageSerializer() {
   // - abbreviated vs long tag names (tag-specific option)
   //
 
-  static @NotNull String serialize(final @NotNull Component component, final @NotNull SerializableResolver resolver, final boolean strict) {
+  static String serialize(final Component component, final SerializableResolver resolver, final boolean strict) {
     final StringBuilder sb = new StringBuilder();
     final Collector emitter = new Collector(resolver, strict, sb);
 
@@ -65,7 +66,7 @@ private MiniMessageSerializer() {
     return sb.toString();
   }
 
-  private static void visit(final @NotNull Component component, final Collector emitter, final SerializableResolver resolver, final boolean lastChild) {
+  private static void visit(final Component component, final Collector emitter, final SerializableResolver resolver, final boolean lastChild) {
     // visit self
     resolver.handle(component, emitter);
     emitter.flushClaims(component);
@@ -168,7 +169,7 @@ void completeTag() {
     // TokenEmitter
 
     @Override
-    public @NotNull Collector tag(final @NotNull String token) {
+    public Collector tag(final String token) {
       this.completeTag();
       this.consumer.append(TokenParser.TAG_START);
       this.escapeTagContent(token, QuotingOverride.UNQUOTED);
@@ -178,7 +179,7 @@ void completeTag() {
     }
 
     @Override
-    public @NotNull TokenEmitter selfClosingTag(final @NotNull String token) {
+    public TokenEmitter selfClosingTag(final String token) {
       this.completeTag();
       this.consumer.append(TokenParser.TAG_START);
       this.escapeTagContent(token, QuotingOverride.UNQUOTED);
@@ -187,7 +188,7 @@ void completeTag() {
     }
 
     @Override
-    public @NotNull TokenEmitter argument(final @NotNull String arg) {
+    public TokenEmitter argument(final String arg) {
       if (!this.tagState.isTag) {
         throw new IllegalStateException("Not within a tag!");
       }
@@ -197,7 +198,7 @@ void completeTag() {
     }
 
     @Override
-    public @NotNull TokenEmitter argument(final @NotNull String arg, final @NotNull QuotingOverride quotingPreference) {
+    public TokenEmitter argument(final String arg, final QuotingOverride quotingPreference) {
       if (!this.tagState.isTag) {
         throw new IllegalStateException("Not within a tag!");
       }
@@ -207,13 +208,13 @@ void completeTag() {
     }
 
     @Override
-    public @NotNull TokenEmitter argument(final @NotNull Component arg) {
+    public TokenEmitter argument(final Component arg) {
       final String serialized = MiniMessageSerializer.serialize(arg, this.resolver, this.strict);
       return this.argument(serialized, QuotingOverride.QUOTED); // always quote tokens
     }
 
     @Override
-    public @NotNull Collector text(final @NotNull String text) {
+    public Collector text(final String text) {
       this.completeTag();
       // escape '\' and '<'
       appendEscaping(this.consumer, text, TEXT_ESCAPES, true);
@@ -285,12 +286,12 @@ static void appendEscaping(final StringBuilder builder, final String text, final
     }
 
     @Override
-    public @NotNull Collector pop() {
+    public Collector pop() {
       this.emitClose(this.popTag(false));
       return this;
     }
 
-    private void emitClose(final @NotNull String tag) {
+    private void emitClose(final String tag) {
       // currently: we don't keep any arguments, does it ever make sense to?
       if (this.tagState.isTag) {
         if (this.tagState == TagState.MID) { // not _SELF_CLOSING
@@ -312,14 +313,14 @@ private void emitClose(final @NotNull String tag) {
     final Set<String> claimedStyleElements = new HashSet<>();
 
     @Override
-    public void style(final @NotNull String claimKey, final @NotNull Emitable styleClaim) {
+    public void style(final String claimKey, final Emitable styleClaim) {
       if (this.claimedStyleElements.add(requireNonNull(claimKey, "claimKey"))) {
         styleClaim.emit(this);
       }
     }
 
     @Override
-    public boolean component(final @NotNull Emitable componentClaim) {
+    public boolean component(final Emitable componentClaim) {
       if (this.componentClaim != null) return false;
 
       this.componentClaim = requireNonNull(componentClaim, "componentClaim");
@@ -332,7 +333,7 @@ public boolean componentClaimed() {
     }
 
     @Override
-    public boolean styleClaimed(final @NotNull String claimId) {
+    public boolean styleClaimed(final String claimId) {
       return this.claimedStyleElements.contains(claimId);
     }
 
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ParsingException.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ParsingException.java
index 0f19e977d6..7dc1abc233 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ParsingException.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ParsingException.java
@@ -24,8 +24,8 @@
 package net.kyori.adventure.text.minimessage;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * An exception thrown when an error occurs while parsing a MiniMessage string.
@@ -33,6 +33,7 @@
  * @since 4.10.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public abstract class ParsingException extends RuntimeException {
   private static final long serialVersionUID = 4502774670340827070L;
 
@@ -78,7 +79,7 @@ protected ParsingException(final String message, final Throwable cause, final bo
    * @return the original input message
    * @since 4.10.0
    */
-  public abstract @NotNull String originalText();
+  public abstract String originalText();
 
   /**
    * Get the detail message optionally passed with this exception.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/TagInternals.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/TagInternals.java
index 8c0f99ec6a..3ef5c0424a 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/TagInternals.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/TagInternals.java
@@ -29,7 +29,7 @@
 import net.kyori.adventure.text.minimessage.tag.TagPattern;
 import org.intellij.lang.annotations.RegExp;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Utility class for tag naming.
@@ -37,6 +37,7 @@
  * @since 4.10.0
  */
 @ApiStatus.Internal
+@NullMarked
 public final class TagInternals {
   public static final @RegExp String TAG_NAME_REGEX = "[!?#]?[a-z0-9_-]*";
   private static final Pattern TAG_NAME_PATTERN = Pattern.compile(TAG_NAME_REGEX);
@@ -51,7 +52,7 @@ private TagInternals() {
    * @param tagName the name of the tag
    * @since 4.10.0
    */
-  public static void assertValidTagName(@TagPattern final @NotNull String tagName) {
+  public static void assertValidTagName(@TagPattern final String tagName) {
     if (!TAG_NAME_PATTERN.matcher(Objects.requireNonNull(tagName)).matches()) {
       throw new IllegalArgumentException("Tag name must match pattern " + TAG_NAME_PATTERN.pattern() + ", was " + tagName);
     }
@@ -65,7 +66,7 @@ public static void assertValidTagName(@TagPattern final @NotNull String tagName)
    * @return validity of this tag when sanitized
    * @since 4.10.1
    */
-  public static boolean sanitizeAndCheckValidTagName(@TagPattern final @NotNull String tagName) {
+  public static boolean sanitizeAndCheckValidTagName(@TagPattern final String tagName) {
     return TAG_NAME_PATTERN.matcher(Objects.requireNonNull(tagName).toLowerCase(Locale.ROOT)).matches();
   }
 
@@ -77,7 +78,7 @@ public static boolean sanitizeAndCheckValidTagName(@TagPattern final @NotNull St
    * @param tagName the name of the tag
    * @since 4.10.0
    */
-  public static void sanitizeAndAssertValidTagName(@TagPattern final @NotNull String tagName) {
+  public static void sanitizeAndAssertValidTagName(@TagPattern final String tagName) {
     assertValidTagName(Objects.requireNonNull(tagName).toLowerCase(Locale.ROOT));
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/ParsingExceptionImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/ParsingExceptionImpl.java
index 4a628b0e8b..7fc52ff19a 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/ParsingExceptionImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/ParsingExceptionImpl.java
@@ -26,8 +26,8 @@
 import java.util.Arrays;
 import net.kyori.adventure.text.minimessage.ParsingException;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * An exception that happens while parsing.
@@ -35,11 +35,12 @@
  * @since 4.10.0
  */
 @ApiStatus.Internal
+@NullMarked
 public class ParsingExceptionImpl extends ParsingException {
   private static final long serialVersionUID = 2507190809441787202L;
 
   private final String originalText;
-  private Token @NotNull [] tokens;
+  private Token[] tokens;
 
   /**
    * Create a new parsing exception.
@@ -52,7 +53,7 @@ public class ParsingExceptionImpl extends ParsingException {
   public ParsingExceptionImpl(
     final String message,
     final @Nullable String originalText,
-    final @NotNull Token @NotNull ... tokens
+    final Token... tokens
   ) {
     super(message, null, true, false);
     this.tokens = tokens;
@@ -74,7 +75,7 @@ public ParsingExceptionImpl(
     final @Nullable String originalText,
     final @Nullable Throwable cause,
     final boolean withStackTrace,
-    final @NotNull Token @NotNull ... tokens
+    final Token... tokens
   ) {
     super(message, cause, true, withStackTrace);
     this.tokens = tokens;
@@ -114,7 +115,7 @@ public String getMessage() {
    * @return the tokens for this error
    * @since 4.10.0
    */
-  public @NotNull Token @NotNull [] tokens() {
+  public Token[] tokens() {
     return this.tokens;
   }
 
@@ -124,12 +125,12 @@ public String getMessage() {
    * @param tokens the tokens for this error
    * @since 4.10.0
    */
-  public void tokens(final @NotNull Token @NotNull [] tokens) {
+  public void tokens(final Token[] tokens) {
     this.tokens = tokens;
   }
 
   private String arrow() {
-    final @NotNull Token[] ts = this.tokens();
+    final Token[] ts = this.tokens();
     final char[] chars = new char[ts[ts.length - 1].endIndex()];
 
     int i = 0;
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/Token.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/Token.java
index 3392657b84..8ac0a10219 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/Token.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/Token.java
@@ -29,13 +29,14 @@
 import net.kyori.adventure.internal.Internals;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Represents a token for the lexer.
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class Token implements Examinable {
   private final int startIndex;
   private final int endIndex;
@@ -119,7 +120,7 @@ public CharSequence get(final CharSequence message) {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("startIndex", this.startIndex),
       ExaminableProperty.of("endIndex", this.endIndex),
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/TokenParser.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/TokenParser.java
index 8f1e947f39..7a403f5d45 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/TokenParser.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/TokenParser.java
@@ -44,8 +44,8 @@
 import net.kyori.adventure.text.minimessage.tag.ParserDirective;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Handles parsing a string into a list of tokens and then into a tree of nodes.
@@ -53,6 +53,7 @@
  * @since 4.10.0
  */
 @ApiStatus.Internal
+@NullMarked
 public final class TokenParser {
   private static final int MAX_DEPTH = 16;
   // minimessage tags
@@ -79,10 +80,10 @@ private TokenParser() {
    * @since 4.10.0
    */
   public static RootNode parse(
-    final @NotNull TagProvider tagProvider,
-    final @NotNull Predicate<String> tagNameChecker,
-    final @NotNull String message,
-    final @NotNull String originalMessage,
+    final TagProvider tagProvider,
+    final Predicate<String> tagNameChecker,
+    final String message,
+    final String originalMessage,
     final boolean strict
   ) throws ParsingException {
     // collect tokens...
@@ -384,11 +385,11 @@ private static void parseSecondPass(final String message, final List<Token> toke
    * Build a tree from the OPEN_TAG and CLOSE_TAG tokens
    */
   private static RootNode buildTree(
-    final @NotNull TagProvider tagProvider,
-    final @NotNull Predicate<String> tagNameChecker,
-    final @NotNull List<Token> tokens,
-    final @NotNull String message,
-    final @NotNull String originalMessage,
+    final TagProvider tagProvider,
+    final Predicate<String> tagNameChecker,
+    final List<Token> tokens,
+    final String message,
+    final String originalMessage,
     final boolean strict
   ) throws ParsingException {
     final RootNode root = new RootNode(message, originalMessage);
@@ -676,7 +677,7 @@ public interface TagProvider {
      * @return a tag
      * @since 4.10.0
      */
-    @Nullable Tag resolve(final @NotNull String name, final @NotNull List<? extends Tag.Argument> trimmedArgs, final @Nullable Token token);
+    @Nullable Tag resolve(final String name, final List<? extends Tag.Argument> trimmedArgs, final @Nullable Token token);
 
     /**
      * Resolve by sanitized name.
@@ -685,7 +686,7 @@ public interface TagProvider {
      * @return a tag, if any is available
      * @since 4.10.0
      */
-    default @Nullable Tag resolve(final @NotNull String name) {
+    default @Nullable Tag resolve(final String name) {
       return this.resolve(name, Collections.emptyList(), null);
     }
 
@@ -696,7 +697,7 @@ public interface TagProvider {
      * @return a tag, if any is available
      * @since 4.10.0
      */
-    default @Nullable Tag resolve(final @NotNull TagNode node) {
+    default @Nullable Tag resolve(final TagNode node) {
       return this.resolve(
         sanitizePlaceholderName(node.name()),
         node.parts().subList(1, node.parts().size()),
@@ -713,7 +714,7 @@ public interface TagProvider {
      * @return a sanitized name
      * @since 4.10.0
      */
-    static @NotNull String sanitizePlaceholderName(final @NotNull String name) {
+    static String sanitizePlaceholderName(final String name) {
       return name.toLowerCase(Locale.ROOT);
     }
   }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/MatchedTokenConsumer.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/MatchedTokenConsumer.java
index b788705c5f..74f0761667 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/MatchedTokenConsumer.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/MatchedTokenConsumer.java
@@ -25,8 +25,8 @@
 
 import net.kyori.adventure.text.minimessage.internal.parser.TokenType;
 import org.jetbrains.annotations.MustBeInvokedByOverriders;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.UnknownNullability;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A consumer of a region of a string that was identified as a token.
@@ -34,6 +34,7 @@
  * @param <T> the return result
  * @since 4.10.0
  */
+@NullMarked
 public abstract class MatchedTokenConsumer<T> {
   protected final String input;
 
@@ -45,7 +46,7 @@ public abstract class MatchedTokenConsumer<T> {
    * @param input the input
    * @since 4.10.0
    */
-  public MatchedTokenConsumer(final @NotNull String input) {
+  public MatchedTokenConsumer(final String input) {
     this.input = input;
   }
 
@@ -58,7 +59,7 @@ public MatchedTokenConsumer(final @NotNull String input) {
    * @since 4.10.0
    */
   @MustBeInvokedByOverriders
-  public void accept(final int start, final int end, final @NotNull TokenType tokenType) {
+  public void accept(final int start, final int end, final TokenType tokenType) {
     this.lastIndex = end;
   }
 
@@ -68,7 +69,7 @@ public void accept(final int start, final int end, final @NotNull TokenType toke
    * @return the result
    * @since 4.10.0
    */
-  public abstract @UnknownNullability T result();
+  public abstract @Nullable T result();
 
   /**
    * The last accepted end index, or {@code -1} if no match has been accepted.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/StringResolvingMatchedTokenConsumer.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/StringResolvingMatchedTokenConsumer.java
index 95d7a117b5..d5362aac0c 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/StringResolvingMatchedTokenConsumer.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/StringResolvingMatchedTokenConsumer.java
@@ -34,8 +34,8 @@
 import net.kyori.adventure.text.minimessage.internal.parser.node.TagPart;
 import net.kyori.adventure.text.minimessage.tag.PreProcess;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static net.kyori.adventure.text.minimessage.internal.parser.TokenParser.SEPARATOR;
 import static net.kyori.adventure.text.minimessage.internal.parser.TokenParser.tokenize;
@@ -45,6 +45,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class StringResolvingMatchedTokenConsumer extends MatchedTokenConsumer<String> {
   private final StringBuilder builder;
   private final TagProvider tagProvider;
@@ -57,8 +58,8 @@ public final class StringResolvingMatchedTokenConsumer extends MatchedTokenConsu
    * @since 4.10.0
    */
   public StringResolvingMatchedTokenConsumer(
-    final @NotNull String input,
-    final @NotNull TagProvider tagProvider
+    final String input,
+    final TagProvider tagProvider
   ) {
     super(input);
     this.builder = new StringBuilder(input.length());
@@ -66,7 +67,7 @@ public StringResolvingMatchedTokenConsumer(
   }
 
   @Override
-  public void accept(final int start, final int end, final @NotNull TokenType tokenType) {
+  public void accept(final int start, final int end, final TokenType tokenType) {
     super.accept(start, end, tokenType);
 
     if (tokenType != TokenType.OPEN_TAG) {
@@ -105,7 +106,7 @@ public void accept(final int start, final int end, final @NotNull TokenType toke
   }
 
   @Override
-  public @NotNull String result() {
+  public String result() {
     return this.builder.toString();
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/TokenListProducingMatchedTokenConsumer.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/TokenListProducingMatchedTokenConsumer.java
index e2b8a9c05a..4afad48fdf 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/TokenListProducingMatchedTokenConsumer.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/match/TokenListProducingMatchedTokenConsumer.java
@@ -28,13 +28,14 @@
 import java.util.List;
 import net.kyori.adventure.text.minimessage.internal.parser.Token;
 import net.kyori.adventure.text.minimessage.internal.parser.TokenType;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A matched token consumer that produces a list of matched tokens.
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class TokenListProducingMatchedTokenConsumer extends MatchedTokenConsumer<List<Token>> {
   private List<Token> result = null;
 
@@ -44,12 +45,12 @@ public final class TokenListProducingMatchedTokenConsumer extends MatchedTokenCo
    * @param input the input
    * @since 4.10.0
    */
-  public TokenListProducingMatchedTokenConsumer(final @NotNull String input) {
+  public TokenListProducingMatchedTokenConsumer(final String input) {
     super(input);
   }
 
   @Override
-  public void accept(final int start, final int end, final @NotNull TokenType tokenType) {
+  public void accept(final int start, final int end, final TokenType tokenType) {
     super.accept(start, end, tokenType);
 
     if (this.result == null) {
@@ -60,7 +61,7 @@ public void accept(final int start, final int end, final @NotNull TokenType toke
   }
 
   @Override
-  public @NotNull List<Token> result() {
+  public List<Token> result() {
     return this.result == null ? Collections.emptyList() : this.result;
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/ElementNode.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/ElementNode.java
index 30cba03be3..bc9f451387 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/ElementNode.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/ElementNode.java
@@ -30,14 +30,15 @@
 import net.kyori.adventure.text.minimessage.internal.parser.Token;
 import net.kyori.adventure.text.minimessage.internal.parser.TokenType;
 import net.kyori.adventure.text.minimessage.tree.Node;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents a node in the tree.
  *
  * @since 4.10.0
  */
+@NullMarked
 public class ElementNode implements Node {
   private final @Nullable ElementNode parent;
   private final @Nullable Token token;
@@ -52,7 +53,7 @@ public class ElementNode implements Node {
    * @param sourceMessage the source message
    * @since 4.10.0
    */
-  ElementNode(final @Nullable ElementNode parent, final @Nullable Token token, final @NotNull String sourceMessage) {
+  ElementNode(final @Nullable ElementNode parent, final @Nullable Token token, final String sourceMessage) {
     this.parent = parent;
     this.token = token;
     this.sourceMessage = sourceMessage;
@@ -85,7 +86,7 @@ public class ElementNode implements Node {
    * @return the source message
    * @since 4.10.0
    */
-  public @NotNull String sourceMessage() {
+  public String sourceMessage() {
     return this.sourceMessage;
   }
 
@@ -96,7 +97,7 @@ public class ElementNode implements Node {
    * @since 4.10.0
    */
   @Override
-  public @NotNull List<ElementNode> children() {
+  public List<ElementNode> children() {
     return Collections.unmodifiableList(this.children);
   }
 
@@ -106,7 +107,7 @@ public class ElementNode implements Node {
    * @return the children of this node
    * @since 4.10.0
    */
-  public @NotNull List<ElementNode> unsafeChildren() {
+  public List<ElementNode> unsafeChildren() {
     return this.children;
   }
 
@@ -118,7 +119,7 @@ public class ElementNode implements Node {
    * @param childNode the child node to add.
    * @since 4.10.0
    */
-  public void addChild(final @NotNull ElementNode childNode) {
+  public void addChild(final ElementNode childNode) {
     final int last = this.children.size() - 1;
     if (!(childNode instanceof TextNode) || this.children.isEmpty() || !(this.children.get(last) instanceof TextNode)) {
       this.children.add(childNode);
@@ -143,7 +144,7 @@ public void addChild(final @NotNull ElementNode childNode) {
    * @return the passed string builder, for chaining
    * @since 4.10.0
    */
-  public @NotNull StringBuilder buildToString(final @NotNull StringBuilder sb, final int indent) {
+  public StringBuilder buildToString(final StringBuilder sb, final int indent) {
     final char[] in = this.ident(indent);
     sb.append(in).append("Node {\n");
     for (final ElementNode child : this.children) {
@@ -153,14 +154,14 @@ public void addChild(final @NotNull ElementNode childNode) {
     return sb;
   }
 
-  char @NotNull [] ident(final int indent) {
+  char[] ident(final int indent) {
     final char[] c = new char[indent * 2];
     Arrays.fill(c, ' ');
     return c;
   }
 
   @Override
-  public @NotNull String toString() {
+  public String toString() {
     return this.buildToString(new StringBuilder(), 0).toString();
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/RootNode.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/RootNode.java
index bbec5e2dd2..88837d8680 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/RootNode.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/RootNode.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.text.minimessage.internal.parser.node;
 
 import net.kyori.adventure.text.minimessage.tree.Node;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Represents the root node of a tree.
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class RootNode extends ElementNode implements Node.Root {
   private final String beforePreprocessing;
 
@@ -41,13 +42,13 @@ public final class RootNode extends ElementNode implements Node.Root {
    * @param beforePreprocessing the source message before handling preProcess tags
    * @since 4.10.0
    */
-  public RootNode(final @NotNull String sourceMessage, final @NotNull String beforePreprocessing) {
+  public RootNode(final String sourceMessage, final String beforePreprocessing) {
     super(null, null, sourceMessage);
     this.beforePreprocessing = beforePreprocessing;
   }
 
   @Override
-  public @NotNull String input() {
+  public String input() {
     return this.beforePreprocessing;
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagNode.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagNode.java
index 425e839037..8efea5c143 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagNode.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagNode.java
@@ -30,14 +30,15 @@
 import net.kyori.adventure.text.minimessage.internal.parser.Token;
 import net.kyori.adventure.text.minimessage.internal.parser.TokenParser;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Node that represents a tag.
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class TagNode extends ElementNode {
   private final List<TagPart> parts;
   private @Nullable Tag tag = null;
@@ -52,10 +53,10 @@ public final class TagNode extends ElementNode {
    * @since 4.10.0
    */
   public TagNode(
-      final @NotNull ElementNode parent,
-      final @NotNull Token token,
-      final @NotNull String sourceMessage,
-      final TokenParser.@NotNull TagProvider tagProvider
+      final ElementNode parent,
+      final Token token,
+      final String sourceMessage,
+      final TokenParser.TagProvider tagProvider
   ) {
     super(parent, token, sourceMessage);
     this.parts = genParts(token, sourceMessage, tagProvider);
@@ -66,10 +67,10 @@ public TagNode(
     }
   }
 
-  private static @NotNull List<TagPart> genParts(
-    final @NotNull Token token,
-    final @NotNull String sourceMessage,
-    final TokenParser.@NotNull TagProvider tagProvider
+  private static List<TagPart> genParts(
+    final Token token,
+    final String sourceMessage,
+    final TokenParser.TagProvider tagProvider
   ) {
     final ArrayList<TagPart> parts = new ArrayList<>();
 
@@ -88,7 +89,7 @@ public TagNode(
    * @return the parts
    * @since 4.10.0
    */
-  public @NotNull List<TagPart> parts() {
+  public List<TagPart> parts() {
     return this.parts;
   }
 
@@ -98,12 +99,12 @@ public TagNode(
    * @return the name
    * @since 4.10.0
    */
-  public @NotNull String name() {
+  public String name() {
     return this.parts.get(0).value();
   }
 
   @Override
-  public @NotNull Token token() {
+  public Token token() {
     return Objects.requireNonNull(super.token(), "token is not set");
   }
 
@@ -113,7 +114,7 @@ public TagNode(
    * @return the tag for this tag node
    * @since 4.10.0
    */
-  public @NotNull Tag tag() {
+  public Tag tag() {
     return Objects.requireNonNull(this.tag, "no tag set");
   }
 
@@ -123,12 +124,12 @@ public TagNode(
    * @param tag the tag logic
    * @since 4.10.0
    */
-  public void tag(final @NotNull Tag tag) {
+  public void tag(final Tag tag) {
     this.tag = tag;
   }
 
   @Override
-  public @NotNull StringBuilder buildToString(final @NotNull StringBuilder sb, final int indent) {
+  public StringBuilder buildToString(final StringBuilder sb, final int indent) {
     final char[] in = this.ident(indent);
     sb.append(in).append("TagNode(");
 
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagPart.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagPart.java
index 3e21a4b02a..0704905158 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagPart.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TagPart.java
@@ -26,13 +26,14 @@
 import net.kyori.adventure.text.minimessage.internal.parser.Token;
 import net.kyori.adventure.text.minimessage.internal.parser.TokenParser;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Represents an inner part of a tag.
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class TagPart implements Tag.Argument {
   private final String value;
   private final Token token;
@@ -46,9 +47,9 @@ public final class TagPart implements Tag.Argument {
    * @since 4.10.0
    */
   public TagPart(
-    final @NotNull String sourceMessage,
-    final @NotNull Token token,
-    final TokenParser.@NotNull TagProvider tagResolver
+    final String sourceMessage,
+    final Token token,
+    final TokenParser.TagProvider tagResolver
   ) {
     String v = unquoteAndEscape(sourceMessage, token.startIndex(), token.endIndex());
     v = TokenParser.resolvePreProcessTags(v, tagResolver);
@@ -64,7 +65,7 @@ public TagPart(
    * @since 4.10.0
    */
   @Override
-  public @NotNull String value() {
+  public String value() {
     return this.value;
   }
 
@@ -74,7 +75,7 @@ public TagPart(
    * @return the token
    * @since 4.10.0
    */
-  public @NotNull Token token() {
+  public Token token() {
     return this.token;
   }
 
@@ -87,7 +88,7 @@ public TagPart(
    * @return the output substring
    * @since 4.10.0
    */
-  public static @NotNull String unquoteAndEscape(final @NotNull String text, final int start, final int end) {
+  public static String unquoteAndEscape(final String text, final int start, final int end) {
     if (start == end) {
       return "";
     }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TextNode.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TextNode.java
index dce9cb2c20..0a9f9811e7 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TextNode.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/TextNode.java
@@ -25,14 +25,15 @@
 
 import net.kyori.adventure.text.minimessage.internal.parser.Token;
 import net.kyori.adventure.text.minimessage.internal.parser.TokenParser;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents a string of chars.
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class TextNode extends ValueNode {
   private static boolean isEscape(final int escape) {
     return escape == TokenParser.TAG_START || escape == TokenParser.ESCAPE;
@@ -48,8 +49,8 @@ private static boolean isEscape(final int escape) {
    */
   public TextNode(
     final @Nullable ElementNode parent,
-    final @NotNull Token token,
-    final @NotNull String sourceMessage
+    final Token token,
+    final String sourceMessage
   ) {
     super(parent, token, sourceMessage, TokenParser.unescape(sourceMessage, token.startIndex(), token.endIndex(), TextNode::isEscape));
   }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/ValueNode.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/ValueNode.java
index fd2e330700..be0516309e 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/ValueNode.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/parser/node/ValueNode.java
@@ -25,15 +25,15 @@
 
 import java.util.Objects;
 import net.kyori.adventure.text.minimessage.internal.parser.Token;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents a node in the tree which has a text value.
  *
  * @since 4.10.0
  */
-
+@NullMarked
 public abstract class ValueNode extends ElementNode {
   private final String value;
 
@@ -46,7 +46,7 @@ public abstract class ValueNode extends ElementNode {
    * @param value the value of this text node
    * @since 4.10.0
    */
-  ValueNode(final @Nullable ElementNode parent, final @Nullable Token token, final @NotNull String sourceMessage, final @NotNull String value) {
+  ValueNode(final @Nullable ElementNode parent, final @Nullable Token token, final String sourceMessage, final String value) {
     super(parent, token, sourceMessage);
     this.value = value;
   }
@@ -59,17 +59,17 @@ public abstract class ValueNode extends ElementNode {
    * @return the value
    * @since 4.10.0
    */
-  public @NotNull String value() {
+  public String value() {
     return this.value;
   }
 
   @Override
-  public @NotNull Token token() {
+  public Token token() {
     return Objects.requireNonNull(super.token(), "token is not set");
   }
 
   @Override
-  public @NotNull StringBuilder buildToString(final @NotNull StringBuilder sb, final int indent) {
+  public StringBuilder buildToString(final StringBuilder sb, final int indent) {
     final char[] in = this.ident(indent);
     sb.append(in).append(this.valueName()).append("('").append(this.value).append("')\n");
     return sb;
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/ClaimConsumer.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/ClaimConsumer.java
index bd0acb7a43..a32ff4d1be 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/ClaimConsumer.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/ClaimConsumer.java
@@ -23,13 +23,14 @@
  */
 package net.kyori.adventure.text.minimessage.internal.serializer;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A consumer of serialization claims.
  *
  * @since 4.10.0
  */
+@NullMarked
 public interface ClaimConsumer {
   /**
    * Submit a style claim for the active component.
@@ -40,7 +41,7 @@ public interface ClaimConsumer {
    * @param styleClaim the claim of a style
    * @since 4.10.0
    */
-  void style(final @NotNull String claimKey, final @NotNull Emitable styleClaim);
+  void style(final String claimKey, final Emitable styleClaim);
 
   /**
    * Submit a component claim for the active component.
@@ -51,7 +52,7 @@ public interface ClaimConsumer {
    * @return whether the claim was successful
    * @since 4.10.0
    */
-  boolean component(final @NotNull Emitable componentClaim);
+  boolean component(final Emitable componentClaim);
 
   /**
    * Get whether a style element has been claimed yet.
@@ -60,7 +61,7 @@ public interface ClaimConsumer {
    * @return whether style is claimed
    * @since 4.10.0
    */
-  boolean styleClaimed(final @NotNull String claimId);
+  boolean styleClaimed(final String claimId);
 
   /**
    * Get whether a component has been claimed yet.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/ComponentClaimingResolverImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/ComponentClaimingResolverImpl.java
index 4eff84d094..a10a0624d3 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/ComponentClaimingResolverImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/ComponentClaimingResolverImpl.java
@@ -32,13 +32,14 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 class ComponentClaimingResolverImpl implements TagResolver, SerializableResolver.Single {
-  private final @NotNull Set<String> names;
-  private final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler;
-  private final @NotNull Function<Component, @Nullable Emitable> componentClaim;
+  private final Set<String> names;
+  private final BiFunction<ArgumentQueue, Context, Tag> handler;
+  private final Function<Component, @Nullable Emitable> componentClaim;
 
   ComponentClaimingResolverImpl(final Set<String> names, final BiFunction<ArgumentQueue, Context, Tag> handler, final Function<Component, @Nullable Emitable> componentClaim) {
     this.names = names;
@@ -47,19 +48,19 @@ class ComponentClaimingResolverImpl implements TagResolver, SerializableResolver
   }
 
   @Override
-  public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) throws ParsingException {
+  public @Nullable Tag resolve(final String name, final ArgumentQueue arguments, final Context ctx) throws ParsingException {
     if (!this.names.contains(name)) return null;
 
     return this.handler.apply(arguments, ctx);
   }
 
   @Override
-  public boolean has(final @NotNull String name) {
+  public boolean has(final String name) {
     return this.names.contains(name);
   }
 
   @Override
-  public @Nullable Emitable claimComponent(final @NotNull Component component) {
+  public @Nullable Emitable claimComponent(final Component component) {
     return this.componentClaim.apply(component);
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/Emitable.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/Emitable.java
index 0f5fc52fde..e57834d7dc 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/Emitable.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/Emitable.java
@@ -23,7 +23,7 @@
  */
 package net.kyori.adventure.text.minimessage.internal.serializer;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Something that holds data representable as MiniMessage tags.
@@ -31,6 +31,7 @@
  * @since 4.10.0
  */
 @FunctionalInterface
+@NullMarked
 public interface Emitable {
   /**
    * Emit tags based on this emitable's data.
@@ -38,5 +39,5 @@ public interface Emitable {
    * @param emitter the target to emit to
    * @since 4.10.0
    */
-  void emit(final @NotNull TokenEmitter emitter);
+  void emit(final TokenEmitter emitter);
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/SerializableResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/SerializableResolver.java
index 8691f02b74..d787437c0b 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/SerializableResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/SerializableResolver.java
@@ -35,8 +35,8 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -45,6 +45,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 public interface SerializableResolver {
   /**
    * Create a tag resolver that only responds to a single tag name, and whose value does not depend on that name.
@@ -55,7 +56,7 @@ public interface SerializableResolver {
    * @return a resolver that creates tags using the provided handler
    * @since 4.10.0
    */
-  static @NotNull TagResolver claimingComponent(final @NotNull String name, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler, final @NotNull Function<Component, @Nullable Emitable> componentClaim) {
+  static TagResolver claimingComponent(final String name, final BiFunction<ArgumentQueue, Context, Tag> handler, final Function<Component, @Nullable Emitable> componentClaim) {
     return claimingComponent(Collections.singleton(name), handler, componentClaim);
   }
 
@@ -68,7 +69,7 @@ public interface SerializableResolver {
    * @return a resolver that creates tags using the provided handler
    * @since 4.10.0
    */
-  static @NotNull TagResolver claimingComponent(final @NotNull Set<String> names, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler, final @NotNull Function<Component, @Nullable Emitable> componentClaim) {
+  static TagResolver claimingComponent(final Set<String> names, final BiFunction<ArgumentQueue, Context, Tag> handler, final Function<Component, @Nullable Emitable> componentClaim) {
     final Set<String> ownNames = new HashSet<>(names);
     for (final String name : ownNames) {
       TagInternals.assertValidTagName(name);
@@ -86,7 +87,7 @@ public interface SerializableResolver {
    * @return a resolver that creates tags using the provided handler
    * @since 4.10.0
    */
-  static @NotNull TagResolver claimingStyle(final @NotNull String name, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler, final @NotNull StyleClaim<?> styleClaim) {
+  static TagResolver claimingStyle(final String name, final BiFunction<ArgumentQueue, Context, Tag> handler, final StyleClaim<?> styleClaim) {
     return claimingStyle(Collections.singleton(name), handler, styleClaim);
   }
 
@@ -99,7 +100,7 @@ public interface SerializableResolver {
    * @return a resolver that creates tags using the provided handler
    * @since 4.10.0
    */
-  static @NotNull TagResolver claimingStyle(final @NotNull Set<String> names, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler, final @NotNull StyleClaim<?> styleClaim) {
+  static TagResolver claimingStyle(final Set<String> names, final BiFunction<ArgumentQueue, Context, Tag> handler, final StyleClaim<?> styleClaim) {
     final Set<String> ownNames = new HashSet<>(names);
     for (final String name : ownNames) {
       TagInternals.assertValidTagName(name);
@@ -115,7 +116,7 @@ public interface SerializableResolver {
    * @param consumer a consumer for component claims, must not be stored
    * @since 4.10.0
    */
-  void handle(final @NotNull Component serializable, final @NotNull ClaimConsumer consumer);
+  void handle(final Component serializable, final ClaimConsumer consumer);
 
   /**
    * A subinterface for resolvers that only handle one single tag.
@@ -124,7 +125,7 @@ public interface SerializableResolver {
    */
   interface Single extends SerializableResolver {
     @Override
-    default void handle(final @NotNull Component serializable, final @NotNull ClaimConsumer consumer) {
+    default void handle(final Component serializable, final ClaimConsumer consumer) {
       final @Nullable StyleClaim<?> style = this.claimStyle();
       if (style != null && !consumer.styleClaimed(style.claimKey())) {
         final @Nullable Emitable applied = style.apply(serializable.style());
@@ -164,7 +165,7 @@ default void handle(final @NotNull Component serializable, final @NotNull ClaimC
      * @return an emitable if this claimer handles the provided component type
      * @since 4.10.0
      */
-    default @Nullable Emitable claimComponent(final @NotNull Component component) {
+    default @Nullable Emitable claimComponent(final Component component) {
       return null;
     }
   }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaim.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaim.java
index 2229526877..257e3c34c0 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaim.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaim.java
@@ -27,8 +27,8 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -38,6 +38,7 @@
  * @param <V> the element type
  * @since 4.10.0
  */
+@NullMarked
 public interface StyleClaim<V> {
   /**
    * Create a new style claim that will emit content for any non-null value.
@@ -49,7 +50,7 @@ public interface StyleClaim<V> {
    * @return a new claim
    * @since 4.10.0
    */
-  static <T> @NotNull StyleClaim<T> claim(final @NotNull String claimKey, final @NotNull Function<Style, @Nullable T> lens, final @NotNull BiConsumer<T, TokenEmitter> emitable) {
+  static <T> StyleClaim<T> claim(final String claimKey, final Function<Style, @Nullable T> lens, final BiConsumer<T, TokenEmitter> emitable) {
     return claim(claimKey, lens, $ -> true, emitable);
   }
 
@@ -64,7 +65,7 @@ public interface StyleClaim<V> {
    * @return a new claim
    * @since 4.10.0
    */
-  static <T> @NotNull StyleClaim<T> claim(final @NotNull String claimKey, final @NotNull Function<Style, @Nullable T> lens, final @NotNull Predicate<T> filter, final @NotNull BiConsumer<T, TokenEmitter> emitable) {
+  static <T> StyleClaim<T> claim(final String claimKey, final Function<Style, @Nullable T> lens, final Predicate<T> filter, final BiConsumer<T, TokenEmitter> emitable) {
     return new StyleClaimImpl<>(
       requireNonNull(claimKey, "claimKey"),
       requireNonNull(lens, "lens"),
@@ -79,7 +80,7 @@ public interface StyleClaim<V> {
    * @return the key to claim
    * @since 4.10.0
    */
-  @NotNull String claimKey(); // TODO: multiple claim keys? for custom styling tags?
+  String claimKey(); // TODO: multiple claim keys? for custom styling tags?
 
   /**
    * Prepare an emitable to apply this claim based on the style.
@@ -88,5 +89,5 @@ public interface StyleClaim<V> {
    * @return an emitable for this style claim, if it is applicable to the provided style
    * @since 4.10.0
    */
-  @Nullable Emitable apply(final @NotNull Style style);
+  @Nullable Emitable apply(final Style style);
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaimImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaimImpl.java
index 2d9c632c62..aecaf5e64b 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaimImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaimImpl.java
@@ -28,9 +28,10 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import net.kyori.adventure.text.format.Style;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 class StyleClaimImpl<V> implements StyleClaim<V> {
   private final String claimKey;
   private final Function<Style, V> lens;
@@ -45,12 +46,12 @@ class StyleClaimImpl<V> implements StyleClaim<V> {
   }
 
   @Override
-  public @NotNull String claimKey() {
+  public String claimKey() {
     return this.claimKey;
   }
 
   @Override
-  public @Nullable Emitable apply(final @NotNull Style style) {
+  public @Nullable Emitable apply(final Style style) {
     final V element = this.lens.apply(style);
     if (element == null || !this.filter.test(element)) return null;
 
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaimingResolverImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaimingResolverImpl.java
index 5d803ceb27..3c264b65c4 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaimingResolverImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/StyleClaimingResolverImpl.java
@@ -30,29 +30,30 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class StyleClaimingResolverImpl implements TagResolver, SerializableResolver.Single {
-  private final @NotNull Set<String> names;
-  private final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler;
-  private final @NotNull StyleClaim<?> styleClaim;
+  private final Set<String> names;
+  private final BiFunction<ArgumentQueue, Context, Tag> handler;
+  private final StyleClaim<?> styleClaim;
 
-  StyleClaimingResolverImpl(final @NotNull Set<String> names, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler, final @NotNull StyleClaim<?> styleClaim) {
+  StyleClaimingResolverImpl(final Set<String> names, final BiFunction<ArgumentQueue, Context, Tag> handler, final StyleClaim<?> styleClaim) {
     this.names = names;
     this.handler = handler;
     this.styleClaim = styleClaim;
   }
 
   @Override
-  public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) throws ParsingException {
+  public @Nullable Tag resolve(final String name, final ArgumentQueue arguments, final Context ctx) throws ParsingException {
     if (!this.names.contains(name)) return null;
 
     return this.handler.apply(arguments, ctx);
   }
 
   @Override
-  public boolean has(final @NotNull String name) {
+  public boolean has(final String name) {
     return this.names.contains(name);
   }
 
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/TokenEmitter.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/TokenEmitter.java
index 4e2047893c..510dff6ace 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/TokenEmitter.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/internal/serializer/TokenEmitter.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.text.minimessage.internal.serializer;
 
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A consumer of tokens used to generate MiniMessage output.
  *
  * @since 4.10.0
  */
+@NullMarked
 public interface TokenEmitter {
   /**
    * Open a tag with or without arguments.
@@ -39,7 +40,7 @@ public interface TokenEmitter {
    * @return this emitter
    * @since 4.10.0
    */
-  @NotNull TokenEmitter tag(final @NotNull String token); // TODO: some sort of TagFlags, with things like SELF_CLOSING, CLOSE_WITH_ARGUMENTS, etc?
+  TokenEmitter tag(final String token); // TODO: some sort of TagFlags, with things like SELF_CLOSING, CLOSE_WITH_ARGUMENTS, etc?
 
   /**
    * Open a tag with or without arguments that cannot have children.
@@ -50,7 +51,7 @@ public interface TokenEmitter {
    * @return this emitter
    * @since 4.10.0
    */
-  @NotNull TokenEmitter selfClosingTag(final @NotNull String token); // TODO: some sort of TagFlags, with things like SELF_CLOSING, CLOSE_WITH_ARGUMENTS, etc?
+  TokenEmitter selfClosingTag(final String token); // TODO: some sort of TagFlags, with things like SELF_CLOSING, CLOSE_WITH_ARGUMENTS, etc?
 
   /**
    * Add arguments to the current tag.
@@ -61,7 +62,7 @@ public interface TokenEmitter {
    * @return this emitter
    * @since 4.10.0
    */
-  default @NotNull TokenEmitter arguments(final @NotNull String... args) {
+  default TokenEmitter arguments(final String... args) {
     for (final String arg : args) {
       this.argument(arg);
     }
@@ -77,7 +78,7 @@ public interface TokenEmitter {
    * @return this emitter
    * @since 4.10.0
    */
-  @NotNull TokenEmitter argument(final @NotNull String arg);
+  TokenEmitter argument(final String arg);
 
   /**
    * Add a single argument to the current tag.
@@ -89,7 +90,7 @@ public interface TokenEmitter {
    * @return this emitter
    * @since 4.10.0
    */
-  @NotNull TokenEmitter argument(final @NotNull String arg, final @NotNull QuotingOverride quotingPreference);
+  TokenEmitter argument(final String arg, final QuotingOverride quotingPreference);
 
   /**
    * Add a single argument to the current tag.
@@ -100,7 +101,7 @@ public interface TokenEmitter {
    * @return this emitter
    * @since 4.10.0
    */
-  @NotNull TokenEmitter argument(final @NotNull Component arg);
+  TokenEmitter argument(final Component arg);
 
   /**
    * Emit literal text.
@@ -111,7 +112,7 @@ public interface TokenEmitter {
    * @return this emitter
    * @since 4.10.0
    */
-  @NotNull TokenEmitter text(final @NotNull String text);
+  TokenEmitter text(final String text);
 
   /**
    * Explicitly end a token, only needed if there are multiple tokens within an {@link Emitable} for some reason.
@@ -121,5 +122,5 @@ public interface TokenEmitter {
    * @return this emitter
    * @since 4.10.0
    */
-  @NotNull TokenEmitter pop();
+  TokenEmitter pop();
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/CallbackStylingTagImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/CallbackStylingTagImpl.java
index b14cd55afd..513a3baec6 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/CallbackStylingTagImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/CallbackStylingTagImpl.java
@@ -29,8 +29,9 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 final class CallbackStylingTagImpl extends AbstractTag implements Inserting {
   private final Consumer<Style.Builder> styles;
 
@@ -39,7 +40,7 @@ final class CallbackStylingTagImpl extends AbstractTag implements Inserting {
   }
 
   @Override
-  public @NotNull Component value() {
+  public Component value() {
     return Component.text("", Style.style(this.styles));
   }
 
@@ -57,7 +58,7 @@ public boolean equals(final Object other) {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("styles", this.styles));
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Inserting.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Inserting.java
index fd14bd4c3e..164bb580e1 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Inserting.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Inserting.java
@@ -24,13 +24,14 @@
 package net.kyori.adventure.text.minimessage.tag;
 
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A tag that inserts a {@link Component} into the output.
  *
  * @since 4.10.0
  */
+@NullMarked
 public /* non-sealed */ interface Inserting extends Tag {
   /**
    * Returns the component this tag produces.
@@ -38,7 +39,7 @@
    * @return the component this tag produces
    * @since 4.10.0
    */
-  @NotNull Component value();
+  Component value();
 
   /**
    * Get whether this tag allows children.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/InsertingImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/InsertingImpl.java
index ac074e0ffe..eb4df8e374 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/InsertingImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/InsertingImpl.java
@@ -27,9 +27,10 @@
 import java.util.stream.Stream;
 import net.kyori.adventure.text.Component;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class InsertingImpl extends AbstractTag implements Inserting {
   private final boolean allowsChildren;
   private final Component value;
@@ -45,7 +46,7 @@ public boolean allowsChildren() {
   }
 
   @Override
-  public @NotNull Component value() {
+  public Component value() {
     return this.value;
   }
 
@@ -63,7 +64,7 @@ public boolean equals(final @Nullable Object other) {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("allowsChildren", this.allowsChildren),
       ExaminableProperty.of("value", this.value)
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Modifying.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Modifying.java
index b8d425f2f8..3be7c23312 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Modifying.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Modifying.java
@@ -26,7 +26,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tree.Node;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A tag that can transform a whole subtree of nodes.
@@ -34,6 +34,7 @@
  * @since 4.10.0
  */
 @ApiStatus.OverrideOnly
+@NullMarked
 public /* non-sealed */ interface Modifying extends Tag {
   /**
    * Method called once for every element in the subtree, allowing calculations to be made before {@link #apply(Component, int) application}.
@@ -42,7 +43,7 @@
    * @param depth depth in the tree this node is at
    * @since 4.10.0
    */
-  default void visit(final @NotNull Node current, final int depth) {
+  default void visit(final Node current, final int depth) {
   }
 
   /**
@@ -65,5 +66,5 @@ default void postVisit() {
    * @return the new parent
    * @since 4.10.0
    */
-  Component apply(final @NotNull Component current, final int depth);
+  Component apply(final Component current, final int depth);
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/PreProcess.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/PreProcess.java
index 116bdddfa1..7c38a94da6 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/PreProcess.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/PreProcess.java
@@ -23,7 +23,7 @@
  */
 package net.kyori.adventure.text.minimessage.tag;
 
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A tag that is applied at the tokenization stage, before the tree is constructed.
@@ -32,6 +32,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 public /* non-sealed */ interface PreProcess extends Tag {
   /**
    * The value to insert at the pre-process phase.
@@ -39,5 +40,5 @@
    * @return the value to insert
    * @since 4.10.0
    */
-  @NotNull String value();
+  String value();
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/PreProcessTagImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/PreProcessTagImpl.java
index d3027b0ef5..0784de5821 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/PreProcessTagImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/PreProcessTagImpl.java
@@ -26,9 +26,10 @@
 import java.util.Objects;
 import java.util.stream.Stream;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class PreProcessTagImpl extends AbstractTag implements PreProcess {
   private final String value;
 
@@ -37,7 +38,7 @@ final class PreProcessTagImpl extends AbstractTag implements PreProcess {
   }
 
   @Override
-  public @NotNull String value() {
+  public String value() {
     return this.value;
   }
 
@@ -55,7 +56,7 @@ public boolean equals(final @Nullable Object other) {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("value", this.value));
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/StylingTagImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/StylingTagImpl.java
index fb38d338ca..e6a2b037f0 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/StylingTagImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/StylingTagImpl.java
@@ -29,9 +29,10 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.StyleBuilderApplicable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class StylingTagImpl extends AbstractTag implements Inserting {
   private final StyleBuilderApplicable[] styles;
 
@@ -40,7 +41,7 @@ final class StylingTagImpl extends AbstractTag implements Inserting {
   }
 
   @Override
-  public @NotNull Component value() {
+  public Component value() {
     return Component.text("", Style.style(this.styles));
   }
 
@@ -58,7 +59,7 @@ public boolean equals(final @Nullable Object other) {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("styles", this.styles));
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Tag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Tag.java
index ca08ae9d42..c5d3d58bbb 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Tag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/Tag.java
@@ -33,7 +33,7 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.StyleBuilderApplicable;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
@@ -45,6 +45,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 public /* sealed */ interface Tag /* permits Inserting, Modifying, ParserDirective, PreProcess, /internal/ AbstractTag */ {
 
   /**
@@ -54,7 +55,7 @@
    * @return a new tag
    * @since 4.10.0
    */
-  static @NotNull PreProcess preProcessParsed(final @NotNull String content) {
+  static PreProcess preProcessParsed(final String content) {
     return new PreProcessTagImpl(requireNonNull(content, "content"));
   }
 
@@ -67,7 +68,7 @@
    * @return a tag that will insert this component
    * @since 4.10.0
    */
-  static @NotNull Tag inserting(final @NotNull Component content) {
+  static Tag inserting(final Component content) {
     return new InsertingImpl(true, requireNonNull(content, "content must not be null"));
   }
 
@@ -80,7 +81,7 @@
    * @return a tag that will insert this component
    * @since 4.10.0
    */
-  static @NotNull Tag inserting(final @NotNull ComponentLike value) {
+  static Tag inserting(final ComponentLike value) {
     return inserting(requireNonNull(value, "value").asComponent());
   }
 
@@ -93,7 +94,7 @@
    * @return a tag that will insert this component
    * @since 4.10.0
    */
-  static @NotNull Tag selfClosingInserting(final @NotNull Component content) {
+  static Tag selfClosingInserting(final Component content) {
     return new InsertingImpl(false, requireNonNull(content, "content must not be null"));
   }
 
@@ -106,7 +107,7 @@
    * @return a tag that will insert this component
    * @since 4.10.0
    */
-  static @NotNull Tag selfClosingInserting(final @NotNull ComponentLike value) {
+  static Tag selfClosingInserting(final ComponentLike value) {
     return selfClosingInserting(requireNonNull(value, "value").asComponent());
   }
 
@@ -117,7 +118,7 @@
    * @return a tag for this action
    * @since 4.10.0
    */
-  static @NotNull Tag styling(final Consumer<Style.Builder> styles) {
+  static Tag styling(final Consumer<Style.Builder> styles) {
     return new CallbackStylingTagImpl(styles);
   }
 
@@ -128,7 +129,7 @@
    * @return a tag for these actions
    * @since 4.10.0
    */
-  static @NotNull Tag styling(final @NotNull StyleBuilderApplicable@NotNull... actions) {
+  static Tag styling(final StyleBuilderApplicable... actions) {
     requireNonNull(actions, "actions");
     for (int i = 0, length = actions.length; i < length; i++) {
       if (actions[i] == null) {
@@ -151,7 +152,7 @@ interface Argument {
      * @return the value
      * @since 4.10.0
      */
-    @NotNull String value();
+    String value();
 
     /**
      * Returns the value of this argument, lower-cased in the root locale.
@@ -161,7 +162,7 @@ interface Argument {
      * @return the lower-cased value of this argument
      * @since 4.10.0
      */
-    default @NotNull String lowerValue() {
+    default String lowerValue() {
       return this.value().toLowerCase(Locale.ROOT);
     }
 
@@ -193,7 +194,7 @@ default boolean isFalse() {
      * @return an optional providing the value of this argument as an integer
      * @since 4.10.0
      */
-    default @NotNull OptionalInt asInt() {
+    default OptionalInt asInt() {
       try {
         return OptionalInt.of(Integer.parseInt(this.value()));
       } catch (final NumberFormatException ex) {
@@ -209,7 +210,7 @@ default boolean isFalse() {
      * @return an optional providing the value of this argument as an integer
      * @since 4.10.0
      */
-    default @NotNull OptionalDouble asDouble() {
+    default OptionalDouble asDouble() {
       try {
         return OptionalDouble.of(Double.parseDouble(this.value()));
       } catch (final NumberFormatException ex) {
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/ArgumentQueue.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/ArgumentQueue.java
index 68dd0ebb06..0e2d0eb6e9 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/ArgumentQueue.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/ArgumentQueue.java
@@ -26,8 +26,8 @@
 import java.util.function.Supplier;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A queue of {@link Tag} arguments.
@@ -35,6 +35,7 @@
  * @since 4.10.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface ArgumentQueue {
   /**
    * Pop an argument, throwing an exception if no argument was present.
@@ -44,7 +45,7 @@ public interface ArgumentQueue {
    * @return the popped argument
    * @since 4.10.0
    */
-  Tag.@NotNull Argument pop();
+  Tag.Argument pop();
 
   /**
    * Pop an argument, throwing an exception if no argument was present.
@@ -55,7 +56,7 @@ public interface ArgumentQueue {
    * @return the popped argument
    * @since 4.10.0
    */
-  Tag.@NotNull Argument popOr(final @NotNull String errorMessage);
+  Tag.Argument popOr(final String errorMessage);
 
   /**
    * Pop an argument, throwing an exception if no argument was present.
@@ -66,7 +67,7 @@ public interface ArgumentQueue {
    * @return the popped argument
    * @since 4.10.0
    */
-  Tag.@NotNull Argument popOr(final @NotNull Supplier<String> errorMessage);
+  Tag.Argument popOr(final Supplier<String> errorMessage);
 
   /**
    * Peek at the next argument without advancing the iteration pointer.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/CachingTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/CachingTagResolver.java
index 1511dfbb99..98ea5bab59 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/CachingTagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/CachingTagResolver.java
@@ -31,9 +31,10 @@
 import net.kyori.adventure.text.minimessage.internal.serializer.SerializableResolver;
 import net.kyori.adventure.text.minimessage.tag.Inserting;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class CachingTagResolver implements TagResolver.WithoutArguments, MappableResolver, SerializableResolver {
   private static final Tag NULL_REPLACEMENT = (Inserting) () -> {
     throw new UnsupportedOperationException("no-op null tag");
@@ -46,7 +47,7 @@ final class CachingTagResolver implements TagResolver.WithoutArguments, Mappable
     this.resolver = resolver;
   }
 
-  private Tag query(final @NotNull String key) {
+  private Tag query(final String key) {
     return this.cache.computeIfAbsent(key, k -> {
       final @Nullable Tag result = this.resolver.resolve(k);
       return result == null ? NULL_REPLACEMENT : result;
@@ -54,18 +55,18 @@ private Tag query(final @NotNull String key) {
   }
 
   @Override
-  public @Nullable Tag resolve(final @NotNull String name) {
+  public @Nullable Tag resolve(final String name) {
     final Tag potentialValue = this.query(name);
     return potentialValue == NULL_REPLACEMENT ? null : potentialValue;
   }
 
   @Override
-  public boolean has(final @NotNull String name) {
+  public boolean has(final String name) {
     return this.query(name) != NULL_REPLACEMENT;
   }
 
   @Override
-  public boolean contributeToMap(final @NotNull Map<String, Tag> map) {
+  public boolean contributeToMap(final Map<String, Tag> map) {
     if (this.resolver instanceof MappableResolver) {
       return ((MappableResolver) this.resolver).contributeToMap(map);
     } else {
@@ -74,7 +75,7 @@ public boolean contributeToMap(final @NotNull Map<String, Tag> map) {
   }
 
   @Override
-  public void handle(final @NotNull Component serializable, final @NotNull ClaimConsumer consumer) {
+  public void handle(final Component serializable, final ClaimConsumer consumer) {
     if (this.resolver instanceof SerializableResolver) {
       ((SerializableResolver) this.resolver).handle(serializable, consumer);
     }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/EmptyTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/EmptyTagResolver.java
index f3edf51d5b..ee820314f9 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/EmptyTagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/EmptyTagResolver.java
@@ -29,9 +29,10 @@
 import net.kyori.adventure.text.minimessage.internal.serializer.ClaimConsumer;
 import net.kyori.adventure.text.minimessage.internal.serializer.SerializableResolver;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class EmptyTagResolver implements TagResolver, MappableResolver, SerializableResolver {
   static final EmptyTagResolver INSTANCE = new EmptyTagResolver();
 
@@ -39,21 +40,21 @@ private EmptyTagResolver() {
   }
 
   @Override
-  public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) {
+  public @Nullable Tag resolve(final String name, final ArgumentQueue arguments, final Context ctx) {
     return null;
   }
 
   @Override
-  public boolean has(final @NotNull String name) {
+  public boolean has(final String name) {
     return false;
   }
 
   @Override
-  public boolean contributeToMap(final @NotNull Map<String, Tag> map) {
+  public boolean contributeToMap(final Map<String, Tag> map) {
     return true;
   }
 
   @Override
-  public void handle(final @NotNull Component serializable, final @NotNull ClaimConsumer consumer) {
+  public void handle(final Component serializable, final ClaimConsumer consumer) {
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Formatter.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Formatter.java
index 5179530ad8..790e6ded1d 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Formatter.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Formatter.java
@@ -32,7 +32,7 @@
 import java.util.Locale;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.TagPattern;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Tag resolvers producing tags that insert formatted values.
@@ -41,6 +41,7 @@
  *
  * @since 4.11.0
  */
+@NullMarked
 public final class Formatter {
   private Formatter() {
   }
@@ -59,7 +60,7 @@ private Formatter() {
    * @return the placeholder
    * @since 4.11.0
    */
-  public static @NotNull TagResolver number(@TagPattern final @NotNull String key, final @NotNull Number number) {
+  public static TagResolver number(@TagPattern final String key, final Number number) {
     return TagResolver.resolver(key, (argumentQueue, context) -> {
       final NumberFormat decimalFormat;
       if (argumentQueue.hasNext()) {
@@ -93,7 +94,7 @@ private Formatter() {
    * @return the placeholder
    * @since 4.11.0
    */
-  public static @NotNull TagResolver date(@TagPattern final @NotNull String key, final @NotNull TemporalAccessor time) {
+  public static TagResolver date(@TagPattern final String key, final TemporalAccessor time) {
     return TagResolver.resolver(key, (argumentQueue, context) -> {
       final String format = argumentQueue.popOr("Format expected.").value();
       return Tag.inserting(context.deserialize(DateTimeFormatter.ofPattern(format).format(time)));
@@ -112,7 +113,7 @@ private Formatter() {
    * @return the placeholder
    * @since 4.11.0
    */
-  public static @NotNull TagResolver choice(@TagPattern final @NotNull String key, final Number number) {
+  public static TagResolver choice(@TagPattern final String key, final Number number) {
     return TagResolver.resolver(key, (argumentQueue, context) -> {
       final String format = argumentQueue.popOr("Format expected.").value();
       final ChoiceFormat choiceFormat = new ChoiceFormat(format);
@@ -132,7 +133,7 @@ private Formatter() {
    * @return the placeholder
    * @since 4.13.0
    */
-  public static TagResolver booleanChoice(@TagPattern final @NotNull String key, final boolean value) {
+  public static TagResolver booleanChoice(@TagPattern final String key, final boolean value) {
     return TagResolver.resolver(key, (argumentQueue, context) -> {
       final String trueCase = argumentQueue.popOr("True format expected.").value();
       final String falseCase = argumentQueue.popOr("False format expected.").value();
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/MapTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/MapTagResolver.java
index 0703dfca8e..26859593b2 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/MapTagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/MapTagResolver.java
@@ -26,23 +26,24 @@
 import java.util.Map;
 import java.util.Objects;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class MapTagResolver implements TagResolver.WithoutArguments, MappableResolver {
   private final Map<String, ? extends Tag> tagMap;
 
-  MapTagResolver(final @NotNull Map<String, ? extends Tag> placeholderMap) {
+  MapTagResolver(final Map<String, ? extends Tag> placeholderMap) {
     this.tagMap = placeholderMap;
   }
 
   @Override
-  public @Nullable Tag resolve(final @NotNull String name) {
+  public @Nullable Tag resolve(final String name) {
     return this.tagMap.get(name);
   }
 
   @Override
-  public boolean contributeToMap(final @NotNull Map<String, Tag> map) {
+  public boolean contributeToMap(final Map<String, Tag> map) {
     map.putAll(this.tagMap);
     return true;
   }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/MappableResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/MappableResolver.java
index f53269deb5..1e2cae8e84 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/MappableResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/MappableResolver.java
@@ -25,11 +25,12 @@
 
 import java.util.Map;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Marker interface for resolvers that may handle a fixed domain of tags.
  */
+@NullMarked
 interface MappableResolver {
   /**
    * Contribute entries.
@@ -40,5 +41,5 @@ interface MappableResolver {
    * @param map the map to add to
    * @return whether the set of values was actually known
    */
-  boolean contributeToMap(final @NotNull Map<String, Tag> map);
+  boolean contributeToMap(final Map<String, Tag> map);
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Placeholder.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Placeholder.java
index 3b53aeb864..d2ea432d5c 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Placeholder.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/Placeholder.java
@@ -28,7 +28,7 @@
 import net.kyori.adventure.text.format.StyleBuilderApplicable;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.TagPattern;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
@@ -39,6 +39,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class Placeholder {
   private Placeholder() {
   }
@@ -53,7 +54,7 @@ private Placeholder() {
    * @return the placeholder
    * @since 4.10.0
    */
-  public static TagResolver.@NotNull Single parsed(@TagPattern final @NotNull String key, final @NotNull String value) {
+  public static TagResolver.Single parsed(@TagPattern final String key, final String value) {
     return TagResolver.resolver(key, Tag.preProcessParsed(value));
   }
 
@@ -65,7 +66,7 @@ private Placeholder() {
    * @return the placeholder
    * @since 4.10.0
    */
-  public static TagResolver.@NotNull Single unparsed(@TagPattern final @NotNull String key, final @NotNull String value) {
+  public static TagResolver.Single unparsed(@TagPattern final String key, final String value) {
     requireNonNull(value, "value");
     return Placeholder.component(key, Component.text(value));
   }
@@ -80,7 +81,7 @@ private Placeholder() {
    * @return the placeholder
    * @since 4.10.0
    */
-  public static TagResolver.@NotNull Single component(@TagPattern final @NotNull String key, final @NotNull ComponentLike value) {
+  public static TagResolver.Single component(@TagPattern final String key, final ComponentLike value) {
     return TagResolver.resolver(key, Tag.selfClosingInserting(value));
   }
 
@@ -94,7 +95,7 @@ private Placeholder() {
    * @return the placeholder
    * @since 4.13.0
    */
-  public static TagResolver.@NotNull Single styling(@TagPattern final @NotNull String key, final @NotNull StyleBuilderApplicable@NotNull... style) {
+  public static TagResolver.Single styling(@TagPattern final String key, final StyleBuilderApplicable... style) {
     return TagResolver.resolver(key, Tag.styling(style));
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/SequentialTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/SequentialTagResolver.java
index 49fd92d8a7..36b6d8e6e5 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/SequentialTagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/SequentialTagResolver.java
@@ -30,18 +30,19 @@
 import net.kyori.adventure.text.minimessage.internal.serializer.ClaimConsumer;
 import net.kyori.adventure.text.minimessage.internal.serializer.SerializableResolver;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class SequentialTagResolver implements TagResolver, SerializableResolver {
   final TagResolver[] resolvers;
 
-  SequentialTagResolver(final @NotNull TagResolver@NotNull[] resolvers) {
+  SequentialTagResolver(final TagResolver[] resolvers) {
     this.resolvers = resolvers;
   }
 
   @Override
-  public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) throws ParsingException {
+  public @Nullable Tag resolve(final String name, final ArgumentQueue arguments, final Context ctx) throws ParsingException {
     @Nullable ParsingException thrown = null;
     for (final TagResolver resolver : this.resolvers) {
       try {
@@ -73,7 +74,7 @@ final class SequentialTagResolver implements TagResolver, SerializableResolver {
   }
 
   @Override
-  public boolean has(final @NotNull String name) {
+  public boolean has(final String name) {
     for (final TagResolver resolver : this.resolvers) {
       if (resolver.has(name)) {
         return true;
@@ -83,7 +84,7 @@ public boolean has(final @NotNull String name) {
   }
 
   @Override
-  public void handle(final @NotNull Component serializable, final @NotNull ClaimConsumer consumer) {
+  public void handle(final Component serializable, final ClaimConsumer consumer) {
     for (final TagResolver resolver : this.resolvers) {
       if (resolver instanceof SerializableResolver) {
         ((SerializableResolver) resolver).handle(serializable, consumer);
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/SingleResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/SingleResolver.java
index 811d6d5616..85fb0aebda 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/SingleResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/SingleResolver.java
@@ -26,8 +26,9 @@
 import java.util.Map;
 import java.util.Objects;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 final class SingleResolver implements TagResolver.Single, MappableResolver {
   private final String key;
   private final Tag tag;
@@ -38,17 +39,17 @@ final class SingleResolver implements TagResolver.Single, MappableResolver {
   }
 
   @Override
-  public @NotNull String key() {
+  public String key() {
     return this.key;
   }
 
   @Override
-  public @NotNull Tag tag() {
+  public Tag tag() {
     return this.tag;
   }
 
   @Override
-  public boolean contributeToMap(final @NotNull Map<String, Tag> map) {
+  public boolean contributeToMap(final Map<String, Tag> map) {
     map.put(this.key, this.tag);
     return true;
   }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/TagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/TagResolver.java
index 9f12b7a251..66c3481e78 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/TagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/TagResolver.java
@@ -37,8 +37,8 @@
 import net.kyori.adventure.text.minimessage.tag.TagPattern;
 import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -51,6 +51,7 @@
  * @see Placeholder
  * @since 4.10.0
  */
+@NullMarked
 public interface TagResolver {
   /**
    * Create a new builder for a tag resolver.
@@ -58,7 +59,7 @@ public interface TagResolver {
    * @return the tag resolver builder
    * @since 4.10.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new TagResolverBuilderImpl();
   }
 
@@ -70,7 +71,7 @@ public interface TagResolver {
    * @return the default resolver
    * @since 4.10.0
    */
-  static @NotNull TagResolver standard() {
+  static TagResolver standard() {
     return StandardTags.defaults();
   }
 
@@ -80,7 +81,7 @@ public interface TagResolver {
    * @return the tag resolver
    * @since 4.10.0
    */
-  static @NotNull TagResolver empty() {
+  static TagResolver empty() {
     return EmptyTagResolver.INSTANCE;
   }
 
@@ -92,7 +93,7 @@ public interface TagResolver {
    * @return a new tag resolver
    * @since 4.10.0
    */
-  static TagResolver.@NotNull Single resolver(@TagPattern final @NotNull String name, final @NotNull Tag tag) {
+  static TagResolver.Single resolver(@TagPattern final String name, final Tag tag) {
     TagInternals.assertValidTagName(name);
     return new SingleResolver(
       name,
@@ -108,7 +109,7 @@ public interface TagResolver {
    * @return a resolver that creates tags using the provided handler
    * @since 4.10.0
    */
-  static @NotNull TagResolver resolver(@TagPattern final @NotNull String name, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler) {
+  static TagResolver resolver(@TagPattern final String name, final BiFunction<ArgumentQueue, Context, Tag> handler) {
     return resolver(Collections.singleton(name), handler);
   }
 
@@ -120,7 +121,7 @@ public interface TagResolver {
    * @return a resolver that creates tags using the provided handler
    * @since 4.10.0
    */
-  static @NotNull TagResolver resolver(final @NotNull Set<String> names, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler) {
+  static TagResolver resolver(final Set<String> names, final BiFunction<ArgumentQueue, Context, Tag> handler) {
     final Set<String> ownNames = new HashSet<>(names);
     for (final String name : ownNames) {
       TagInternals.assertValidTagName(name);
@@ -129,14 +130,14 @@ public interface TagResolver {
 
     return new TagResolver() {
       @Override
-      public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) throws ParsingException {
+      public @Nullable Tag resolve(final String name, final ArgumentQueue arguments, final Context ctx) throws ParsingException {
         if (!names.contains(name)) return null;
 
         return handler.apply(arguments, ctx);
       }
 
       @Override
-      public boolean has(final @NotNull String name) {
+      public boolean has(final String name) {
         return names.contains(name);
       }
     };
@@ -151,7 +152,7 @@ public boolean has(final @NotNull String name) {
    * @return the tag resolver
    * @since 4.10.0
    */
-  static @NotNull TagResolver resolver(final @NotNull TagResolver@NotNull... resolvers) {
+  static TagResolver resolver(final TagResolver... resolvers) {
     if (Objects.requireNonNull(resolvers, "resolvers").length == 1) {
       return Objects.requireNonNull(resolvers[0], "resolvers must not contain null elements");
     }
@@ -169,7 +170,7 @@ public boolean has(final @NotNull String name) {
    * @return the tag resolver
    * @since 4.10.0
    */
-  static @NotNull TagResolver resolver(final @NotNull Iterable<? extends TagResolver> resolvers) {
+  static TagResolver resolver(final Iterable<? extends TagResolver> resolvers) {
     // We can break out early and return exact resolvers in the case of a zero/one length array.
     if (resolvers instanceof Collection<?>) {
       final int size = ((Collection<?>) resolvers).size();
@@ -193,7 +194,7 @@ public boolean has(final @NotNull String name) {
    * @return the caching tag resolver
    * @since 4.10.0
    */
-  static @NotNull TagResolver caching(final TagResolver.@NotNull WithoutArguments resolver) {
+  static TagResolver caching(final TagResolver.WithoutArguments resolver) {
     if (resolver instanceof CachingTagResolver) {
       return resolver;
     } else {
@@ -207,7 +208,7 @@ public boolean has(final @NotNull String name) {
    * @return a collector for tag resolvers
    * @since 4.10.0
    */
-  static @NotNull Collector<TagResolver, ?, TagResolver> toTagResolver() {
+  static Collector<TagResolver, ?, TagResolver> toTagResolver() {
     return TagResolverBuilderImpl.COLLECTOR;
   }
 
@@ -221,7 +222,7 @@ public boolean has(final @NotNull String name) {
    * @throws ParsingException if the provided arguments are invalid
    * @since 4.10.0
    */
-  @Nullable Tag resolve(@TagPattern final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) throws ParsingException;
+  @Nullable Tag resolve(@TagPattern final String name, final ArgumentQueue arguments, final Context ctx) throws ParsingException;
 
   /**
    * Get whether this resolver handles tags with a certain name.
@@ -232,7 +233,7 @@ public boolean has(final @NotNull String name) {
    * @return whether this resolver has a tag with this name
    * @since 4.10.0
    */
-  boolean has(final @NotNull String name);
+  boolean has(final String name);
 
   /**
    * A resolver that only handles a single tag key.
@@ -250,7 +251,7 @@ interface Single extends TagResolver.WithoutArguments {
      * @return the key
      * @since 4.10.0
      */
-    @NotNull String key();
+    String key();
 
     /**
      * The tag returned by this resolver when the key is matching.
@@ -258,10 +259,10 @@ interface Single extends TagResolver.WithoutArguments {
      * @return the tag
      * @since 4.10.0
      */
-    @NotNull Tag tag();
+    Tag tag();
 
     @Override
-    default @Nullable Tag resolve(@TagPattern final @NotNull String name) {
+    default @Nullable Tag resolve(@TagPattern final String name) {
       if (this.has(name)) {
         return this.tag();
       }
@@ -269,7 +270,7 @@ interface Single extends TagResolver.WithoutArguments {
     }
 
     @Override
-    default boolean has(final @NotNull String name) {
+    default boolean has(final String name) {
       return name.equalsIgnoreCase(this.key());
     }
   }
@@ -288,7 +289,7 @@ interface WithoutArguments extends TagResolver {
      * @return a tag, if any is known.
      * @since 4.10.0
      */
-    @Nullable Tag resolve(@TagPattern final @NotNull String name);
+    @Nullable Tag resolve(@TagPattern final String name);
 
     /**
      * Check if this resolver knows of a tag.
@@ -298,12 +299,12 @@ interface WithoutArguments extends TagResolver {
      * @since 4.10.0
      */
     @Override
-    default boolean has(final @NotNull String name) {
+    default boolean has(final String name) {
       return this.resolve(name) != null;
     }
 
     @Override
-    default @Nullable Tag resolve(@TagPattern final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) throws ParsingException {
+    default @Nullable Tag resolve(@TagPattern final String name, final ArgumentQueue arguments, final Context ctx) throws ParsingException {
       final Tag resolved = this.resolve(name);
       if (resolved != null && arguments.hasNext()) {
         throw ctx.newException("Tag '<" + name + ">' does not accept any arguments");
@@ -328,7 +329,7 @@ interface Builder {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder tag(@TagPattern final @NotNull String name, final @NotNull Tag tag);
+    Builder tag(@TagPattern final String name, final Tag tag);
 
     /**
      * Add a single dynamically created tag to this resolver.
@@ -338,7 +339,7 @@ interface Builder {
      * @return this builder
      * @since 4.10.0
      */
-    default @NotNull Builder tag(@TagPattern final @NotNull String name, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler) {
+    default Builder tag(@TagPattern final String name, final BiFunction<ArgumentQueue, Context, Tag> handler) {
       return this.tag(Collections.singleton(name), handler);
     }
 
@@ -350,7 +351,7 @@ interface Builder {
      * @return this builder
      * @since 4.10.0
      */
-    default @NotNull Builder tag(final @NotNull Set<String> names, final @NotNull BiFunction<ArgumentQueue, Context, Tag> handler) {
+    default Builder tag(final Set<String> names, final BiFunction<ArgumentQueue, Context, Tag> handler) {
       return this.resolver(TagResolver.resolver(names, handler));
     }
 
@@ -361,7 +362,7 @@ interface Builder {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder resolver(final @NotNull TagResolver resolver);
+    Builder resolver(final TagResolver resolver);
 
     /**
      * Add placeholder resolvers to those queried by the result of this builder.
@@ -370,7 +371,7 @@ interface Builder {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder resolvers(final @NotNull TagResolver@NotNull... resolvers);
+    Builder resolvers(final TagResolver... resolvers);
 
     /**
      * Add placeholder resolvers to those queried by the result of this builder.
@@ -379,7 +380,7 @@ interface Builder {
      * @return this builder
      * @since 4.10.0
      */
-    @NotNull Builder resolvers(final @NotNull Iterable<? extends TagResolver> resolvers);
+    Builder resolvers(final Iterable<? extends TagResolver> resolvers);
 
     /**
      * Add a resolver that dynamically queries and caches based on the provided function.
@@ -388,7 +389,7 @@ interface Builder {
      * @return this builder
      * @since 4.10.0
      */
-    default @NotNull Builder caching(final TagResolver.@NotNull WithoutArguments dynamic) {
+    default Builder caching(final TagResolver.WithoutArguments dynamic) {
       return this.resolver(TagResolver.caching(dynamic));
     }
 
@@ -400,6 +401,6 @@ interface Builder {
      * @return the resolver
      * @since 4.10.0
      */
-    @NotNull TagResolver build();
+    TagResolver build();
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/TagResolverBuilderImpl.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/TagResolverBuilderImpl.java
index 1859efd0ae..554afc7084 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/TagResolverBuilderImpl.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/resolver/TagResolverBuilderImpl.java
@@ -32,10 +32,11 @@
 import java.util.stream.Collector;
 import net.kyori.adventure.text.minimessage.internal.TagInternals;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class TagResolverBuilderImpl implements TagResolver.Builder {
   static final Collector<TagResolver, TagResolver.Builder, TagResolver> COLLECTOR = Collector.of(
     TagResolver::builder,
@@ -48,7 +49,7 @@ final class TagResolverBuilderImpl implements TagResolver.Builder {
   private final List<TagResolver> resolvers = new ArrayList<>();
 
   @Override
-  public TagResolver.@NotNull Builder tag(final @NotNull String name, final @NotNull Tag tag) {
+  public TagResolver.Builder tag(final String name, final Tag tag) {
     TagInternals.assertValidTagName(requireNonNull(name, "name"));
     this.replacements.put(
       name,
@@ -58,7 +59,7 @@ final class TagResolverBuilderImpl implements TagResolver.Builder {
   }
 
   @Override
-  public TagResolver.@NotNull Builder resolver(final @NotNull TagResolver resolver) {
+  public TagResolver.Builder resolver(final TagResolver resolver) {
     if (resolver instanceof SequentialTagResolver) {
       this.resolvers(((SequentialTagResolver) resolver).resolvers, false);
     } else if (!this.consumePotentialMappable(resolver)) {
@@ -69,11 +70,11 @@ final class TagResolverBuilderImpl implements TagResolver.Builder {
   }
 
   @Override
-  public TagResolver.@NotNull Builder resolvers(final @NotNull TagResolver @NotNull... resolvers) {
+  public TagResolver.Builder resolvers(final TagResolver... resolvers) {
     return this.resolvers(resolvers, true);
   }
 
-  private TagResolver.@NotNull Builder resolvers(final @NotNull TagResolver @NotNull[] resolvers, final boolean forwards) {
+  private TagResolver.Builder resolvers(final TagResolver[] resolvers, final boolean forwards) {
     boolean popped = false;
     requireNonNull(resolvers, "resolvers");
     if (forwards) {
@@ -89,7 +90,7 @@ final class TagResolverBuilderImpl implements TagResolver.Builder {
   }
 
   @Override
-  public TagResolver.@NotNull Builder resolvers(final @NotNull Iterable<? extends TagResolver> resolvers) {
+  public TagResolver.Builder resolvers(final Iterable<? extends TagResolver> resolvers) {
     boolean popped = false;
     for (final TagResolver resolver : requireNonNull(resolvers, "resolvers")) {
       popped = this.single(resolver, popped);
@@ -126,7 +127,7 @@ private boolean consumePotentialMappable(final TagResolver resolver) {
   }
 
   @Override
-  public @NotNull TagResolver build() {
+  public TagResolver build() {
     this.popMap();
     if (this.resolvers.size() == 0) {
       return EmptyTagResolver.INSTANCE;
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/AbstractColorChangingTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/AbstractColorChangingTag.java
index 4ca7867948..2ac101ef33 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/AbstractColorChangingTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/AbstractColorChangingTag.java
@@ -38,8 +38,8 @@
 import net.kyori.adventure.text.minimessage.tree.Node;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A transformation that applies a colour change.
@@ -53,6 +53,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 abstract class AbstractColorChangingTag implements Modifying, Examinable {
 
   private static final ComponentFlattener LENGTH_CALCULATOR = ComponentFlattener.builder()
@@ -69,7 +70,7 @@ protected final int size() {
   }
 
   @Override
-  public final void visit(final @NotNull Node current, final int depth) {
+  public final void visit(final Node current, final int depth) {
     if (this.visited) {
       throw new IllegalStateException("Color changing tag instances cannot be re-used, return a new one for each resolve");
     }
@@ -94,7 +95,7 @@ public final void postVisit() {
   }
 
   @Override
-  public final Component apply(final @NotNull Component current, final int depth) {
+  public final Component apply(final Component current, final int depth) {
     if ((this.disableApplyingColorDepth != -1 && depth > this.disableApplyingColorDepth) || current.style().color() != null) {
       if (this.disableApplyingColorDepth == -1 || depth < this.disableApplyingColorDepth) {
         this.disableApplyingColorDepth = depth;
@@ -158,10 +159,10 @@ public final Component apply(final @NotNull Component current, final int depth)
   // misc
 
   @Override
-  public abstract @NotNull Stream<? extends ExaminableProperty> examinableProperties();
+  public abstract Stream<? extends ExaminableProperty> examinableProperties();
 
   @Override
-  public final @NotNull String toString() {
+  public final String toString() {
     return Internals.toString(this);
   }
 
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ClickTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ClickTag.java
index c5090cfedc..5df4921dca 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ClickTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ClickTag.java
@@ -33,7 +33,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Click events.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ColorTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ColorTagResolver.java
index 07deb7917e..d48192e9c5 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ColorTagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ColorTagResolver.java
@@ -35,14 +35,15 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A transformation applying a single text color.
  *
  * @since 4.10.0
  */
+@NullMarked
 final class ColorTagResolver implements TagResolver, SerializableResolver.Single {
   private static final String COLOR_3 = "c";
   private static final String COLOR_2 = "colour";
@@ -74,7 +75,7 @@ private static boolean isColorOrAbbreviation(final String name) {
   }
 
   @Override
-  public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue args, final @NotNull Context ctx) throws ParsingException {
+  public @Nullable Tag resolve(final String name, final ArgumentQueue args, final Context ctx) throws ParsingException {
     if (!this.has(name)) {
       return null;
     }
@@ -90,7 +91,7 @@ private static boolean isColorOrAbbreviation(final String name) {
     return Tag.styling(color);
   }
 
-  static @NotNull TextColor resolveColor(final @NotNull String colorName, final @NotNull Context ctx) throws ParsingException {
+  static TextColor resolveColor(final String colorName, final Context ctx) throws ParsingException {
     final TextColor color;
     if (COLOR_ALIASES.containsKey(colorName)) {
       color = COLOR_ALIASES.get(colorName);
@@ -107,7 +108,7 @@ private static boolean isColorOrAbbreviation(final String name) {
   }
 
   @Override
-  public boolean has(final @NotNull String name) {
+  public boolean has(final String name) {
     return isColorOrAbbreviation(name)
       || TextColor.fromHexString(name) != null
       || NamedTextColor.NAMES.value(name) != null
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/DecorationTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/DecorationTag.java
index ff7bdfa05d..e447477e7d 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/DecorationTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/DecorationTag.java
@@ -41,8 +41,8 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
@@ -51,6 +51,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 final class DecorationTag {
   // vanilla decoration
   private static final String B = "b";
@@ -63,7 +64,7 @@ final class DecorationTag {
   public static final String REVERT = "!";
 
   // create resolvers for canonical + configured alternates
-  static Map.Entry<TextDecoration, Stream<TagResolver>> resolvers(final TextDecoration decoration, final @Nullable String shortName, final @NotNull String@NotNull... secondaryAliases) {
+  static Map.Entry<TextDecoration, Stream<TagResolver>> resolvers(final TextDecoration decoration, final @Nullable String shortName, final String... secondaryAliases) {
     final String canonicalName = TextDecoration.NAMES.key(decoration);
     final Set<String> names = new HashSet<>();
     names.add(canonicalName);
@@ -109,7 +110,7 @@ static Tag createNegated(final TextDecoration toApply) {
     return Tag.styling(toApply.withState(false));
   }
 
-  static @NotNull StyleClaim<TextDecoration.State> claim(final @NotNull TextDecoration decoration, final @NotNull BiConsumer<TextDecoration.State, TokenEmitter> emitable) {
+  static StyleClaim<TextDecoration.State> claim(final TextDecoration decoration, final BiConsumer<TextDecoration.State, TokenEmitter> emitable) {
     requireNonNull(decoration, "decoration");
     return StyleClaim.claim(
       "decoration_" + TextDecoration.NAMES.key(decoration),
@@ -119,7 +120,7 @@ static Tag createNegated(final TextDecoration toApply) {
     );
   }
 
-  static void emit(final @NotNull String longName, final @NotNull String shortName, final TextDecoration.@NotNull State state, final @NotNull TokenEmitter emitter) {
+  static void emit(final String longName, final String shortName, final TextDecoration.State state, final TokenEmitter emitter) {
     if (state == State.FALSE) {
       emitter.tag(REVERT + longName);
     } else {
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/GradientTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/GradientTag.java
index 146d7c5292..4967499423 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/GradientTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/GradientTag.java
@@ -36,15 +36,16 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A transformation that applies a colour gradient.
  *
  * @since 4.10.0
  */
+@NullMarked
 final class GradientTag extends AbstractColorChangingTag {
   private static final String GRADIENT = "gradient";
 
@@ -133,7 +134,7 @@ protected TextColor color() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("phase", this.phase),
       ExaminableProperty.of("colors", this.colors)
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/HoverTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/HoverTag.java
index 37b778b229..c42ead03e3 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/HoverTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/HoverTag.java
@@ -38,14 +38,15 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Hover tag.
  *
  * @since 4.10.0
  */
+@NullMarked
 final class HoverTag {
   private static final String HOVER = "hover";
 
@@ -92,7 +93,7 @@ static void emit(final HoverEvent<?> event, final TokenEmitter emitter) {
   }
 
   interface ActionHandler<V> {
-    @NotNull V parse(final @NotNull ArgumentQueue args, final @NotNull Context ctx) throws ParsingException;
+    V parse(final ArgumentQueue args, final Context ctx) throws ParsingException;
 
     void emit(final V event, final TokenEmitter emit);
   }
@@ -104,7 +105,7 @@ private ShowText() {
     }
 
     @Override
-    public @NotNull Component parse(final @NotNull ArgumentQueue args, final @NotNull Context ctx) throws ParsingException {
+    public Component parse(final ArgumentQueue args, final Context ctx) throws ParsingException {
       return ctx.deserialize(args.popOr("show_text action requires a message").value());
     }
 
@@ -121,7 +122,7 @@ private ShowItem() {
     }
 
     @Override
-    public HoverEvent.@NotNull ShowItem parse(final @NotNull ArgumentQueue args, final @NotNull Context ctx) throws ParsingException {
+    public HoverEvent.ShowItem parse(final ArgumentQueue args, final Context ctx) throws ParsingException {
       try {
         final Key key = Key.key(args.popOr("Show item hover needs at least an item ID").value());
         final int count = args.hasNext() ? args.pop().asInt().orElseThrow(() -> ctx.newException("The count argument was not a valid integer")) : 1;
@@ -156,7 +157,7 @@ private ShowEntity() {
     }
 
     @Override
-    public HoverEvent.@NotNull ShowEntity parse(final @NotNull ArgumentQueue args, final @NotNull Context ctx) throws ParsingException {
+    public HoverEvent.ShowEntity parse(final ArgumentQueue args, final Context ctx) throws ParsingException {
       try {
         final Key key = Key.key(args.popOr("Show entity needs a type argument").value());
         final UUID id = UUID.fromString(args.popOr("Show entity needs an entity UUID").value());
@@ -181,7 +182,7 @@ public void emit(final HoverEvent.ShowEntity event, final TokenEmitter emit) {
     }
   }
 
-  static @NotNull String compactAsString(final @NotNull Key key) {
+  static String compactAsString(final Key key) {
     if (key.namespace().equals(Key.MINECRAFT_NAMESPACE)) {
       return key.value();
     } else {
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/KeybindTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/KeybindTag.java
index 48e19cad13..482ff26c13 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/KeybindTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/KeybindTag.java
@@ -32,7 +32,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A transformation that inserts a key binding component.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/NbtTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/NbtTag.java
index 8db50f3964..f4538dbe1a 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/NbtTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/NbtTag.java
@@ -37,7 +37,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * One tag for all NBT components.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/NewlineTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/NewlineTag.java
index 74d923402c..1a40209d06 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/NewlineTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/NewlineTag.java
@@ -31,7 +31,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Newline tag.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/RainbowTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/RainbowTag.java
index 6abd32ff98..e855b52ac5 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/RainbowTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/RainbowTag.java
@@ -32,14 +32,15 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.util.HSVLike;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Applies rainbow color to a component.
  *
  * @since 4.10.0
  */
+@NullMarked
 final class RainbowTag extends AbstractColorChangingTag {
   private static final String REVERSE = "!";
   private static final String RAINBOW = "rainbow";
@@ -106,7 +107,7 @@ protected TextColor color() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(ExaminableProperty.of("phase", this.phase));
   }
 
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ScoreTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ScoreTag.java
index 9cc79d15c8..09ef6ae6b5 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ScoreTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ScoreTag.java
@@ -32,7 +32,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 final class ScoreTag {
   public static final String SCORE = "score";
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/SelectorTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/SelectorTag.java
index 9e3cb2c5fc..91d7773009 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/SelectorTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/SelectorTag.java
@@ -33,7 +33,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Insert a selector component into the result.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
index 72ad26a1a7..1d8e8a27cc 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
@@ -29,7 +29,7 @@
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
@@ -40,6 +40,7 @@
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class StandardTags {
 
   private StandardTags() {
@@ -76,7 +77,7 @@ private StandardTags() {
    * @return a resolver for a certain decoration's tags
    * @since 4.10.0
    */
-  public static @NotNull TagResolver decorations(final @NotNull TextDecoration decoration) {
+  public static TagResolver decorations(final TextDecoration decoration) {
     return requireNonNull(DecorationTag.RESOLVERS.get(decoration), "No resolver found for decoration (this should not be possible?)");
   }
 
@@ -88,7 +89,7 @@ private StandardTags() {
    * @return a resolver for all decoration tags
    * @since 4.10.0
    */
-  public static @NotNull TagResolver decorations() {
+  public static TagResolver decorations() {
     return DecorationTag.RESOLVER;
   }
 
@@ -100,7 +101,7 @@ private StandardTags() {
    * @return a resolver for the {@value ColorTagResolver#COLOR} tags
    * @since 4.10.0
    */
-  public static @NotNull TagResolver color() {
+  public static TagResolver color() {
     return ColorTagResolver.INSTANCE;
   }
 
@@ -110,7 +111,7 @@ private StandardTags() {
    * @return a resolver for the {@value HoverTag#HOVER} tag
    * @since 4.10.0
    */
-  public static @NotNull TagResolver hoverEvent() {
+  public static TagResolver hoverEvent() {
     return HoverTag.RESOLVER;
   }
 
@@ -120,7 +121,7 @@ private StandardTags() {
    * @return a resolver for the {@value ClickTag#CLICK} tag
    * @since 4.10.0
    */
-  public static @NotNull TagResolver clickEvent() {
+  public static TagResolver clickEvent() {
     return ClickTag.RESOLVER;
   }
 
@@ -130,7 +131,7 @@ private StandardTags() {
    * @return a resolver for the {@value KeybindTag#KEYBIND} tag
    * @since 4.10.0
    */
-  public static @NotNull TagResolver keybind() {
+  public static TagResolver keybind() {
     return KeybindTag.RESOLVER;
   }
 
@@ -142,7 +143,7 @@ private StandardTags() {
    * @return a resolver for the {@value TranslatableTag#TRANSLATE} tag
    * @since 4.10.0
    */
-  public static @NotNull TagResolver translatable() {
+  public static TagResolver translatable() {
     return TranslatableTag.RESOLVER;
   }
 
@@ -154,7 +155,7 @@ private StandardTags() {
    * @return a resolver for the {@value TranslatableFallbackTag#TRANSLATE_OR} tag
    * @since 4.13.0
    */
-  public static @NotNull TagResolver translatableFallback() {
+  public static TagResolver translatableFallback() {
     return TranslatableFallbackTag.RESOLVER;
   }
 
@@ -164,7 +165,7 @@ private StandardTags() {
    * @return a resolver for the {@value InsertionTag#INSERTION} tag
    * @since 4.10.0
    */
-  public static @NotNull TagResolver insertion() {
+  public static TagResolver insertion() {
     return InsertionTag.RESOLVER;
   }
 
@@ -174,7 +175,7 @@ private StandardTags() {
    * @return a resolver for the {@value FontTag#FONT} tag
    * @since 4.10.0
    */
-  public static @NotNull TagResolver font() {
+  public static TagResolver font() {
     return FontTag.RESOLVER;
   }
 
@@ -184,7 +185,7 @@ private StandardTags() {
    * @return a resolver for the {@value GradientTag#GRADIENT} tag
    * @since 4.10.0
    */
-  public static @NotNull TagResolver gradient() {
+  public static TagResolver gradient() {
     return GradientTag.RESOLVER;
   }
 
@@ -194,7 +195,7 @@ private StandardTags() {
    * @return a resolver for the {@value RainbowTag#RAINBOW} tag
    * @since 4.10.0
    */
-  public static @NotNull TagResolver rainbow() {
+  public static TagResolver rainbow() {
     return RainbowTag.RESOLVER;
   }
 
@@ -214,7 +215,7 @@ public static TagResolver transition() {
    * @return a resolver for the {@value ResetTag#RESET} tag.
    * @since 4.10.0
    */
-  public static @NotNull TagResolver reset() {
+  public static TagResolver reset() {
     return ResetTag.RESOLVER;
   }
 
@@ -226,7 +227,7 @@ public static TagResolver transition() {
    * @return a resolver for the {@value NewlineTag#NEWLINE} tag.
    * @since 4.10.0
    */
-  public static @NotNull TagResolver newline() {
+  public static TagResolver newline() {
     return NewlineTag.RESOLVER;
   }
 
@@ -238,7 +239,7 @@ public static TagResolver transition() {
    * @return a resolver for the {@value SelectorTag#SELECTOR} tag
    * @since 4.11.0
    */
-  public static @NotNull TagResolver selector() {
+  public static TagResolver selector() {
     return SelectorTag.RESOLVER;
   }
 
@@ -248,7 +249,7 @@ public static TagResolver transition() {
    * @return a resolver for the {@value ScoreTag#SCORE} tag
    * @since 4.13.0
    */
-  public static @NotNull TagResolver score() {
+  public static TagResolver score() {
     return ScoreTag.RESOLVER;
   }
 
@@ -260,7 +261,7 @@ public static TagResolver transition() {
    * @return a resolver for the {@value NbtTag#NBT} tag.
    * @since 4.13.0
    */
-  public static @NotNull TagResolver nbt() {
+  public static TagResolver nbt() {
     return NbtTag.RESOLVER;
   }
 
@@ -273,7 +274,7 @@ public static TagResolver transition() {
    * @return the resolver for built-in tags
    * @since 4.10.0
    */
-  public static @NotNull TagResolver defaults() {
+  public static TagResolver defaults() {
     return ALL;
   }
 
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TransitionTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TransitionTag.java
index 3f2528a8c0..37aa6a6903 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TransitionTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TransitionTag.java
@@ -40,13 +40,14 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Changes the color based on a phase param.
  *
  * @since 4.10.0
  */
+@NullMarked
 public final class TransitionTag implements Inserting, Examinable {
   public static final String TRANSITION = "transition";
 
@@ -116,7 +117,7 @@ private TransitionTag(final float phase, final List<TextColor> colors) {
   }
 
   @Override
-  public @NotNull Component value() {
+  public Component value() {
     return Component.text("", this.color());
   }
 
@@ -139,7 +140,7 @@ private TextColor color() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("phase", this.phase),
       ExaminableProperty.of("colors", this.colors)
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableFallbackTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableFallbackTag.java
index 42bf0faa90..df95dc257b 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableFallbackTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableFallbackTag.java
@@ -35,7 +35,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Insert a translation component into the result, with a fallback string.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableTag.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableTag.java
index 7dd4b654d3..2adefdfc11 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableTag.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableTag.java
@@ -35,7 +35,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Insert a translation component into the result.
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tree/Node.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tree/Node.java
index da2aec933a..631e09013b 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tree/Node.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tree/Node.java
@@ -25,8 +25,8 @@
 
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A node in the MiniMessage parse tree.
@@ -36,6 +36,7 @@
  * @since 4.10.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface Node {
   /**
    * Get a human-readable representation of this node and its descendants for debugging purposes.
@@ -44,7 +45,7 @@ public interface Node {
    * @since 4.10.0
    */
   @Override
-  @NotNull String toString();
+  String toString();
 
   /**
    * Get children of this node.
@@ -54,7 +55,7 @@ public interface Node {
    * @return a list of children
    * @since 4.10.0
    */
-  @NotNull List<? extends Node> children();
+  List<? extends Node> children();
 
   /**
    * Get the parent of this node.
@@ -79,6 +80,6 @@ interface Root extends Node {
      * @return the input message
      * @since 4.10.0
      */
-    @NotNull String input();
+    String input();
   }
 }
diff --git a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/AbstractTest.java b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/AbstractTest.java
index 9709d165cf..4bdfcd8cf4 100644
--- a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/AbstractTest.java
+++ b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/AbstractTest.java
@@ -32,23 +32,24 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.examination.string.MultiLineStringExaminer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@NullMarked
 public abstract class AbstractTest {
   protected static final MiniMessage PARSER = MiniMessage.builder().debug(System.out::print).build();
 
-  protected void assertSerializedEquals(final @NotNull String expected, final @NotNull ComponentLike input) {
+  protected void assertSerializedEquals(final String expected, final ComponentLike input) {
     final String string = PARSER.serialize(input.asComponent());
     assertEquals(expected, string);
   }
 
-  protected void assertParsedEquals(final @NotNull Component expected, final @NotNull String input) {
+  protected void assertParsedEquals(final Component expected, final String input) {
     this.assertParsedEquals(PARSER, expected, input);
   }
 
-  protected void assertParsedEquals(final @NotNull Component expected, final @NotNull String input, final @NotNull TagResolver... args) {
+  protected void assertParsedEquals(final Component expected, final String input, final TagResolver... args) {
     this.assertParsedEquals(PARSER, expected, input, args);
   }
 
@@ -58,7 +59,7 @@ protected void assertParsedEquals(final MiniMessage miniMessage, final Component
     assertEquals(expectedSerialized, actual);
   }
 
-  protected void assertParsedEquals(final MiniMessage miniMessage, final Component expected, final String input, final @NotNull TagResolver... args) {
+  protected void assertParsedEquals(final MiniMessage miniMessage, final Component expected, final String input, final TagResolver... args) {
     final String expectedSerialized = this.prettyPrint(expected.compact());
     final String actual = this.prettyPrint(miniMessage.deserialize(input, TagResolver.resolver(args)).compact());
     assertEquals(expectedSerialized, actual);
diff --git a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/MiniMessageParserTest.java b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/MiniMessageParserTest.java
index f6606bb568..974fc8f2b7 100644
--- a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/MiniMessageParserTest.java
+++ b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/MiniMessageParserTest.java
@@ -37,7 +37,7 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.minimessage.tree.Node;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 import org.junit.jupiter.api.Test;
 
 import static net.kyori.adventure.text.Component.empty;
@@ -62,6 +62,7 @@
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@NullMarked
 public class MiniMessageParserTest extends AbstractTest {
 
   @Test
@@ -532,12 +533,12 @@ void invalidPreprocessTagNames() {
     final Component expected = Component.text("Some<##>of<>these(meow)are<3 >tags");
     final TagResolver alwaysMatchingResolver = new TagResolver() {
       @Override
-      public Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) throws ParsingException {
+      public Tag resolve(final String name, final ArgumentQueue arguments, final Context ctx) throws ParsingException {
         return Tag.preProcessParsed("(meow)");
       }
 
       @Override
-      public boolean has(final @NotNull String name) {
+      public boolean has(final String name) {
         return true;
       }
     };
diff --git a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/TagResolverTest.java b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/TagResolverTest.java
index 0efb195828..dbc9b4382b 100644
--- a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/TagResolverTest.java
+++ b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/TagResolverTest.java
@@ -32,8 +32,8 @@
 import net.kyori.adventure.text.minimessage.ParsingException;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import static net.kyori.adventure.text.Component.text;
@@ -44,6 +44,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
+@NullMarked
 class TagResolverTest {
 
   @Test
@@ -165,7 +166,7 @@ void testTagResolverEquality() {
     assertEquals(first, second);
   }
 
-  private static @NotNull Tag resolveForTest(final TagResolver resolver, final String tag) {
+  private static Tag resolveForTest(final TagResolver resolver, final String tag) {
     try {
       final Context ctx = AbstractTest.dummyContext("help i shouldn't be seen");
       final @Nullable Tag result = resolver.resolve(tag, AbstractTest.emptyArgumentQueue(ctx), ctx);
diff --git a/text-serializer-ansi/src/main/java/net/kyori/adventure/text/serializer/ansi/ANSIComponentSerializer.java b/text-serializer-ansi/src/main/java/net/kyori/adventure/text/serializer/ansi/ANSIComponentSerializer.java
index 976830a9fb..58b4937b89 100644
--- a/text-serializer-ansi/src/main/java/net/kyori/adventure/text/serializer/ansi/ANSIComponentSerializer.java
+++ b/text-serializer-ansi/src/main/java/net/kyori/adventure/text/serializer/ansi/ANSIComponentSerializer.java
@@ -31,7 +31,7 @@
 import net.kyori.adventure.util.PlatformAPI;
 import net.kyori.ansi.ColorLevel;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A serializer which emits <a href="https://en.wikipedia.org/wiki/ANSI_escape_code">ANSI escape sequences</a>.
@@ -40,6 +40,7 @@
  *
  * @since 4.14.0
  */
+@NullMarked
 public interface ANSIComponentSerializer extends ComponentEncoder<Component, String> {
   /**
    * Gets a component serializer for serialization to a string using ANSI escape codes.
@@ -49,7 +50,7 @@ public interface ANSIComponentSerializer extends ComponentEncoder<Component, Str
    * @return a component serializer for serialization with ANSI escape sequences.
    * @since 4.14.0
    */
-  static @NotNull ANSIComponentSerializer ansi() {
+  static ANSIComponentSerializer ansi() {
     return ANSIComponentSerializerImpl.Instances.INSTANCE;
   }
 
@@ -59,7 +60,7 @@ public interface ANSIComponentSerializer extends ComponentEncoder<Component, Str
    * @return a new ANSI serializer builder
    * @since 4.14.0
    */
-  static ANSIComponentSerializer.@NotNull Builder builder() {
+  static ANSIComponentSerializer.Builder builder() {
     return new ANSIComponentSerializerImpl.BuilderImpl();
   }
 
@@ -79,7 +80,7 @@ interface Builder extends AbstractBuilder<ANSIComponentSerializer> {
      * @see ColorLevel
      * @since 4.14.0
      */
-    @NotNull Builder colorLevel(final @NotNull ColorLevel colorLevel);
+    Builder colorLevel(final ColorLevel colorLevel);
 
     /**
      * Sets the component flattener instance to use when traversing the component for serialization.
@@ -90,7 +91,7 @@ interface Builder extends AbstractBuilder<ANSIComponentSerializer> {
      * @return this builder
      * @since 4.14.0
      */
-    @NotNull Builder flattener(final @NotNull ComponentFlattener componentFlattener);
+    Builder flattener(final ComponentFlattener componentFlattener);
 
     /**
      * Builds the serializer.
@@ -98,7 +99,7 @@ interface Builder extends AbstractBuilder<ANSIComponentSerializer> {
      * @return the built serializer
      */
     @Override
-    @NotNull ANSIComponentSerializer build();
+    ANSIComponentSerializer build();
   }
 
   /**
@@ -117,7 +118,7 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull ANSIComponentSerializer ansi();
+    ANSIComponentSerializer ansi();
 
     /**
      * Completes the building process of {@link Builder}.
@@ -127,6 +128,6 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull Consumer<Builder> builder();
+    Consumer<Builder> builder();
   }
 }
diff --git a/text-serializer-ansi/src/main/java/net/kyori/adventure/text/serializer/ansi/ANSIComponentSerializerImpl.java b/text-serializer-ansi/src/main/java/net/kyori/adventure/text/serializer/ansi/ANSIComponentSerializerImpl.java
index 81c30b25c9..c98aebc1a6 100644
--- a/text-serializer-ansi/src/main/java/net/kyori/adventure/text/serializer/ansi/ANSIComponentSerializerImpl.java
+++ b/text-serializer-ansi/src/main/java/net/kyori/adventure/text/serializer/ansi/ANSIComponentSerializerImpl.java
@@ -36,10 +36,11 @@
 import net.kyori.ansi.ANSIComponentRenderer;
 import net.kyori.ansi.ColorLevel;
 import net.kyori.ansi.StyleOps;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class ANSIComponentSerializerImpl implements ANSIComponentSerializer {
   private static final Optional<Provider> SERVICE = Services.service(Provider.class);
 
@@ -64,7 +65,7 @@ static final class Instances {
   }
 
   @Override
-  public @NotNull String serialize(final @NotNull Component component) {
+  public String serialize(final Component component) {
     final ANSIComponentRenderer.ToString<Style> renderer = ANSIComponentRenderer.toString(ComponentStyleOps.INSTANCE, this.colorLevel);
     this.flattener.flatten(component, new ANSIFlattenerListener(renderer));
     renderer.complete();
@@ -87,38 +88,38 @@ static class ComponentStyleOps implements StyleOps<Style> {
     static final ComponentStyleOps INSTANCE = new ComponentStyleOps();
 
     @Override
-    public State bold(final @NotNull Style style) {
+    public State bold(final Style style) {
       return mapState(style.decoration(TextDecoration.BOLD));
     }
 
     @Override
-    public State italics(final @NotNull Style style) {
+    public State italics(final Style style) {
       return mapState(style.decoration(TextDecoration.ITALIC));
     }
 
     @Override
-    public State underlined(final @NotNull Style style) {
+    public State underlined(final Style style) {
       return mapState(style.decoration(TextDecoration.UNDERLINED));
     }
 
     @Override
-    public State strikethrough(final @NotNull Style style) {
+    public State strikethrough(final Style style) {
       return mapState(style.decoration(TextDecoration.STRIKETHROUGH));
     }
 
     @Override
-    public State obfuscated(final @NotNull Style style) {
+    public State obfuscated(final Style style) {
       return mapState(style.decoration(TextDecoration.OBFUSCATED));
     }
 
     @Override
-    public @Range(from = -1L, to = 16777215L) int color(final @NotNull Style style) {
+    public @Range(from = -1L, to = 16777215L) int color(final Style style) {
       final TextColor color = style.color();
       return color == null ? -1 : color.value();
     }
 
     @Override
-    public @Nullable String font(final @NotNull Style style) {
+    public @Nullable String font(final Style style) {
       final Key font = style.font();
       return font == null ? null : font.asString();
     }
@@ -132,17 +133,17 @@ static class ANSIFlattenerListener implements FlattenerListener {
     }
 
     @Override
-    public void pushStyle(final @NotNull Style style) {
+    public void pushStyle(final Style style) {
       this.renderer.pushStyle(style);
     }
 
     @Override
-    public void component(final @NotNull String text) {
+    public void component(final String text) {
       this.renderer.text(text);
     }
 
     @Override
-    public void popStyle(final @NotNull Style style) {
+    public void popStyle(final Style style) {
       this.renderer.popStyle(style);
     }
   }
@@ -156,19 +157,19 @@ static final class BuilderImpl implements ANSIComponentSerializer.Builder {
     }
 
     @Override
-    public @NotNull Builder colorLevel(final @NotNull ColorLevel colorLevel) {
+    public Builder colorLevel(final ColorLevel colorLevel) {
       this.colorLevel = colorLevel;
       return this;
     }
 
     @Override
-    public @NotNull Builder flattener(final @NotNull ComponentFlattener componentFlattener) {
+    public Builder flattener(final ComponentFlattener componentFlattener) {
       this.flattener = componentFlattener;
       return this;
     }
 
     @Override
-    public @NotNull ANSIComponentSerializer build() {
+    public ANSIComponentSerializer build() {
       return new ANSIComponentSerializerImpl(this.colorLevel, this.flattener);
     }
   }
diff --git a/text-serializer-gson-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/gson/legacyimpl/NBTLegacyHoverEventSerializer.java b/text-serializer-gson-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/gson/legacyimpl/NBTLegacyHoverEventSerializer.java
index a9811f6e0b..9cd78dc69a 100644
--- a/text-serializer-gson-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/gson/legacyimpl/NBTLegacyHoverEventSerializer.java
+++ b/text-serializer-gson-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/gson/legacyimpl/NBTLegacyHoverEventSerializer.java
@@ -26,7 +26,7 @@
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.serializer.gson.LegacyHoverEventSerializer;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A legacy {@link HoverEvent} serializer.
@@ -36,6 +36,7 @@
  */
 @Deprecated
 @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
+@NullMarked
 public interface NBTLegacyHoverEventSerializer extends LegacyHoverEventSerializer, net.kyori.adventure.text.serializer.json.legacyimpl.NBTLegacyHoverEventSerializer {
   /**
    * Gets the legacy {@link HoverEvent} serializer.
@@ -46,7 +47,7 @@ public interface NBTLegacyHoverEventSerializer extends LegacyHoverEventSerialize
    */
   @Deprecated
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
-  static @NotNull LegacyHoverEventSerializer get() {
+  static LegacyHoverEventSerializer get() {
     return NBTLegacyHoverEventSerializerImpl.INSTANCE;
   }
 }
diff --git a/text-serializer-gson-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/gson/legacyimpl/NBTLegacyHoverEventSerializerImpl.java b/text-serializer-gson-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/gson/legacyimpl/NBTLegacyHoverEventSerializerImpl.java
index d60ff7780a..55f5c48287 100644
--- a/text-serializer-gson-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/gson/legacyimpl/NBTLegacyHoverEventSerializerImpl.java
+++ b/text-serializer-gson-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/gson/legacyimpl/NBTLegacyHoverEventSerializerImpl.java
@@ -29,9 +29,10 @@
 import net.kyori.adventure.text.serializer.gson.LegacyHoverEventSerializer;
 import net.kyori.adventure.text.serializer.json.legacyimpl.NBTLegacyHoverEventSerializer;
 import net.kyori.adventure.util.Codec;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 @Deprecated
+@NullMarked
 final class NBTLegacyHoverEventSerializerImpl implements LegacyHoverEventSerializer {
   static final NBTLegacyHoverEventSerializerImpl INSTANCE = new NBTLegacyHoverEventSerializerImpl();
 
@@ -41,22 +42,22 @@ private NBTLegacyHoverEventSerializerImpl() {
   }
 
   @Override
-  public HoverEvent.@NotNull ShowItem deserializeShowItem(final @NotNull Component input) throws IOException {
+  public HoverEvent.ShowItem deserializeShowItem(final Component input) throws IOException {
     return NEW_INSTANCE.deserializeShowItem(input);
   }
 
   @Override
-  public HoverEvent.@NotNull ShowEntity deserializeShowEntity(final @NotNull Component input, final Codec.Decoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
+  public HoverEvent.ShowEntity deserializeShowEntity(final Component input, final Codec.Decoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
     return NEW_INSTANCE.deserializeShowEntity(input, componentCodec);
   }
 
   @Override
-  public @NotNull Component serializeShowItem(final HoverEvent.@NotNull ShowItem input) throws IOException {
+  public Component serializeShowItem(final HoverEvent.ShowItem input) throws IOException {
     return NEW_INSTANCE.serializeShowItem(input);
   }
 
   @Override
-  public @NotNull Component serializeShowEntity(final HoverEvent.@NotNull ShowEntity input, final Codec.Encoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
+  public Component serializeShowEntity(final HoverEvent.ShowEntity input, final Codec.Encoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
     return NEW_INSTANCE.serializeShowEntity(input, componentCodec);
   }
 }
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java
index d5eb8c1611..472fdfa6c6 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java
@@ -51,7 +51,7 @@
 import net.kyori.adventure.text.StorageNBTComponent;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.TranslatableComponent;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.EXTRA;
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.KEYBIND;
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializer.java
index e5c6ca3927..e404978905 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializer.java
@@ -34,8 +34,8 @@
 import net.kyori.adventure.util.Buildable;
 import net.kyori.adventure.util.PlatformAPI;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A gson component serializer.
@@ -48,6 +48,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface GsonComponentSerializer extends JSONComponentSerializer, Buildable<GsonComponentSerializer, GsonComponentSerializer.Builder> {
   /**
    * Gets a component serializer for gson serialization and deserialization.
@@ -55,7 +56,7 @@ public interface GsonComponentSerializer extends JSONComponentSerializer, Builda
    * @return a gson component serializer
    * @since 4.0.0
    */
-  static @NotNull GsonComponentSerializer gson() {
+  static GsonComponentSerializer gson() {
     return GsonComponentSerializerImpl.Instances.INSTANCE;
   }
 
@@ -68,7 +69,7 @@ public interface GsonComponentSerializer extends JSONComponentSerializer, Builda
    * @return a gson component serializer
    * @since 4.0.0
    */
-  static @NotNull GsonComponentSerializer colorDownsamplingGson() {
+  static GsonComponentSerializer colorDownsamplingGson() {
     return GsonComponentSerializerImpl.Instances.LEGACY_INSTANCE;
   }
 
@@ -88,7 +89,7 @@ static Builder builder() {
    * @return a gson serializer
    * @since 4.0.0
    */
-  @NotNull Gson serializer();
+  Gson serializer();
 
   /**
    * Gets the underlying gson populator.
@@ -96,7 +97,7 @@ static Builder builder() {
    * @return a gson populator
    * @since 4.0.0
    */
-  @NotNull UnaryOperator<GsonBuilder> populator();
+  UnaryOperator<GsonBuilder> populator();
 
   /**
    * Deserialize a component from input of type {@link JsonElement}.
@@ -105,7 +106,7 @@ static Builder builder() {
    * @return the component
    * @since 4.7.0
    */
-  @NotNull Component deserializeFromTree(final @NotNull JsonElement input);
+  Component deserializeFromTree(final JsonElement input);
 
   /**
    * Deserialize a component to output of type {@link JsonElement}.
@@ -114,7 +115,7 @@ static Builder builder() {
    * @return the json element
    * @since 4.7.0
    */
-  @NotNull JsonElement serializeToTree(final @NotNull Component component);
+  JsonElement serializeToTree(final Component component);
 
   /**
    * A builder for {@link GsonComponentSerializer}.
@@ -129,7 +130,7 @@ interface Builder extends AbstractBuilder<GsonComponentSerializer>, Buildable.Bu
      * @since 4.0.0
      */
     @Override
-    @NotNull Builder downsampleColors();
+    Builder downsampleColors();
 
     /**
      * Sets a serializer that will be used to interpret legacy hover event {@code value} payloads.
@@ -142,12 +143,12 @@ interface Builder extends AbstractBuilder<GsonComponentSerializer>, Buildable.Bu
      * @deprecated for removal since 4.14.0, use {@link #legacyHoverEventSerializer(net.kyori.adventure.text.serializer.json.LegacyHoverEventSerializer)} instead
      */
     @Deprecated
-    default @NotNull Builder legacyHoverEventSerializer(final @Nullable LegacyHoverEventSerializer serializer) {
+    default Builder legacyHoverEventSerializer(final @Nullable LegacyHoverEventSerializer serializer) {
       return this.legacyHoverEventSerializer((net.kyori.adventure.text.serializer.json.LegacyHoverEventSerializer) serializer);
     }
 
     @Override
-    @NotNull Builder legacyHoverEventSerializer(final net.kyori.adventure.text.serializer.json.@Nullable LegacyHoverEventSerializer serializer);
+    Builder legacyHoverEventSerializer(final net.kyori.adventure.text.serializer.json.@Nullable LegacyHoverEventSerializer serializer);
 
     /**
      * {@inheritDoc}
@@ -155,7 +156,7 @@ interface Builder extends AbstractBuilder<GsonComponentSerializer>, Buildable.Bu
      * @since 4.0.0
      */
     @Override
-    @NotNull Builder emitLegacyHoverEvent();
+    Builder emitLegacyHoverEvent();
 
     /**
      * Builds the serializer.
@@ -163,7 +164,7 @@ interface Builder extends AbstractBuilder<GsonComponentSerializer>, Buildable.Bu
      * @return the built serializer
      */
     @Override
-    @NotNull GsonComponentSerializer build();
+    GsonComponentSerializer build();
   }
 
   /**
@@ -182,7 +183,7 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull GsonComponentSerializer gson();
+    GsonComponentSerializer gson();
 
     /**
      * Provides a legacy {@link GsonComponentSerializer}.
@@ -192,7 +193,7 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull GsonComponentSerializer gsonLegacy();
+    GsonComponentSerializer gsonLegacy();
 
     /**
      * Completes the building process of {@link Builder}.
@@ -202,6 +203,6 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull Consumer<Builder> builder();
+    Consumer<Builder> builder();
   }
 }
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java
index acf1b65f87..6102a923a2 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java
@@ -31,9 +31,10 @@
 import java.util.function.UnaryOperator;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.util.Services;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class GsonComponentSerializerImpl implements GsonComponentSerializer {
   private static final Optional<Provider> SERVICE = Services.service(Provider.class);
   static final Consumer<Builder> BUILDER = SERVICE
@@ -73,17 +74,17 @@ static final class Instances {
   }
 
   @Override
-  public @NotNull Gson serializer() {
+  public Gson serializer() {
     return this.serializer;
   }
 
   @Override
-  public @NotNull UnaryOperator<GsonBuilder> populator() {
+  public UnaryOperator<GsonBuilder> populator() {
     return this.populator;
   }
 
   @Override
-  public @NotNull Component deserialize(final @NotNull String string) {
+  public Component deserialize(final String string) {
     final Component component = this.serializer().fromJson(string, Component.class);
     if (component == null) throw ComponentSerializerImpl.notSureHowToDeserialize(string);
     return component;
@@ -98,24 +99,24 @@ static final class Instances {
   }
 
   @Override
-  public @NotNull String serialize(final @NotNull Component component) {
+  public String serialize(final Component component) {
     return this.serializer().toJson(component);
   }
 
   @Override
-  public @NotNull Component deserializeFromTree(final @NotNull JsonElement input) {
+  public Component deserializeFromTree(final JsonElement input) {
     final Component component = this.serializer().fromJson(input, Component.class);
     if (component == null) throw ComponentSerializerImpl.notSureHowToDeserialize(input);
     return component;
   }
 
   @Override
-  public @NotNull JsonElement serializeToTree(final @NotNull Component component) {
+  public JsonElement serializeToTree(final Component component) {
     return this.serializer().toJsonTree(component);
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -136,25 +137,25 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder downsampleColors() {
+    public Builder downsampleColors() {
       this.downsampleColor = true;
       return this;
     }
 
     @Override
-    public @NotNull Builder legacyHoverEventSerializer(final net.kyori.adventure.text.serializer.json.@Nullable LegacyHoverEventSerializer serializer) {
+    public Builder legacyHoverEventSerializer(final net.kyori.adventure.text.serializer.json.@Nullable LegacyHoverEventSerializer serializer) {
       this.legacyHoverSerializer = serializer;
       return this;
     }
 
     @Override
-    public @NotNull Builder emitLegacyHoverEvent() {
+    public Builder emitLegacyHoverEvent() {
       this.emitLegacyHover = true;
       return this;
     }
 
     @Override
-    public @NotNull GsonComponentSerializer build() {
+    public GsonComponentSerializer build() {
       if (this.legacyHoverSerializer == null) {
         return this.downsampleColor ? Instances.LEGACY_INSTANCE : Instances.INSTANCE;
       } else {
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonHacks.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonHacks.java
index 3654c666c9..48767377a7 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonHacks.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonHacks.java
@@ -28,7 +28,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import java.io.IOException;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 final class GsonHacks {
   private GsonHacks() {
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/JSONComponentSerializerProviderImpl.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/JSONComponentSerializerProviderImpl.java
index e164eef0db..b631065ebe 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/JSONComponentSerializerProviderImpl.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/JSONComponentSerializerProviderImpl.java
@@ -27,7 +27,7 @@
 import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
 import net.kyori.adventure.util.Services;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Implementation of the JSON component serializer provider.
@@ -35,14 +35,15 @@
  * @since 4.14.0
  */
 @ApiStatus.Internal
+@NullMarked
 public final class JSONComponentSerializerProviderImpl implements JSONComponentSerializer.Provider, Services.Fallback {
   @Override
-  public @NotNull JSONComponentSerializer instance() {
+  public JSONComponentSerializer instance() {
     return GsonComponentSerializer.gson();
   }
 
   @Override
-  public @NotNull Supplier<JSONComponentSerializer.@NotNull Builder> builder() {
+  public Supplier<JSONComponentSerializer.Builder> builder() {
     return GsonComponentSerializer::builder;
   }
 
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
index 3ffaed8bd9..b94d3d3cdc 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
@@ -35,7 +35,7 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 final class SerializerFactory implements TypeAdapterFactory {
   static final Class<Key> KEY_TYPE = Key.class;
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShowEntitySerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShowEntitySerializer.java
index bcd9b72c0c..64a1f17e8e 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShowEntitySerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShowEntitySerializer.java
@@ -33,7 +33,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.SHOW_ENTITY_ID;
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.SHOW_ENTITY_NAME;
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShowItemSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShowItemSerializer.java
index 180db185a7..a35ae09091 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShowItemSerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShowItemSerializer.java
@@ -33,7 +33,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.nbt.api.BinaryTagHolder;
 import net.kyori.adventure.text.event.HoverEvent;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.SHOW_ITEM_COUNT;
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.SHOW_ITEM_ID;
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
index eab2264197..0bcfb481be 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
@@ -44,7 +44,7 @@
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.util.Codec;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.CLICK_EVENT;
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.CLICK_EVENT_ACTION;
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/TextColorSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/TextColorSerializer.java
index 780fb33b28..09622ee7c5 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/TextColorSerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/TextColorSerializer.java
@@ -30,9 +30,10 @@
 import java.util.Locale;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class TextColorSerializer extends TypeAdapter<TextColor> {
   static final TypeAdapter<TextColor> INSTANCE = new TextColorSerializer(false).nullSafe();
   static final TypeAdapter<TextColor> DOWNSAMPLE_COLOR = new TextColorSerializer(true).nullSafe();
@@ -66,7 +67,7 @@ private static String asUpperCaseHexString(final TextColor color) {
     return this.downsampleColor ? NamedTextColor.nearestTo(color) : color;
   }
 
-  static @Nullable TextColor fromString(final @NotNull String value) {
+  static @Nullable TextColor fromString(final String value) {
     if (value.startsWith(TextColor.HEX_PREFIX)) {
       return TextColor.fromHexString(value);
     } else {
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/TextColorWrapper.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/TextColorWrapper.java
index b587ba6fe1..5d2225650f 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/TextColorWrapper.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/TextColorWrapper.java
@@ -31,7 +31,7 @@
 import java.io.IOException;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /*
  * This is a hack.
diff --git a/text-serializer-json-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/json/legacyimpl/NBTLegacyHoverEventSerializer.java b/text-serializer-json-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/json/legacyimpl/NBTLegacyHoverEventSerializer.java
index f6dde48900..1dc86f33cc 100644
--- a/text-serializer-json-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/json/legacyimpl/NBTLegacyHoverEventSerializer.java
+++ b/text-serializer-json-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/json/legacyimpl/NBTLegacyHoverEventSerializer.java
@@ -25,13 +25,14 @@
 
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.serializer.json.LegacyHoverEventSerializer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A legacy {@link HoverEvent} serializer.
  *
  * @since 4.14.0
  */
+@NullMarked
 public interface NBTLegacyHoverEventSerializer extends LegacyHoverEventSerializer {
   /**
    * Gets the legacy {@link HoverEvent} serializer.
@@ -39,7 +40,7 @@ public interface NBTLegacyHoverEventSerializer extends LegacyHoverEventSerialize
    * @return a legacy {@link HoverEvent} serializer
    * @since 4.14.0
    */
-  static @NotNull LegacyHoverEventSerializer get() {
+  static LegacyHoverEventSerializer get() {
     return NBTLegacyHoverEventSerializerImpl.INSTANCE;
   }
 }
diff --git a/text-serializer-json-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/json/legacyimpl/NBTLegacyHoverEventSerializerImpl.java b/text-serializer-json-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/json/legacyimpl/NBTLegacyHoverEventSerializerImpl.java
index 92d8d279a2..005b584503 100644
--- a/text-serializer-json-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/json/legacyimpl/NBTLegacyHoverEventSerializerImpl.java
+++ b/text-serializer-json-legacy-impl/src/main/java/net/kyori/adventure/text/serializer/json/legacyimpl/NBTLegacyHoverEventSerializerImpl.java
@@ -34,9 +34,10 @@
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.serializer.json.LegacyHoverEventSerializer;
 import net.kyori.adventure.util.Codec;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class NBTLegacyHoverEventSerializerImpl implements LegacyHoverEventSerializer {
   static final NBTLegacyHoverEventSerializerImpl INSTANCE = new NBTLegacyHoverEventSerializerImpl();
   private static final TagStringIO SNBT_IO = TagStringIO.get();
@@ -54,7 +55,7 @@ private NBTLegacyHoverEventSerializerImpl() {
   }
 
   @Override
-  public HoverEvent.@NotNull ShowItem deserializeShowItem(final @NotNull Component input) throws IOException {
+  public HoverEvent.ShowItem deserializeShowItem(final Component input) throws IOException {
     assertTextComponent(input);
     final CompoundBinaryTag contents = SNBT_CODEC.decode(((TextComponent) input).content());
     final CompoundBinaryTag tag = contents.getCompound(ITEM_TAG);
@@ -66,7 +67,7 @@ private NBTLegacyHoverEventSerializerImpl() {
   }
 
   @Override
-  public @NotNull Component serializeShowItem(final HoverEvent.@NotNull ShowItem input) throws IOException {
+  public Component serializeShowItem(final HoverEvent.ShowItem input) throws IOException {
     final CompoundBinaryTag.Builder builder = CompoundBinaryTag.builder()
       .putString(ITEM_TYPE, input.item().asString())
       .putByte(ITEM_COUNT, (byte) input.count());
@@ -78,7 +79,7 @@ private NBTLegacyHoverEventSerializerImpl() {
   }
 
   @Override
-  public HoverEvent.@NotNull ShowEntity deserializeShowEntity(final @NotNull Component input, final Codec.Decoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
+  public HoverEvent.ShowEntity deserializeShowEntity(final Component input, final Codec.Decoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
     assertTextComponent(input);
     final CompoundBinaryTag contents = SNBT_CODEC.decode(((TextComponent) input).content());
     return HoverEvent.ShowEntity.showEntity(
@@ -89,7 +90,7 @@ private NBTLegacyHoverEventSerializerImpl() {
   }
 
   @Override
-  public @NotNull Component serializeShowEntity(final HoverEvent.@NotNull ShowEntity input, final Codec.Encoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
+  public Component serializeShowEntity(final HoverEvent.ShowEntity input, final Codec.Encoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
     final CompoundBinaryTag.Builder builder = CompoundBinaryTag.builder()
       .putString(ENTITY_ID, input.id().toString())
       .putString(ENTITY_TYPE, input.type().asString());
diff --git a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/DummyJSONComponentSerializer.java b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/DummyJSONComponentSerializer.java
index 33b7004ae0..d534554c04 100644
--- a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/DummyJSONComponentSerializer.java
+++ b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/DummyJSONComponentSerializer.java
@@ -24,9 +24,10 @@
 package net.kyori.adventure.text.serializer.json;
 
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class DummyJSONComponentSerializer implements JSONComponentSerializer {
   static final JSONComponentSerializer INSTANCE = new DummyJSONComponentSerializer();
   private static final String UNSUPPORTED_MESSAGE =
@@ -36,29 +37,29 @@ final class DummyJSONComponentSerializer implements JSONComponentSerializer {
       "Is your environment configured in a way that causes ServiceLoader to malfunction?";
 
   @Override
-  public @NotNull Component deserialize(final @NotNull String input) {
+  public Component deserialize(final String input) {
     throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
   }
 
   @Override
-  public @NotNull String serialize(final @NotNull Component component) {
+  public String serialize(final Component component) {
     throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
   }
 
   // A no-op builder that just returns the unsupported instance.
   static final class BuilderImpl implements Builder {
     @Override
-    public @NotNull Builder downsampleColors() {
+    public Builder downsampleColors() {
       return this;
     }
 
     @Override
-    public @NotNull Builder legacyHoverEventSerializer(final @Nullable LegacyHoverEventSerializer serializer) {
+    public Builder legacyHoverEventSerializer(final @Nullable LegacyHoverEventSerializer serializer) {
       return this;
     }
 
     @Override
-    public @NotNull Builder emitLegacyHoverEvent() {
+    public Builder emitLegacyHoverEvent() {
       return this;
     }
 
diff --git a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONComponentSerializer.java b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONComponentSerializer.java
index bb3b7d2975..ac49a1cb50 100644
--- a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONComponentSerializer.java
+++ b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONComponentSerializer.java
@@ -28,8 +28,8 @@
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import net.kyori.adventure.util.PlatformAPI;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A JSON component serializer.
@@ -39,6 +39,7 @@
  *
  * @since 4.14.0
  */
+@NullMarked
 public interface JSONComponentSerializer extends ComponentSerializer<Component, Component, String> {
   /**
    * Gets a component serializer for JSON serialization and deserialization.
@@ -46,7 +47,7 @@ public interface JSONComponentSerializer extends ComponentSerializer<Component,
    * @return a JSON component serializer
    * @since 4.14.0
    */
-  static @NotNull JSONComponentSerializer json() {
+  static JSONComponentSerializer json() {
     return JSONComponentSerializerAccessor.Instances.INSTANCE;
   }
 
@@ -56,7 +57,7 @@ public interface JSONComponentSerializer extends ComponentSerializer<Component,
    * @return the new builder
    * @since 4.14.0
    */
-  static JSONComponentSerializer.@NotNull Builder builder() {
+  static JSONComponentSerializer.Builder builder() {
     return JSONComponentSerializerAccessor.Instances.BUILDER_SUPPLIER.get();
   }
 
@@ -72,7 +73,7 @@ interface Builder {
      * @return this builder
      * @since 4.14.0
      */
-    @NotNull Builder downsampleColors();
+    Builder downsampleColors();
 
     /**
      * Sets a serializer that will be used to interpret legacy hover event {@code value} payloads.
@@ -83,7 +84,7 @@ interface Builder {
      * @return this builder
      * @since 4.14.0
      */
-    @NotNull Builder legacyHoverEventSerializer(final @Nullable LegacyHoverEventSerializer serializer);
+    Builder legacyHoverEventSerializer(final @Nullable LegacyHoverEventSerializer serializer);
 
     /**
      * Output a legacy hover event {@code value} in addition to the modern {@code contents}.
@@ -94,7 +95,7 @@ interface Builder {
      * @return this builder
      * @since 4.14.0
      */
-    @NotNull Builder emitLegacyHoverEvent();
+    Builder emitLegacyHoverEvent();
 
     /**
      * Create a finished serializer instance.
@@ -121,7 +122,7 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull JSONComponentSerializer instance();
+    JSONComponentSerializer instance();
 
     /**
      * Provide a supplier for builder builders of {@link JSONComponentSerializer} instances.
@@ -131,6 +132,6 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull Supplier<@NotNull Builder> builder();
+    Supplier<Builder> builder();
   }
 }
diff --git a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/LegacyHoverEventSerializer.java b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/LegacyHoverEventSerializer.java
index b51ab7cf99..12bff34818 100644
--- a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/LegacyHoverEventSerializer.java
+++ b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/LegacyHoverEventSerializer.java
@@ -27,13 +27,14 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.util.Codec;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Adapter to convert between modern and legacy hover event formats.
  *
  * @since 4.14.0
  */
+@NullMarked
 public interface LegacyHoverEventSerializer {
   /**
    * Convert a legacy hover event {@code show_item} value to its modern format.
@@ -43,7 +44,7 @@ public interface LegacyHoverEventSerializer {
    * @throws IOException if the input is improperly formatted
    * @since 4.14.0
    */
-  HoverEvent.@NotNull ShowItem deserializeShowItem(@NotNull Component input) throws IOException;
+  HoverEvent.ShowItem deserializeShowItem(Component input) throws IOException;
 
   /**
    * Convert a modern hover event {@code show_item} value to its legacy format.
@@ -53,7 +54,7 @@ public interface LegacyHoverEventSerializer {
    * @throws IOException if the input is improperly formatted
    * @since 4.14.0
    */
-  @NotNull Component serializeShowItem(HoverEvent.@NotNull ShowItem input) throws IOException;
+  Component serializeShowItem(HoverEvent.ShowItem input) throws IOException;
 
   /**
    * Convert a legacy hover event {@code show_entity} value to its modern format.
@@ -64,7 +65,7 @@ public interface LegacyHoverEventSerializer {
    * @throws IOException if the input is improperly formatted
    * @since 4.14.0
    */
-  HoverEvent.@NotNull ShowEntity deserializeShowEntity(@NotNull Component input, Codec.Decoder<Component, String, ? extends RuntimeException> componentDecoder) throws IOException;
+  HoverEvent.ShowEntity deserializeShowEntity(Component input, Codec.Decoder<Component, String, ? extends RuntimeException> componentDecoder) throws IOException;
 
   /**
    * Convert a modern hover event {@code show_entity} value to its legacy format.
@@ -75,5 +76,5 @@ public interface LegacyHoverEventSerializer {
    * @throws IOException if the input is improperly formatted
    * @since 4.14.0
    */
-  @NotNull Component serializeShowEntity(HoverEvent.@NotNull ShowEntity input, Codec.Encoder<Component, String, ? extends RuntimeException> componentEncoder) throws IOException;
+  Component serializeShowEntity(HoverEvent.ShowEntity input, Codec.Encoder<Component, String, ? extends RuntimeException> componentEncoder) throws IOException;
 }
diff --git a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormat.java b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormat.java
index 1a7270b4eb..6cc44f7701 100644
--- a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormat.java
+++ b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormat.java
@@ -31,8 +31,8 @@
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A combination of a {@code character} and a {@link TextFormat}.
@@ -40,6 +40,7 @@
  * @since 4.14.0
  */
 @ApiStatus.NonExtendable
+@NullMarked
 public interface CharacterAndFormat extends Examinable {
   /**
    * Character and format pair representing {@link NamedTextColor#BLACK}.
@@ -184,7 +185,7 @@ public interface CharacterAndFormat extends Examinable {
    * @return a new character and format pair.
    * @since 4.14.0
    */
-  static @NotNull CharacterAndFormat characterAndFormat(final char character, final @NotNull TextFormat format) {
+  static CharacterAndFormat characterAndFormat(final char character, final TextFormat format) {
     return new CharacterAndFormatImpl(character, format);
   }
 
@@ -195,7 +196,7 @@ public interface CharacterAndFormat extends Examinable {
    * @since 4.14.0
    */
   @Unmodifiable
-  static @NotNull List<CharacterAndFormat> defaults() {
+  static List<CharacterAndFormat> defaults() {
     return CharacterAndFormatImpl.Defaults.DEFAULTS;
   }
 
@@ -213,10 +214,10 @@ public interface CharacterAndFormat extends Examinable {
    * @return the format
    * @since 4.14.0
    */
-  @NotNull TextFormat format();
+  TextFormat format();
 
   @Override
-  default @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  default Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("character", this.character()),
       ExaminableProperty.of("format", this.format())
diff --git a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormatImpl.java b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormatImpl.java
index b0e346240e..2940c60a31 100644
--- a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormatImpl.java
+++ b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormatImpl.java
@@ -28,16 +28,17 @@
 import java.util.List;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.adventure.text.format.TextFormat;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class CharacterAndFormatImpl implements CharacterAndFormat {
   private final char character;
   private final TextFormat format;
 
-  CharacterAndFormatImpl(final char character, final @NotNull TextFormat format) {
+  CharacterAndFormatImpl(final char character, final TextFormat format) {
     this.character = character;
     this.format = requireNonNull(format, "format");
   }
@@ -48,7 +49,7 @@ public char character() {
   }
 
   @Override
-  public @NotNull TextFormat format() {
+  public TextFormat format() {
     return this.format;
   }
 
@@ -69,7 +70,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull String toString() {
+  public String toString() {
     return Internals.toString(this);
   }
 
diff --git a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyComponentSerializer.java b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyComponentSerializer.java
index 435c9c677e..7f03f0561e 100644
--- a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyComponentSerializer.java
+++ b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyComponentSerializer.java
@@ -38,8 +38,8 @@
 import net.kyori.adventure.util.Buildable;
 import net.kyori.adventure.util.PlatformAPI;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A legacy component serializer.
@@ -49,6 +49,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public interface LegacyComponentSerializer extends ComponentSerializer<Component, TextComponent, String>, Buildable<LegacyComponentSerializer, LegacyComponentSerializer.Builder> {
   /**
    * Gets a component serializer for legacy-based serialization and deserialization. Note that this
@@ -60,7 +61,7 @@ public interface LegacyComponentSerializer extends ComponentSerializer<Component
    * @return a component serializer for legacy serialization and deserialization
    * @since 4.0.0
    */
-  static @NotNull LegacyComponentSerializer legacySection() {
+  static LegacyComponentSerializer legacySection() {
     return LegacyComponentSerializerImpl.Instances.SECTION;
   }
 
@@ -74,7 +75,7 @@ public interface LegacyComponentSerializer extends ComponentSerializer<Component
    * @return a component serializer for legacy serialization and deserialization
    * @since 4.0.0
    */
-  static @NotNull LegacyComponentSerializer legacyAmpersand() {
+  static LegacyComponentSerializer legacyAmpersand() {
     return LegacyComponentSerializerImpl.Instances.AMPERSAND;
   }
 
@@ -87,7 +88,7 @@ public interface LegacyComponentSerializer extends ComponentSerializer<Component
    * @return a component serializer for legacy serialization and deserialization
    * @since 4.0.0
    */
-  static @NotNull LegacyComponentSerializer legacy(final char legacyCharacter) {
+  static LegacyComponentSerializer legacy(final char legacyCharacter) {
     if (legacyCharacter == SECTION_CHAR) {
       return legacySection();
     } else if (legacyCharacter == AMPERSAND_CHAR) {
@@ -113,7 +114,7 @@ public interface LegacyComponentSerializer extends ComponentSerializer<Component
    * @return the builder
    * @since 4.0.0
    */
-  static @NotNull Builder builder() {
+  static Builder builder() {
     return new LegacyComponentSerializerImpl.BuilderImpl();
   }
 
@@ -145,7 +146,7 @@ public interface LegacyComponentSerializer extends ComponentSerializer<Component
    * @return the component
    */
   @Override
-  @NotNull TextComponent deserialize(final @NotNull String input);
+  TextComponent deserialize(final String input);
 
   /**
    * Serializes a component into a legacy {@link String}.
@@ -154,7 +155,7 @@ public interface LegacyComponentSerializer extends ComponentSerializer<Component
    * @return the string
    */
   @Override
-  @NotNull String serialize(final @NotNull Component component);
+  String serialize(final Component component);
 
   /**
    * A builder for {@link LegacyComponentSerializer}.
@@ -169,7 +170,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.0.0
      */
-    @NotNull Builder character(final char legacyCharacter);
+    Builder character(final char legacyCharacter);
 
     /**
      * Sets the legacy hex character used by the serializer.
@@ -178,7 +179,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.0.0
      */
-    @NotNull Builder hexCharacter(final char legacyHexCharacter);
+    Builder hexCharacter(final char legacyHexCharacter);
 
     /**
      * Sets that the serializer should extract URLs into {@link ClickEvent}s
@@ -187,7 +188,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.0.0
      */
-    @NotNull Builder extractUrls();
+    Builder extractUrls();
 
     /**
      * Sets that the serializer should extract URLs into {@link ClickEvent}s
@@ -197,7 +198,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.2.0
      */
-    @NotNull Builder extractUrls(final @NotNull Pattern pattern);
+    Builder extractUrls(final Pattern pattern);
 
     /**
      * Sets that the serializer should extract URLs into {@link ClickEvent}s
@@ -207,7 +208,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.0.0
      */
-    @NotNull Builder extractUrls(final @Nullable Style style);
+    Builder extractUrls(final @Nullable Style style);
 
     /**
      * Sets that the serializer should extract URLs into {@link ClickEvent}s
@@ -218,7 +219,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.2.0
      */
-    @NotNull Builder extractUrls(final @NotNull Pattern pattern, final @Nullable Style style);
+    Builder extractUrls(final Pattern pattern, final @Nullable Style style);
 
     /**
      * Sets that the serializer should support hex colors.
@@ -228,7 +229,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.0.0
      */
-    @NotNull Builder hexColors();
+    Builder hexColors();
 
     /**
      * Sets that the serializer should use the '&amp;x' repeated code format when serializing hex
@@ -247,7 +248,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.0.0
      */
-    @NotNull Builder useUnusualXRepeatedCharacterHexFormat();
+    Builder useUnusualXRepeatedCharacterHexFormat();
 
     /**
      * Use this component flattener to convert components into plain text.
@@ -258,7 +259,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.7.0
      */
-    @NotNull Builder flattener(final @NotNull ComponentFlattener flattener);
+    Builder flattener(final ComponentFlattener flattener);
 
     /**
      * Sets the formats to use.
@@ -267,7 +268,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return this builder
      * @since 4.14.0
      */
-    @NotNull Builder formats(final @NotNull List<CharacterAndFormat> formats);
+    Builder formats(final List<CharacterAndFormat> formats);
 
     /**
      * Builds the serializer.
@@ -275,7 +276,7 @@ interface Builder extends AbstractBuilder<LegacyComponentSerializer>, Buildable.
      * @return the built serializer
      */
     @Override
-    @NotNull LegacyComponentSerializer build();
+    LegacyComponentSerializer build();
   }
 
   /**
@@ -294,7 +295,7 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull LegacyComponentSerializer legacyAmpersand();
+    LegacyComponentSerializer legacyAmpersand();
 
     /**
      * Provides a {@link LegacyComponentSerializer} using {@link #SECTION_CHAR}.
@@ -304,7 +305,7 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull LegacyComponentSerializer legacySection();
+    LegacyComponentSerializer legacySection();
 
     /**
      * Completes the building process of {@link Builder}.
@@ -314,6 +315,6 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull Consumer<Builder> legacy();
+    Consumer<Builder> legacy();
   }
 }
diff --git a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyComponentSerializerImpl.java b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyComponentSerializerImpl.java
index b79ca943dd..3ba802e13e 100644
--- a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyComponentSerializerImpl.java
+++ b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyComponentSerializerImpl.java
@@ -44,11 +44,12 @@
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.format.TextFormat;
 import net.kyori.adventure.util.Services;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class LegacyComponentSerializerImpl implements LegacyComponentSerializer {
   static final Pattern DEFAULT_URL_PATTERN = Pattern.compile("(?:(https?)://)?([-\\w_.]+\\.\\w{2,})(/\\S*)?");
   static final Pattern URL_SCHEME_PATTERN = Pattern.compile("^[a-z][a-z0-9+\\-.]*:");
@@ -203,7 +204,7 @@ private TextComponent extractUrl(final TextComponent component) {
   }
 
   @Override
-  public @NotNull TextComponent deserialize(final @NotNull String input) {
+  public TextComponent deserialize(final String input) {
     int next = input.lastIndexOf(this.character, input.length() - 2);
     if (next == -1) {
       return this.extractUrl(Component.text(input));
@@ -266,13 +267,13 @@ private TextComponent extractUrl(final TextComponent component) {
   }
 
   @Override
-  public @NotNull String serialize(final @NotNull Component component) {
+  public String serialize(final Component component) {
     final Cereal state = new Cereal();
     this.flattener.flatten(component, state);
     return state.toString();
   }
 
-  private static boolean applyFormat(final TextComponent.@NotNull Builder builder, final @NotNull TextFormat format) {
+  private static boolean applyFormat(final TextComponent.Builder builder, final TextFormat format) {
     if (format instanceof TextColor) {
       builder.colorIfAbsent((TextColor) format);
       return true;
@@ -286,7 +287,7 @@ private static boolean applyFormat(final TextComponent.@NotNull Builder builder,
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -299,7 +300,7 @@ private final class Cereal implements FlattenerListener {
     private int head = -1;
 
     @Override
-    public void pushStyle(final @NotNull Style pushed) {
+    public void pushStyle(final Style pushed) {
       final int idx = ++this.head;
       if (idx >= this.styles.length) {
         this.styles = Arrays.copyOf(this.styles, this.styles.length * 2);
@@ -322,7 +323,7 @@ public void pushStyle(final @NotNull Style pushed) {
     }
 
     @Override
-    public void component(final @NotNull String text) {
+    public void component(final String text) {
       if (!text.isEmpty()) {
         if (this.head < 0) throw new IllegalStateException("No style has been pushed!");
 
@@ -332,13 +333,13 @@ public void component(final @NotNull String text) {
     }
 
     @Override
-    public void popStyle(final @NotNull Style style) {
+    public void popStyle(final Style style) {
       if (this.head-- < 0) {
         throw new IllegalStateException("Tried to pop beyond what was pushed!");
       }
     }
 
-    void append(final @NotNull TextFormat format) {
+    void append(final TextFormat format) {
       if (this.lastWritten != format) {
         final String legacyCode = LegacyComponentSerializerImpl.this.toLegacyCode(format);
         if (legacyCode == null) {
@@ -363,7 +364,7 @@ private final class StyleState {
         this.decorations = EnumSet.noneOf(TextDecoration.class);
       }
 
-      void set(final @NotNull StyleState that) {
+      void set(final StyleState that) {
         this.color = that.color;
         this.decorations.clear();
         this.decorations.addAll(that.decorations);
@@ -374,7 +375,7 @@ public void clear() {
         this.decorations.clear();
       }
 
-      void apply(final @NotNull Style component) {
+      void apply(final Style component) {
         final TextColor color = component.color();
         if (color != null) {
           this.color = color;
@@ -458,7 +459,7 @@ static final class BuilderImpl implements Builder {
       BUILDER.accept(this); // let service provider touch the builder before anybody else touches it
     }
 
-    BuilderImpl(final @NotNull LegacyComponentSerializerImpl serializer) {
+    BuilderImpl(final LegacyComponentSerializerImpl serializer) {
       this();
       this.character = serializer.character;
       this.hexCharacter = serializer.hexCharacter;
@@ -470,34 +471,34 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder character(final char legacyCharacter) {
+    public Builder character(final char legacyCharacter) {
       this.character = legacyCharacter;
       return this;
     }
 
     @Override
-    public @NotNull Builder hexCharacter(final char legacyHexCharacter) {
+    public Builder hexCharacter(final char legacyHexCharacter) {
       this.hexCharacter = legacyHexCharacter;
       return this;
     }
 
     @Override
-    public @NotNull Builder extractUrls() {
+    public Builder extractUrls() {
       return this.extractUrls(DEFAULT_URL_PATTERN, null);
     }
 
     @Override
-    public @NotNull Builder extractUrls(final @NotNull Pattern pattern) {
+    public Builder extractUrls(final Pattern pattern) {
       return this.extractUrls(pattern, null);
     }
 
     @Override
-    public @NotNull Builder extractUrls(final @Nullable Style style) {
+    public Builder extractUrls(final @Nullable Style style) {
       return this.extractUrls(DEFAULT_URL_PATTERN, style);
     }
 
     @Override
-    public @NotNull Builder extractUrls(final @NotNull Pattern pattern, final @Nullable Style style) {
+    public Builder extractUrls(final Pattern pattern, final @Nullable Style style) {
       requireNonNull(pattern, "pattern");
       this.urlReplacementConfig = TextReplacementConfig.builder()
         .match(pattern)
@@ -513,31 +514,31 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder hexColors() {
+    public Builder hexColors() {
       this.hexColours = true;
       return this;
     }
 
     @Override
-    public @NotNull Builder useUnusualXRepeatedCharacterHexFormat() {
+    public Builder useUnusualXRepeatedCharacterHexFormat() {
       this.useTerriblyStupidHexFormat = true; // :(
       return this;
     }
 
     @Override
-    public @NotNull Builder flattener(final @NotNull ComponentFlattener flattener) {
+    public Builder flattener(final ComponentFlattener flattener) {
       this.flattener = requireNonNull(flattener, "flattener");
       return this;
     }
 
     @Override
-    public @NotNull Builder formats(final @NotNull List<CharacterAndFormat> formats) {
+    public Builder formats(final List<CharacterAndFormat> formats) {
       this.formats = CharacterAndFormatSet.of(formats);
       return this;
     }
 
     @Override
-    public @NotNull LegacyComponentSerializer build() {
+    public LegacyComponentSerializer build() {
       return new LegacyComponentSerializerImpl(this.character, this.hexCharacter, this.urlReplacementConfig, this.hexColours, this.useTerriblyStupidHexFormat, this.flattener, this.formats);
     }
   }
diff --git a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyFormat.java b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyFormat.java
index cb453dad5d..4dc56e3bf6 100644
--- a/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyFormat.java
+++ b/text-serializer-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/LegacyFormat.java
@@ -30,8 +30,8 @@
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /*
  * This is a hack.
@@ -42,6 +42,7 @@
  *
  * @since 4.0.0
  */
+@NullMarked
 public final class LegacyFormat implements Examinable {
   static final LegacyFormat RESET = new LegacyFormat(true);
   private final @Nullable NamedTextColor color;
@@ -117,7 +118,7 @@ public int hashCode() {
   }
 
   @Override
-  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+  public Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
       ExaminableProperty.of("color", this.color),
       ExaminableProperty.of("decoration", this.decoration),
diff --git a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainComponentSerializer.java b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainComponentSerializer.java
index dee6cae1c3..e40fea9d37 100644
--- a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainComponentSerializer.java
+++ b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainComponentSerializer.java
@@ -35,8 +35,8 @@
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import net.kyori.adventure.util.Buildable;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A plain component serializer.
@@ -49,6 +49,7 @@
  */
 @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
 @Deprecated
+@NullMarked
 public class PlainComponentSerializer implements ComponentSerializer<Component, TextComponent, String>, Buildable<PlainComponentSerializer, PlainComponentSerializer.Builder> {
   /**
    * A component serializer for plain-based serialization and deserialization.
@@ -59,7 +60,7 @@ public class PlainComponentSerializer implements ComponentSerializer<Component,
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
-  public static @NotNull PlainComponentSerializer plain() {
+  public static PlainComponentSerializer plain() {
     return PlainComponentSerializerImpl.INSTANCE;
   }
 
@@ -72,7 +73,7 @@ public class PlainComponentSerializer implements ComponentSerializer<Component,
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
-  public static PlainComponentSerializer.@NotNull Builder builder() {
+  public static PlainComponentSerializer.Builder builder() {
     return new PlainComponentSerializerImpl.BuilderImpl();
   }
 
@@ -105,17 +106,17 @@ public PlainComponentSerializer(final @Nullable Function<KeybindComponent, Strin
   }
 
   @Deprecated
-  PlainComponentSerializer(final @NotNull PlainTextComponentSerializer serializer) {
+  PlainComponentSerializer(final PlainTextComponentSerializer serializer) {
     this.serializer = serializer;
   }
 
   @Override
-  public @NotNull TextComponent deserialize(final @NotNull String input) {
+  public TextComponent deserialize(final String input) {
     return this.serializer.deserialize(input);
   }
 
   @Override
-  public @NotNull String serialize(final @NotNull Component component) {
+  public String serialize(final Component component) {
     return this.serializer.serialize(component);
   }
 
@@ -129,12 +130,12 @@ public PlainComponentSerializer(final @Nullable Function<KeybindComponent, Strin
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
-  public void serialize(final @NotNull StringBuilder sb, final @NotNull Component component) {
+  public void serialize(final StringBuilder sb, final Component component) {
     this.serializer.serialize(sb, component);
   }
 
   @Override
-  public PlainComponentSerializer.@NotNull Builder toBuilder() {
+  public PlainComponentSerializer.Builder toBuilder() {
     return new PlainComponentSerializerImpl.BuilderImpl(this);
   }
 
@@ -159,6 +160,6 @@ public interface Builder extends AbstractBuilder<PlainComponentSerializer>, Buil
      */
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
     @Deprecated
-    @NotNull Builder flattener(final @NotNull ComponentFlattener flattener);
+    Builder flattener(final ComponentFlattener flattener);
   }
 }
diff --git a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainComponentSerializerImpl.java b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainComponentSerializerImpl.java
index 557f1b7e88..b43a972783 100644
--- a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainComponentSerializerImpl.java
+++ b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainComponentSerializerImpl.java
@@ -27,10 +27,11 @@
 import net.kyori.adventure.text.KeybindComponent;
 import net.kyori.adventure.text.TranslatableComponent;
 import net.kyori.adventure.text.flattener.ComponentFlattener;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @Deprecated
+@NullMarked
 final class PlainComponentSerializerImpl {
   @Deprecated static final PlainComponentSerializer INSTANCE = new PlainComponentSerializer();
 
@@ -66,13 +67,13 @@ static final class BuilderImpl implements PlainComponentSerializer.Builder {
     }
 
     @Override
-    public PlainComponentSerializer.@NotNull Builder flattener(final @NotNull ComponentFlattener flattener) {
+    public PlainComponentSerializer.Builder flattener(final ComponentFlattener flattener) {
       this.builder.flattener(flattener);
       return this;
     }
 
     @Override
-    public @NotNull PlainComponentSerializer build() {
+    public PlainComponentSerializer build() {
       return new PlainComponentSerializer(this.builder.build());
     }
   }
diff --git a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainTextComponentSerializer.java b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainTextComponentSerializer.java
index 236f46ec4a..632340df78 100644
--- a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainTextComponentSerializer.java
+++ b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainTextComponentSerializer.java
@@ -34,7 +34,7 @@
 import net.kyori.adventure.util.Buildable;
 import net.kyori.adventure.util.PlatformAPI;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A plain-text component serializer.
@@ -44,6 +44,7 @@
  *
  * @since 4.8.0
  */
+@NullMarked
 public interface PlainTextComponentSerializer extends ComponentSerializer<Component, TextComponent, String>, Buildable<PlainTextComponentSerializer, PlainTextComponentSerializer.Builder> {
   /**
    * A component serializer for plain-based serialization and deserialization.
@@ -51,7 +52,7 @@ public interface PlainTextComponentSerializer extends ComponentSerializer<Compon
    * @return serializer instance
    * @since 4.8.0
    */
-  static @NotNull PlainTextComponentSerializer plainText() {
+  static PlainTextComponentSerializer plainText() {
     return PlainTextComponentSerializerImpl.Instances.INSTANCE;
   }
 
@@ -61,17 +62,17 @@ public interface PlainTextComponentSerializer extends ComponentSerializer<Compon
    * @return a new plain serializer builder
    * @since 4.8.0
    */
-  static PlainTextComponentSerializer.@NotNull Builder builder() {
+  static PlainTextComponentSerializer.Builder builder() {
     return new PlainTextComponentSerializerImpl.BuilderImpl();
   }
 
   @Override
-  default @NotNull TextComponent deserialize(final @NotNull String input) {
+  default TextComponent deserialize(final String input) {
     return Component.text(input);
   }
 
   @Override
-  default @NotNull String serialize(final @NotNull Component component) {
+  default String serialize(final Component component) {
     final StringBuilder sb = new StringBuilder();
     this.serialize(sb, component);
     return sb.toString();
@@ -84,7 +85,7 @@ public interface PlainTextComponentSerializer extends ComponentSerializer<Compon
    * @param component the component
    * @since 4.8.0
    */
-  void serialize(final @NotNull StringBuilder sb, final @NotNull Component component);
+  void serialize(final StringBuilder sb, final Component component);
 
   /**
    * A builder for the plain-text component serializer.
@@ -101,7 +102,7 @@ interface Builder extends AbstractBuilder<PlainTextComponentSerializer>, Buildab
      * @return this builder
      * @since 4.8.0
      */
-    @NotNull Builder flattener(final @NotNull ComponentFlattener flattener);
+    Builder flattener(final ComponentFlattener flattener);
   }
 
   /**
@@ -120,7 +121,7 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull PlainTextComponentSerializer plainTextSimple();
+    PlainTextComponentSerializer plainTextSimple();
 
     /**
      * Completes the building process of {@link Builder}.
@@ -130,6 +131,6 @@ interface Provider {
      */
     @ApiStatus.Internal
     @PlatformAPI
-    @NotNull Consumer<Builder> plainText();
+    Consumer<Builder> plainText();
   }
 }
diff --git a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainTextComponentSerializerImpl.java b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainTextComponentSerializerImpl.java
index a7f5780a5a..3b0c6e8c36 100644
--- a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainTextComponentSerializerImpl.java
+++ b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/PlainTextComponentSerializerImpl.java
@@ -28,10 +28,11 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.flattener.ComponentFlattener;
 import net.kyori.adventure.util.Services;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import static java.util.Objects.requireNonNull;
 
+@NullMarked
 final class PlainTextComponentSerializerImpl implements PlainTextComponentSerializer {
   private static final ComponentFlattener DEFAULT_FLATTENER = ComponentFlattener.basic().toBuilder()
     .unknownMapper(component -> {
@@ -58,12 +59,12 @@ static final class Instances {
   }
 
   @Override
-  public void serialize(final @NotNull StringBuilder sb, final @NotNull Component component) {
+  public void serialize(final StringBuilder sb, final Component component) {
     this.flattener.flatten(requireNonNull(component, "component"), sb::append);
   }
 
   @Override
-  public @NotNull Builder toBuilder() {
+  public Builder toBuilder() {
     return new BuilderImpl(this);
   }
 
@@ -80,13 +81,13 @@ static final class BuilderImpl implements PlainTextComponentSerializer.Builder {
     }
 
     @Override
-    public PlainTextComponentSerializer.@NotNull Builder flattener(final @NotNull ComponentFlattener flattener) {
+    public PlainTextComponentSerializer.Builder flattener(final ComponentFlattener flattener) {
       this.flattener = requireNonNull(flattener, "flattener");
       return this;
     }
 
     @Override
-    public @NotNull PlainTextComponentSerializer build() {
+    public PlainTextComponentSerializer build() {
       return new PlainTextComponentSerializerImpl(this.flattener);
     }
   }
diff --git a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/package-info.java b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/package-info.java
index bcc08e023e..f486e5c7a5 100644
--- a/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/package-info.java
+++ b/text-serializer-plain/src/main/java/net/kyori/adventure/text/serializer/plain/package-info.java
@@ -24,4 +24,7 @@
 /**
  * Plain text based serialization and deserialization.
  */
+@NullMarked
 package net.kyori.adventure.text.serializer.plain;
+
+import org.jspecify.annotations.NullMarked;