From 64faaae9a59a063b475be2e84cd3a9b2b7c600e1 Mon Sep 17 00:00:00 2001 From: Kieran Wallbanks Date: Fri, 4 Jun 2021 12:25:53 +0100 Subject: [PATCH 1/2] *: Move from checker-qual to Jetbrains annotations --- .../kyori/adventure/audience/Audience.java | 66 ++--- .../adventure/audience/EmptyAudience.java | 35 ++- .../audience/ForwardingAudience.java | 78 ++--- .../net/kyori/adventure/bossbar/BossBar.java | 62 ++-- .../kyori/adventure/bossbar/BossBarImpl.java | 52 ++-- .../kyori/adventure/identity/Identified.java | 4 +- .../kyori/adventure/identity/Identities.java | 4 +- .../kyori/adventure/identity/Identity.java | 10 +- .../adventure/identity/IdentityImpl.java | 6 +- .../net/kyori/adventure/inventory/Book.java | 36 +-- .../kyori/adventure/inventory/BookImpl.java | 30 +- .../adventure/nbt/api/BinaryTagHolder.java | 10 +- .../nbt/api/BinaryTagHolderImpl.java | 6 +- .../permission/PermissionChecker.java | 6 +- .../permission/PermissionCheckers.java | 6 +- .../net/kyori/adventure/pointer/Pointer.java | 10 +- .../kyori/adventure/pointer/PointerImpl.java | 8 +- .../kyori/adventure/pointer/Pointered.java | 13 +- .../java/net/kyori/adventure/sound/Sound.java | 26 +- .../net/kyori/adventure/sound/SoundImpl.java | 10 +- .../net/kyori/adventure/sound/SoundStop.java | 30 +- .../kyori/adventure/sound/SoundStopImpl.java | 6 +- .../adventure/text/AbstractComponent.java | 16 +- .../text/AbstractComponentBuilder.java | 48 +-- .../adventure/text/BlockNBTComponent.java | 46 +-- .../adventure/text/BlockNBTComponentImpl.java | 48 +-- .../adventure/text/BuildableComponent.java | 4 +- .../net/kyori/adventure/text/Component.java | 280 +++++++++--------- .../adventure/text/ComponentApplicable.java | 4 +- .../adventure/text/ComponentBuilder.java | 68 ++--- .../text/ComponentBuilderApplicable.java | 4 +- .../kyori/adventure/text/ComponentLike.java | 10 +- .../adventure/text/EntityNBTComponent.java | 8 +- .../text/EntityNBTComponentImpl.java | 28 +- .../adventure/text/KeybindComponent.java | 8 +- .../adventure/text/KeybindComponentImpl.java | 24 +- .../adventure/text/LinearComponents.java | 4 +- .../kyori/adventure/text/NBTComponent.java | 8 +- .../adventure/text/NBTComponentBuilder.java | 6 +- .../adventure/text/NBTComponentImpl.java | 16 +- .../kyori/adventure/text/ScopedComponent.java | 40 +-- .../kyori/adventure/text/ScoreComponent.java | 20 +- .../adventure/text/ScoreComponentImpl.java | 34 +-- .../adventure/text/SelectorComponent.java | 8 +- .../adventure/text/SelectorComponentImpl.java | 24 +- .../adventure/text/StorageNBTComponent.java | 8 +- .../text/StorageNBTComponentImpl.java | 31 +- .../kyori/adventure/text/TextComponent.java | 12 +- .../adventure/text/TextComponentImpl.java | 28 +- .../adventure/text/TextReplacementConfig.java | 30 +- .../text/TextReplacementConfigImpl.java | 23 +- .../text/TextReplacementRenderer.java | 8 +- .../adventure/text/TranslatableComponent.java | 28 +- .../text/TranslatableComponentImpl.java | 42 +-- .../adventure/text/event/ClickEvent.java | 36 +-- .../adventure/text/event/HoverEvent.java | 108 +++---- .../text/event/HoverEventSource.java | 8 +- .../text/flattener/ComponentFlattener.java | 18 +- .../flattener/ComponentFlattenerImpl.java | 18 +- .../text/flattener/FlattenerListener.java | 8 +- .../adventure/text/format/AlwaysMerger.java | 6 +- .../text/format/IfAbsentOnTargetMerger.java | 6 +- .../kyori/adventure/text/format/Merger.java | 6 +- .../adventure/text/format/NamedTextColor.java | 14 +- .../kyori/adventure/text/format/Style.java | 114 +++---- .../text/format/StyleBuilderApplicable.java | 6 +- .../adventure/text/format/StyleImpl.java | 58 ++-- .../adventure/text/format/TextColor.java | 32 +- .../adventure/text/format/TextColorImpl.java | 2 +- .../adventure/text/format/TextDecoration.java | 12 +- .../renderer/AbstractComponentRenderer.java | 20 +- .../text/renderer/ComponentRenderer.java | 4 +- .../TranslatableComponentRenderer.java | 26 +- .../text/serializer/ComponentSerializer.java | 19 +- .../java/net/kyori/adventure/title/Title.java | 20 +- .../net/kyori/adventure/title/TitleImpl.java | 20 +- .../translation/GlobalTranslator.java | 14 +- .../translation/GlobalTranslatorImpl.java | 16 +- .../adventure/translation/Translatable.java | 4 +- .../translation/TranslationRegistry.java | 24 +- .../translation/TranslationRegistryImpl.java | 26 +- .../adventure/translation/Translator.java | 10 +- .../net/kyori/adventure/util/Buildable.java | 10 +- .../java/net/kyori/adventure/util/Codec.java | 16 +- .../util/ComponentMessageThrowable.java | 2 +- .../net/kyori/adventure/util/HSVLike.java | 10 +- .../net/kyori/adventure/util/HSVLikeImpl.java | 2 +- .../java/net/kyori/adventure/util/Index.java | 24 +- .../net/kyori/adventure/util/Listenable.java | 8 +- .../net/kyori/adventure/util/MonkeyBars.java | 6 +- .../java/net/kyori/adventure/util/Nag.java | 4 +- .../net/kyori/adventure/util/RGBLike.java | 12 +- .../net/kyori/adventure/util/Services.java | 4 +- .../net/kyori/adventure/util/ShadyPines.java | 4 +- .../java/net/kyori/adventure/util/Ticks.java | 4 +- .../net/kyori/adventure/util/TriState.java | 8 +- .../util/UTF8ResourceBundleControl.java | 4 +- .../kyori/adventure/bossbar/BossBarTest.java | 14 +- .../flattener/ComponentFlattenerTest.java | 8 +- .../adventure/text/format/TextColorTest.java | 8 +- .../translation/GlobalTranslatorTest.java | 8 +- .../util/ComponentMessageThrowableTest.java | 2 +- .../net/kyori/adventure/util/HSVLikeTest.java | 6 +- .../adventure/key/InvalidKeyException.java | 10 +- .../java/net/kyori/adventure/key/Key.java | 20 +- .../java/net/kyori/adventure/key/KeyImpl.java | 22 +- .../java/net/kyori/adventure/key/Keyed.java | 4 +- .../net/kyori/adventure/key/KeyedValue.java | 6 +- .../kyori/adventure/key/KeyedValueImpl.java | 10 +- .../net/kyori/adventure/key/Namespaced.java | 4 +- .../adventure/nbt/AbstractBinaryTag.java | 4 +- .../kyori/adventure/nbt/ArrayBinaryTag.java | 4 +- .../net/kyori/adventure/nbt/BinaryTag.java | 6 +- .../net/kyori/adventure/nbt/BinaryTagIO.java | 86 +++--- .../kyori/adventure/nbt/BinaryTagLike.java | 4 +- .../adventure/nbt/BinaryTagReaderImpl.java | 14 +- .../kyori/adventure/nbt/BinaryTagType.java | 22 +- .../adventure/nbt/BinaryTagWriterImpl.java | 14 +- .../adventure/nbt/ByteArrayBinaryTag.java | 8 +- .../adventure/nbt/ByteArrayBinaryTagImpl.java | 8 +- .../kyori/adventure/nbt/ByteBinaryTag.java | 10 +- .../adventure/nbt/CompoundBinaryTag.java | 72 ++--- .../adventure/nbt/CompoundBinaryTagImpl.java | 54 ++-- .../adventure/nbt/CompoundTagBuilder.java | 17 +- .../adventure/nbt/CompoundTagSetter.java | 36 +-- .../kyori/adventure/nbt/DoubleBinaryTag.java | 10 +- .../net/kyori/adventure/nbt/EndBinaryTag.java | 6 +- .../kyori/adventure/nbt/FloatBinaryTag.java | 10 +- .../adventure/nbt/IntArrayBinaryTag.java | 16 +- .../adventure/nbt/IntArrayBinaryTagImpl.java | 16 +- .../net/kyori/adventure/nbt/IntBinaryTag.java | 10 +- .../kyori/adventure/nbt/ListBinaryTag.java | 84 +++--- .../adventure/nbt/ListBinaryTagImpl.java | 22 +- .../kyori/adventure/nbt/ListTagBuilder.java | 12 +- .../kyori/adventure/nbt/ListTagSetter.java | 6 +- .../adventure/nbt/LongArrayBinaryTag.java | 16 +- .../adventure/nbt/LongArrayBinaryTagImpl.java | 16 +- .../kyori/adventure/nbt/LongBinaryTag.java | 10 +- .../kyori/adventure/nbt/NumberBinaryTag.java | 4 +- .../kyori/adventure/nbt/ShortBinaryTag.java | 10 +- .../kyori/adventure/nbt/StringBinaryTag.java | 14 +- .../net/kyori/adventure/nbt/TagStringIO.java | 18 +- .../adventure/nbt/TrackingDataInput.java | 10 +- .../configurate3/BlockNBTPosSerializer.java | 6 +- .../configurate3/BookTypeSerializer.java | 8 +- .../configurate3/ComponentTypeSerializer.java | 10 +- .../ConfigurateComponentSerializer.java | 14 +- .../ConfigurateComponentSerializerImpl.java | 18 +- .../configurate3/DurationSerializer.java | 6 +- .../HoverEventShowEntitySerializer.java | 8 +- .../HoverEventShowItemSerializer.java | 8 +- .../configurate3/IndexSerializer.java | 8 +- .../configurate3/KeySerializer.java | 6 +- .../configurate3/SoundSerializer.java | 8 +- .../configurate3/SoundStopSerializer.java | 8 +- .../configurate3/StyleSerializer.java | 10 +- .../configurate3/TextColorSerializer.java | 6 +- .../configurate3/TitleSerializer.java | 8 +- .../configurate4/BlockNBTPosSerializer.java | 6 +- .../configurate4/BookTypeSerializer.java | 8 +- .../configurate4/ComponentTypeSerializer.java | 10 +- .../ConfigurateComponentSerializer.java | 14 +- .../ConfigurateComponentSerializerImpl.java | 20 +- .../configurate4/DurationSerializer.java | 6 +- .../HoverEventShowEntitySerializer.java | 8 +- .../HoverEventShowItemSerializer.java | 8 +- .../configurate4/IndexSerializer.java | 8 +- .../configurate4/KeySerializer.java | 6 +- .../configurate4/SoundSerializer.java | 8 +- .../configurate4/SoundStopSerializer.java | 8 +- .../configurate4/StyleSerializer.java | 10 +- .../configurate4/TextColorSerializer.java | 6 +- .../configurate4/TitleSerializer.java | 8 +- .../NBTLegacyHoverEventSerializer.java | 4 +- .../NBTLegacyHoverEventSerializerImpl.java | 12 +- .../gson/ComponentSerializerImpl.java | 2 +- .../gson/GsonComponentSerializer.java | 30 +- .../gson/GsonComponentSerializerImpl.java | 26 +- .../gson/LegacyHoverEventSerializer.java | 10 +- .../serializer/gson/ShowEntitySerializer.java | 2 +- .../serializer/gson/ShowItemSerializer.java | 2 +- .../text/serializer/gson/StyleSerializer.java | 2 +- .../serializer/gson/TextColorSerializer.java | 6 +- .../serializer/gson/TextColorWrapper.java | 2 +- .../legacy/LegacyComponentSerializer.java | 42 +-- .../legacy/LegacyComponentSerializerImpl.java | 46 +-- .../text/serializer/legacy/LegacyFormat.java | 6 +- .../plain/PlainComponentSerializer.java | 20 +- .../plain/PlainComponentSerializerImpl.java | 8 +- .../plain/PlainTextComponentSerializer.java | 18 +- .../PlainTextComponentSerializerImpl.java | 10 +- 191 files changed, 1772 insertions(+), 1766 deletions(-) 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 98514748f..9d78c0e95 100644 --- a/api/src/main/java/net/kyori/adventure/audience/Audience.java +++ b/api/src/main/java/net/kyori/adventure/audience/Audience.java @@ -35,7 +35,7 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.title.Title; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * A receiver of Minecraft media. @@ -85,7 +85,7 @@ public interface Audience extends Pointered { * @return a do-nothing audience * @since 4.0.0 */ - static @NonNull Audience empty() { + static @NotNull Audience empty() { return EmptyAudience.INSTANCE; } @@ -97,7 +97,7 @@ public interface Audience extends Pointered { * @see ForwardingAudience * @since 4.0.0 */ - static @NonNull Audience audience(final @NonNull Audience@NonNull... audiences) { + static @NotNull Audience audience(final @NotNull Audience@NotNull... audiences) { final int length = audiences.length; if (length == 0) { return empty(); @@ -118,7 +118,7 @@ public interface Audience extends Pointered { * @see ForwardingAudience * @since 4.0.0 */ - static @NonNull ForwardingAudience audience(final @NonNull Iterable audiences) { + static @NotNull ForwardingAudience audience(final @NotNull Iterable audiences) { return () -> audiences; } @@ -130,7 +130,7 @@ public interface Audience extends Pointered { * @return a collector to create a forwarding audience * @since 4.0.0 */ - static @NonNull Collector toAudience() { + static @NotNull Collector toAudience() { return Audiences.COLLECTOR; } @@ -144,7 +144,7 @@ public interface Audience extends Pointered { * @since 4.1.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull ComponentLike message) { + default void sendMessage(final @NotNull ComponentLike message) { this.sendMessage(Identity.nil(), message); } @@ -157,7 +157,7 @@ default void sendMessage(final @NonNull ComponentLike message) { * @since 4.0.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull Identified source, final @NonNull ComponentLike message) { + default void sendMessage(final @NotNull Identified source, final @NotNull ComponentLike message) { this.sendMessage(source, message.asComponent()); } @@ -170,7 +170,7 @@ default void sendMessage(final @NonNull Identified source, final @NonNull Compon * @since 4.0.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull Identity source, final @NonNull ComponentLike message) { + default void sendMessage(final @NotNull Identity source, final @NotNull ComponentLike message) { this.sendMessage(source, message.asComponent()); } @@ -184,7 +184,7 @@ default void sendMessage(final @NonNull Identity source, final @NonNull Componen * @since 4.1.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull Component message) { + default void sendMessage(final @NotNull Component message) { this.sendMessage(Identity.nil(), message); } @@ -197,7 +197,7 @@ default void sendMessage(final @NonNull Component message) { * @since 4.0.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull Identified source, final @NonNull Component message) { + default void sendMessage(final @NotNull Identified source, final @NotNull Component message) { this.sendMessage(source, message, MessageType.SYSTEM); } @@ -210,7 +210,7 @@ default void sendMessage(final @NonNull Identified source, final @NonNull Compon * @since 4.0.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull Identity source, final @NonNull Component message) { + default void sendMessage(final @NotNull Identity source, final @NotNull Component message) { this.sendMessage(source, message, MessageType.SYSTEM); } @@ -225,7 +225,7 @@ default void sendMessage(final @NonNull Identity source, final @NonNull Componen * @since 4.1.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull ComponentLike message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull ComponentLike message, final @NotNull MessageType type) { this.sendMessage(Identity.nil(), message, type); } @@ -239,7 +239,7 @@ default void sendMessage(final @NonNull ComponentLike message, final @NonNull Me * @since 4.0.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull Identified source, final @NonNull ComponentLike message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Identified source, final @NotNull ComponentLike message, final @NotNull MessageType type) { this.sendMessage(source, message.asComponent(), type); } @@ -253,7 +253,7 @@ default void sendMessage(final @NonNull Identified source, final @NonNull Compon * @since 4.0.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull Identity source, final @NonNull ComponentLike message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Identity source, final @NotNull ComponentLike message, final @NotNull MessageType type) { this.sendMessage(source, message.asComponent(), type); } @@ -268,7 +268,7 @@ default void sendMessage(final @NonNull Identity source, final @NonNull Componen * @since 4.1.0 */ @ForwardingAudienceOverrideNotRequired - default void sendMessage(final @NonNull Component message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Component message, final @NotNull MessageType type) { this.sendMessage(Identity.nil(), message, type); } @@ -281,7 +281,7 @@ default void sendMessage(final @NonNull Component message, final @NonNull Messag * @see Component * @since 4.0.0 */ - default void sendMessage(final @NonNull Identified source, final @NonNull Component message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { this.sendMessage(source.identity(), message, type); } @@ -294,7 +294,7 @@ default void sendMessage(final @NonNull Identified source, final @NonNull Compon * @see Component * @since 4.0.0 */ - default void sendMessage(final @NonNull Identity source, final @NonNull Component message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) { } /** @@ -305,7 +305,7 @@ default void sendMessage(final @NonNull Identity source, final @NonNull Componen * @since 4.0.0 */ @ForwardingAudienceOverrideNotRequired - default void sendActionBar(final @NonNull ComponentLike message) { + default void sendActionBar(final @NotNull ComponentLike message) { this.sendActionBar(message.asComponent()); } @@ -316,7 +316,7 @@ default void sendActionBar(final @NonNull ComponentLike message) { * @see Component * @since 4.0.0 */ - default void sendActionBar(final @NonNull Component message) { + default void sendActionBar(final @NotNull Component message) { } /** @@ -329,7 +329,7 @@ default void sendActionBar(final @NonNull Component message) { * @since 4.3.0 */ @ForwardingAudienceOverrideNotRequired - default void sendPlayerListHeader(final @NonNull ComponentLike header) { + default void sendPlayerListHeader(final @NotNull ComponentLike header) { this.sendPlayerListHeader(header.asComponent()); } @@ -342,7 +342,7 @@ default void sendPlayerListHeader(final @NonNull ComponentLike header) { * @param header the header * @since 4.3.0 */ - default void sendPlayerListHeader(final @NonNull Component header) { + default void sendPlayerListHeader(final @NotNull Component header) { this.sendPlayerListHeaderAndFooter(header, Component.empty()); } @@ -356,7 +356,7 @@ default void sendPlayerListHeader(final @NonNull Component header) { * @since 4.3.0 */ @ForwardingAudienceOverrideNotRequired - default void sendPlayerListFooter(final @NonNull ComponentLike footer) { + default void sendPlayerListFooter(final @NotNull ComponentLike footer) { this.sendPlayerListFooter(footer.asComponent()); } @@ -369,7 +369,7 @@ default void sendPlayerListFooter(final @NonNull ComponentLike footer) { * @param footer the footer * @since 4.3.0 */ - default void sendPlayerListFooter(final @NonNull Component footer) { + default void sendPlayerListFooter(final @NotNull Component footer) { this.sendPlayerListHeaderAndFooter(Component.empty(), footer); } @@ -381,7 +381,7 @@ default void sendPlayerListFooter(final @NonNull Component footer) { * @since 4.3.0 */ @ForwardingAudienceOverrideNotRequired - default void sendPlayerListHeaderAndFooter(final @NonNull ComponentLike header, final @NonNull ComponentLike footer) { + default void sendPlayerListHeaderAndFooter(final @NotNull ComponentLike header, final @NotNull ComponentLike footer) { this.sendPlayerListHeaderAndFooter(header.asComponent(), footer.asComponent()); } @@ -392,7 +392,7 @@ default void sendPlayerListHeaderAndFooter(final @NonNull ComponentLike header, * @param footer the footer * @since 4.3.0 */ - default void sendPlayerListHeaderAndFooter(final @NonNull Component header, final @NonNull Component footer) { + default void sendPlayerListHeaderAndFooter(final @NotNull Component header, final @NotNull Component footer) { } /** @@ -402,7 +402,7 @@ default void sendPlayerListHeaderAndFooter(final @NonNull Component header, fina * @see Title * @since 4.0.0 */ - default void showTitle(final @NonNull Title title) { + default void showTitle(final @NotNull Title title) { } /** @@ -430,7 +430,7 @@ default void resetTitle() { * @see BossBar * @since 4.0.0 */ - default void showBossBar(final @NonNull BossBar bar) { + default void showBossBar(final @NotNull BossBar bar) { } /** @@ -440,7 +440,7 @@ default void showBossBar(final @NonNull BossBar bar) { * @see BossBar * @since 4.0.0 */ - default void hideBossBar(final @NonNull BossBar bar) { + default void hideBossBar(final @NotNull BossBar bar) { } /** @@ -450,7 +450,7 @@ default void hideBossBar(final @NonNull BossBar bar) { * @see Sound * @since 4.0.0 */ - default void playSound(final @NonNull Sound sound) { + default void playSound(final @NotNull Sound sound) { } /** @@ -463,7 +463,7 @@ default void playSound(final @NonNull Sound sound) { * @see Sound * @since 4.0.0 */ - default void playSound(final @NonNull Sound sound, final double x, final double y, final double z) { + default void playSound(final @NotNull Sound sound, final double x, final double y, final double z) { } /** @@ -473,7 +473,7 @@ default void playSound(final @NonNull Sound sound, final double x, final double * @see SoundStop * @since 4.0.0 */ - default void stopSound(final @NonNull SoundStop stop) { + default void stopSound(final @NotNull SoundStop stop) { } /** @@ -486,7 +486,7 @@ default void stopSound(final @NonNull SoundStop stop) { * @since 4.0.0 */ @ForwardingAudienceOverrideNotRequired - default void openBook(final Book.@NonNull Builder book) { + default void openBook(final Book.@NotNull Builder book) { this.openBook(book.build()); } @@ -499,6 +499,6 @@ default void openBook(final Book.@NonNull Builder book) { * @see Book * @since 4.0.0 */ - default void openBook(final @NonNull Book book) { + default void openBook(final @NotNull Book book) { } } 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 26c7df072..73c00afbf 100644 --- a/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java +++ b/api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java @@ -30,69 +30,72 @@ import net.kyori.adventure.inventory.Book; import net.kyori.adventure.pointer.Pointer; import net.kyori.adventure.text.ComponentLike; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.PolyNull; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.UnknownNullability; final class EmptyAudience implements Audience { static final EmptyAudience INSTANCE = new EmptyAudience(); @Override - public @NonNull Optional get(final @NonNull Pointer pointer) { + public @NotNull Optional get(final @NotNull Pointer pointer) { return Optional.empty(); } + @Contract("_, null -> null; _, !null -> !null") @Override - public @PolyNull T getOrDefault(final @NonNull Pointer pointer, final @PolyNull T defaultValue) { + public @Nullable T getOrDefault(final @NotNull Pointer pointer, final @Nullable T defaultValue) { return defaultValue; } @Override - public @PolyNull T getOrDefaultFrom(final @NonNull Pointer pointer, final @NonNull Supplier defaultValue) { + public @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer pointer, final @NotNull Supplier defaultValue) { return defaultValue.get(); } @Override - public void sendMessage(final @NonNull ComponentLike message) { + public void sendMessage(final @NotNull ComponentLike message) { } @Override - public void sendMessage(final @NonNull Identified source, final @NonNull ComponentLike message) { + public void sendMessage(final @NotNull Identified source, final @NotNull ComponentLike message) { } @Override - public void sendMessage(final @NonNull Identity source, final @NonNull ComponentLike message) { + public void sendMessage(final @NotNull Identity source, final @NotNull ComponentLike message) { } @Override - public void sendMessage(final @NonNull ComponentLike message, final @NonNull MessageType type) { + public void sendMessage(final @NotNull ComponentLike message, final @NotNull MessageType type) { } @Override - public void sendMessage(final @NonNull Identified source, final @NonNull ComponentLike message, final @NonNull MessageType type) { + public void sendMessage(final @NotNull Identified source, final @NotNull ComponentLike message, final @NotNull MessageType type) { } @Override - public void sendMessage(final @NonNull Identity source, final @NonNull ComponentLike message, final @NonNull MessageType type) { + public void sendMessage(final @NotNull Identity source, final @NotNull ComponentLike message, final @NotNull MessageType type) { } @Override - public void sendActionBar(final @NonNull ComponentLike message) { + public void sendActionBar(final @NotNull ComponentLike message) { } @Override - public void sendPlayerListHeader(final @NonNull ComponentLike header) { + public void sendPlayerListHeader(final @NotNull ComponentLike header) { } @Override - public void sendPlayerListFooter(final @NonNull ComponentLike footer) { + public void sendPlayerListFooter(final @NotNull ComponentLike footer) { } @Override - public void sendPlayerListHeaderAndFooter(final @NonNull ComponentLike header, final @NonNull ComponentLike footer) { + public void sendPlayerListHeaderAndFooter(final @NotNull ComponentLike header, final @NotNull ComponentLike footer) { } @Override - public void openBook(final Book.@NonNull Builder book) { + public void openBook(final Book.@NotNull 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 ff7d6c50a..3eb4f76cb 100644 --- a/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java +++ b/api/src/main/java/net/kyori/adventure/audience/ForwardingAudience.java @@ -35,9 +35,11 @@ import net.kyori.adventure.sound.SoundStop; import net.kyori.adventure.text.Component; import net.kyori.adventure.title.Title; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.PolyNull; 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; /** * A receiver that wraps one or more receivers. @@ -57,55 +59,56 @@ public interface ForwardingAudience extends Audience { * @since 4.0.0 */ @ApiStatus.OverrideOnly - @NonNull Iterable audiences(); + @NotNull Iterable audiences(); @Override - default @NonNull Optional get(final @NonNull Pointer pointer) { + default @NotNull Optional get(final @NotNull Pointer pointer) { return Optional.empty(); // unsupported } + @Contract("_, null -> null; _, !null -> !null") @Override - default @PolyNull T getOrDefault(final @NonNull Pointer pointer, final @PolyNull T defaultValue) { + default @Nullable T getOrDefault(final @NotNull Pointer pointer, final @Nullable T defaultValue) { return defaultValue; // unsupported } @Override - default @PolyNull T getOrDefaultFrom(final @NonNull Pointer pointer, final @NonNull Supplier defaultValue) { + default @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer pointer, final @NotNull Supplier defaultValue) { return defaultValue.get(); // unsupported } @Override - default void sendMessage(final @NonNull Identified source, final @NonNull Component message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { for (final Audience audience : this.audiences()) audience.sendMessage(source, message, type); } @Override - default void sendMessage(final @NonNull Identity source, final @NonNull Component message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) { for (final Audience audience : this.audiences()) audience.sendMessage(source, message, type); } @Override - default void sendActionBar(final @NonNull Component message) { + default void sendActionBar(final @NotNull Component message) { for (final Audience audience : this.audiences()) audience.sendActionBar(message); } @Override - default void sendPlayerListHeader(final @NonNull Component header) { + default void sendPlayerListHeader(final @NotNull Component header) { for (final Audience audience : this.audiences()) audience.sendPlayerListHeader(header); } @Override - default void sendPlayerListFooter(final @NonNull Component footer) { + default void sendPlayerListFooter(final @NotNull Component footer) { for (final Audience audience : this.audiences()) audience.sendPlayerListFooter(footer); } @Override - default void sendPlayerListHeaderAndFooter(final @NonNull Component header, final @NonNull Component footer) { + default void sendPlayerListHeaderAndFooter(final @NotNull Component header, final @NotNull Component footer) { for (final Audience audience : this.audiences()) audience.sendPlayerListHeaderAndFooter(header, footer); } @Override - default void showTitle(final @NonNull Title title) { + default void showTitle(final @NotNull Title title) { for (final Audience audience : this.audiences()) audience.showTitle(title); } @@ -120,32 +123,32 @@ default void resetTitle() { } @Override - default void showBossBar(final @NonNull BossBar bar) { + default void showBossBar(final @NotNull BossBar bar) { for (final Audience audience : this.audiences()) audience.showBossBar(bar); } @Override - default void hideBossBar(final @NonNull BossBar bar) { + default void hideBossBar(final @NotNull BossBar bar) { for (final Audience audience : this.audiences()) audience.hideBossBar(bar); } @Override - default void playSound(final @NonNull Sound sound) { + default void playSound(final @NotNull Sound sound) { for (final Audience audience : this.audiences()) audience.playSound(sound); } @Override - default void playSound(final @NonNull Sound sound, final double x, final double y, final double z) { + default void playSound(final @NotNull 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 stopSound(final @NonNull SoundStop stop) { + default void stopSound(final @NotNull SoundStop stop) { for (final Audience audience : this.audiences()) audience.stopSound(stop); } @Override - default void openBook(final @NonNull Book book) { + default void openBook(final @NotNull Book book) { for (final Audience audience : this.audiences()) audience.openBook(book); } @@ -162,7 +165,7 @@ interface Single extends ForwardingAudience { * @since 4.0.0 */ @ApiStatus.OverrideOnly - @NonNull Audience audience(); + @NotNull Audience audience(); /** * {@inheritDoc} @@ -172,57 +175,58 @@ interface Single extends ForwardingAudience { */ @Deprecated(/* forRemoval = false */) @Override - default @NonNull Iterable audiences() { + default @NotNull Iterable audiences() { return Collections.singleton(this.audience()); } @Override - default @NonNull Optional get(final @NonNull Pointer pointer) { + default @NotNull Optional get(final @NotNull Pointer pointer) { return this.audience().get(pointer); } + @Contract("_, null -> null; _, !null -> !null") @Override - default @PolyNull T getOrDefault(final @NonNull Pointer pointer, final @PolyNull T defaultValue) { + default @Nullable T getOrDefault(final @NotNull Pointer pointer, final @Nullable T defaultValue) { return this.audience().getOrDefault(pointer, defaultValue); } @Override - default @PolyNull T getOrDefaultFrom(final @NonNull Pointer pointer, final @NonNull Supplier defaultValue) { + default @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer pointer, final @NotNull Supplier defaultValue) { return this.audience().getOrDefaultFrom(pointer, defaultValue); } @Override - default void sendMessage(final @NonNull Identified source, final @NonNull Component message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) { this.audience().sendMessage(source, message, type); } @Override - default void sendMessage(final @NonNull Identity source, final @NonNull Component message, final @NonNull MessageType type) { + default void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) { this.audience().sendMessage(source, message, type); } @Override - default void sendActionBar(final @NonNull Component message) { + default void sendActionBar(final @NotNull Component message) { this.audience().sendActionBar(message); } @Override - default void sendPlayerListHeader(final @NonNull Component header) { + default void sendPlayerListHeader(final @NotNull Component header) { this.audience().sendPlayerListHeader(header); } @Override - default void sendPlayerListFooter(final @NonNull Component footer) { + default void sendPlayerListFooter(final @NotNull Component footer) { this.audience().sendPlayerListFooter(footer); } @Override - default void sendPlayerListHeaderAndFooter(final @NonNull Component header, final @NonNull Component footer) { + default void sendPlayerListHeaderAndFooter(final @NotNull Component header, final @NotNull Component footer) { this.audience().sendPlayerListHeaderAndFooter(header, footer); } @Override - default void showTitle(final @NonNull Title title) { + default void showTitle(final @NotNull Title title) { this.audience().showTitle(title); } @@ -237,32 +241,32 @@ default void resetTitle() { } @Override - default void showBossBar(final @NonNull BossBar bar) { + default void showBossBar(final @NotNull BossBar bar) { this.audience().showBossBar(bar); } @Override - default void hideBossBar(final @NonNull BossBar bar) { + default void hideBossBar(final @NotNull BossBar bar) { this.audience().hideBossBar(bar); } @Override - default void playSound(final @NonNull Sound sound) { + default void playSound(final @NotNull Sound sound) { this.audience().playSound(sound); } @Override - default void playSound(final @NonNull Sound sound, final double x, final double y, final double z) { + default void playSound(final @NotNull Sound sound, final double x, final double y, final double z) { this.audience().playSound(sound, x, y, z); } @Override - default void stopSound(final @NonNull SoundStop stop) { + default void stopSound(final @NotNull SoundStop stop) { this.audience().stopSound(stop); } @Override - default void openBook(final @NonNull Book book) { + default void openBook(final @NotNull 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 4e4baf2c4..3629137d3 100644 --- a/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java +++ b/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java @@ -28,9 +28,9 @@ import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.util.Index; import net.kyori.examination.Examinable; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.UnmodifiableView; /** @@ -95,7 +95,7 @@ public interface BossBar extends Examinable { * @throws IllegalArgumentException if progress is less than 0 or greater than 1 * @since 4.3.0 */ - static @NonNull BossBar bossBar(final @NonNull ComponentLike name, final float progress, final @NonNull Color color, final @NonNull Overlay overlay) { + static @NotNull BossBar bossBar(final @NotNull ComponentLike name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay) { BossBarImpl.checkProgress(progress); return bossBar(name.asComponent(), progress, color, overlay); } @@ -111,7 +111,7 @@ public interface BossBar extends Examinable { * @throws IllegalArgumentException if progress is less than 0 or greater than 1 * @since 4.0.0 */ - static @NonNull BossBar bossBar(final @NonNull Component name, final float progress, final @NonNull Color color, final @NonNull Overlay overlay) { + static @NotNull BossBar bossBar(final @NotNull Component name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay) { BossBarImpl.checkProgress(progress); return new BossBarImpl(name, progress, color, overlay); } @@ -128,7 +128,7 @@ public interface BossBar extends Examinable { * @throws IllegalArgumentException if progress is less than 0 or greater than 1 * @since 4.3.0 */ - static @NonNull BossBar bossBar(final @NonNull ComponentLike name, final float progress, final @NonNull Color color, final @NonNull Overlay overlay, final @NonNull Set flags) { + static @NotNull BossBar bossBar(final @NotNull ComponentLike name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay, final @NotNull Set flags) { BossBarImpl.checkProgress(progress); return bossBar(name.asComponent(), progress, color, overlay, flags); } @@ -145,7 +145,7 @@ public interface BossBar extends Examinable { * @throws IllegalArgumentException if progress is less than 0 or greater than 1 * @since 4.0.0 */ - static @NonNull BossBar bossBar(final @NonNull Component name, final float progress, final @NonNull Color color, final @NonNull Overlay overlay, final @NonNull Set flags) { + static @NotNull BossBar bossBar(final @NotNull Component name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay, final @NotNull Set flags) { BossBarImpl.checkProgress(progress); return new BossBarImpl(name, progress, color, overlay, flags); } @@ -156,7 +156,7 @@ public interface BossBar extends Examinable { * @return the name * @since 4.0.0 */ - @NonNull Component name(); + @NotNull Component name(); /** * Sets the name. @@ -166,7 +166,7 @@ public interface BossBar extends Examinable { * @since 4.3.0 */ @Contract("_ -> this") - default @NonNull BossBar name(final @NonNull ComponentLike name) { + default @NotNull BossBar name(final @NotNull ComponentLike name) { return this.name(name.asComponent()); } @@ -178,7 +178,7 @@ public interface BossBar extends Examinable { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar name(final @NonNull Component name); + @NotNull BossBar name(final @NotNull Component name); /** * Gets the progress. @@ -201,7 +201,7 @@ public interface BossBar extends Examinable { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar progress(final float progress); + @NotNull BossBar progress(final float progress); /** * Gets the progress. @@ -232,7 +232,7 @@ default float percent() { @ApiStatus.ScheduledForRemoval @Contract("_ -> this") @Deprecated - default @NonNull BossBar percent(final float progress) { + default @NotNull BossBar percent(final float progress) { return this.progress(progress); } @@ -242,7 +242,7 @@ default float percent() { * @return the color * @since 4.0.0 */ - @NonNull Color color(); + @NotNull Color color(); /** * Sets the color. @@ -252,7 +252,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar color(final @NonNull Color color); + @NotNull BossBar color(final @NotNull Color color); /** * Gets the overlay. @@ -260,7 +260,7 @@ default float percent() { * @return the overlay * @since 4.0.0 */ - @NonNull Overlay overlay(); + @NotNull Overlay overlay(); /** * Sets the overlay. @@ -270,7 +270,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar overlay(final @NonNull Overlay overlay); + @NotNull BossBar overlay(final @NotNull Overlay overlay); /** * Gets the flags. @@ -278,7 +278,7 @@ default float percent() { * @return the flags * @since 4.0.0 */ - @UnmodifiableView @NonNull Set flags(); + @UnmodifiableView @NotNull Set flags(); /** * Sets the flags. @@ -288,7 +288,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar flags(final @NonNull Set flags); + @NotNull BossBar flags(final @NotNull Set flags); /** * Checks if this bossbar has a flag. @@ -297,7 +297,7 @@ default float percent() { * @return {@code true} if this bossbar has the flag, {@code false} otherwise * @since 4.0.0 */ - boolean hasFlag(final @NonNull Flag flag); + boolean hasFlag(final @NotNull Flag flag); /** * Adds a flag to this bossbar. @@ -307,7 +307,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar addFlag(final @NonNull Flag flag); + @NotNull BossBar addFlag(final @NotNull Flag flag); /** * Removes a flag from this bossbar. @@ -317,7 +317,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar removeFlag(final @NonNull Flag flag); + @NotNull BossBar removeFlag(final @NotNull Flag flag); /** * Adds flags to this bossbar. @@ -327,7 +327,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar addFlags(final @NonNull Flag@NonNull... flags); + @NotNull BossBar addFlags(final @NotNull Flag@NotNull... flags); /** * Removes flags from this bossbar. @@ -337,7 +337,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar removeFlags(final @NonNull Flag@NonNull... flags); + @NotNull BossBar removeFlags(final @NotNull Flag@NotNull... flags); /** * Adds flags to this bossbar. @@ -347,7 +347,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar addFlags(final @NonNull Iterable flags); + @NotNull BossBar addFlags(final @NotNull Iterable flags); /** * Removes flags from this bossbar. @@ -357,7 +357,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar removeFlags(final @NonNull Iterable flags); + @NotNull BossBar removeFlags(final @NotNull Iterable flags); /** * Adds a listener. @@ -367,7 +367,7 @@ default float percent() { * @since 4.0.0 */ @Contract(value = "_ -> this") - @NonNull BossBar addListener(final @NonNull Listener listener); + @NotNull BossBar addListener(final @NotNull Listener listener); /** * Removes a listener. @@ -377,7 +377,7 @@ default float percent() { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull BossBar removeListener(final @NonNull Listener listener); + @NotNull BossBar removeListener(final @NotNull Listener listener); /** * A listener for changes that happen on a {@link BossBar}. @@ -394,7 +394,7 @@ interface Listener { * @param newName the new name * @since 4.0.0 */ - default void bossBarNameChanged(final @NonNull BossBar bar, final @NonNull Component oldName, final @NonNull Component newName) { + default void bossBarNameChanged(final @NotNull BossBar bar, final @NotNull Component oldName, final @NotNull Component newName) { } /** @@ -405,7 +405,7 @@ default void bossBarNameChanged(final @NonNull BossBar bar, final @NonNull Compo * @param newProgress the new progress * @since 4.0.0 */ - default void bossBarProgressChanged(final @NonNull BossBar bar, final float oldProgress, final float newProgress) { + default void bossBarProgressChanged(final @NotNull BossBar bar, final float oldProgress, final float newProgress) { this.bossBarPercentChanged(bar, oldProgress, newProgress); } @@ -421,7 +421,7 @@ default void bossBarProgressChanged(final @NonNull BossBar bar, final float oldP @ApiStatus.ScheduledForRemoval @Deprecated @SuppressWarnings("DeprecatedIsStillUsed") - default void bossBarPercentChanged(final @NonNull BossBar bar, final float oldProgress, final float newProgress) { + default void bossBarPercentChanged(final @NotNull BossBar bar, final float oldProgress, final float newProgress) { } /** @@ -432,7 +432,7 @@ default void bossBarPercentChanged(final @NonNull BossBar bar, final float oldPr * @param newColor the new color * @since 4.0.0 */ - default void bossBarColorChanged(final @NonNull BossBar bar, final @NonNull Color oldColor, final @NonNull Color newColor) { + default void bossBarColorChanged(final @NotNull BossBar bar, final @NotNull Color oldColor, final @NotNull Color newColor) { } /** @@ -443,7 +443,7 @@ default void bossBarColorChanged(final @NonNull BossBar bar, final @NonNull Colo * @param newOverlay the new overlay * @since 4.0.0 */ - default void bossBarOverlayChanged(final @NonNull BossBar bar, final @NonNull Overlay oldOverlay, final @NonNull Overlay newOverlay) { + default void bossBarOverlayChanged(final @NotNull BossBar bar, final @NotNull Overlay oldOverlay, final @NotNull Overlay newOverlay) { } /** @@ -454,7 +454,7 @@ default void bossBarOverlayChanged(final @NonNull BossBar bar, final @NonNull Ov * @param flagsRemoved the flags removed from the bossbar * @since 4.0.0 */ - default void bossBarFlagsChanged(final @NonNull BossBar bar, final @NonNull Set flagsAdded, final @NonNull Set flagsRemoved) { + default void bossBarFlagsChanged(final @NotNull BossBar bar, final @NotNull Set flagsAdded, final @NotNull Set 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 69db4ab97..2d7aad8f9 100644 --- a/api/src/main/java/net/kyori/adventure/bossbar/BossBarImpl.java +++ b/api/src/main/java/net/kyori/adventure/bossbar/BossBarImpl.java @@ -36,7 +36,7 @@ import net.kyori.adventure.text.Component; import net.kyori.examination.ExaminableProperty; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; import static java.util.Objects.requireNonNull; @@ -50,25 +50,25 @@ final class BossBarImpl extends HackyBossBarPlatformBridge implements BossBar { private Overlay overlay; private final Set flags = EnumSet.noneOf(Flag.class); - BossBarImpl(final @NonNull Component name, final float progress, final @NonNull Color color, final @NonNull Overlay overlay) { + BossBarImpl(final @NotNull Component name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay) { this.name = requireNonNull(name, "name"); this.progress = progress; this.color = requireNonNull(color, "color"); this.overlay = requireNonNull(overlay, "overlay"); } - BossBarImpl(final @NonNull Component name, final float progress, final @NonNull Color color, final @NonNull Overlay overlay, final @NonNull Set flags) { + BossBarImpl(final @NotNull Component name, final float progress, final @NotNull Color color, final @NotNull Overlay overlay, final @NotNull Set flags) { this(name, progress, color, overlay); this.flags.addAll(flags); } @Override - public @NonNull Component name() { + public @NotNull Component name() { return this.name; } @Override - public @NonNull BossBar name(final @NonNull Component newName) { + public @NotNull BossBar name(final @NotNull Component newName) { requireNonNull(newName, "name"); final Component oldName = this.name; if (!Objects.equals(newName, oldName)) { @@ -84,7 +84,7 @@ public float progress() { } @Override - public @NonNull BossBar progress(final float newProgress) { + public @NotNull BossBar progress(final float newProgress) { checkProgress(newProgress); final float oldProgress = this.progress; if (newProgress != oldProgress) { @@ -101,12 +101,12 @@ static void checkProgress(final float progress) { } @Override - public @NonNull Color color() { + public @NotNull Color color() { return this.color; } @Override - public @NonNull BossBar color(final @NonNull Color newColor) { + public @NotNull BossBar color(final @NotNull Color newColor) { requireNonNull(newColor, "color"); final Color oldColor = this.color; if (newColor != oldColor) { @@ -117,12 +117,12 @@ static void checkProgress(final float progress) { } @Override - public @NonNull Overlay overlay() { + public @NotNull Overlay overlay() { return this.overlay; } @Override - public @NonNull BossBar overlay(final @NonNull Overlay newOverlay) { + public @NotNull BossBar overlay(final @NotNull Overlay newOverlay) { requireNonNull(newOverlay, "overlay"); final Overlay oldOverlay = this.overlay; if (newOverlay != oldOverlay) { @@ -133,12 +133,12 @@ static void checkProgress(final float progress) { } @Override - public @NonNull Set flags() { + public @NotNull Set flags() { return Collections.unmodifiableSet(this.flags); } @Override - public @NonNull BossBar flags(final @NonNull Set newFlags) { + public @NotNull BossBar flags(final @NotNull Set newFlags) { if (newFlags.isEmpty()) { final Set oldFlags = EnumSet.copyOf(this.flags); this.flags.clear(); @@ -157,21 +157,21 @@ static void checkProgress(final float progress) { } @Override - public boolean hasFlag(final @NonNull Flag flag) { + public boolean hasFlag(final @NotNull Flag flag) { return this.flags.contains(flag); } @Override - public @NonNull BossBar addFlag(final @NonNull Flag flag) { + public @NotNull BossBar addFlag(final @NotNull Flag flag) { return this.editFlags(flag, Set::add, FLAGS_ADDED); } @Override - public @NonNull BossBar removeFlag(final @NonNull Flag flag) { + public @NotNull BossBar removeFlag(final @NotNull Flag flag) { return this.editFlags(flag, Set::remove, FLAGS_REMOVED); } - private @NonNull BossBar editFlags(final @NonNull Flag flag, final @NonNull BiPredicate, Flag> predicate, final BiConsumer> onChange) { + private @NotNull BossBar editFlags(final @NotNull Flag flag, final @NotNull BiPredicate, Flag> predicate, final BiConsumer> onChange) { if (predicate.test(this.flags, flag)) { onChange.accept(this, Collections.singleton(flag)); } @@ -179,16 +179,16 @@ public boolean hasFlag(final @NonNull Flag flag) { } @Override - public @NonNull BossBar addFlags(final @NonNull Flag@NonNull... flags) { + public @NotNull BossBar addFlags(final @NotNull Flag@NotNull... flags) { return this.editFlags(flags, Set::add, FLAGS_ADDED); } @Override - public @NonNull BossBar removeFlags(final @NonNull Flag@NonNull... flags) { + public @NotNull BossBar removeFlags(final @NotNull Flag@NotNull... flags) { return this.editFlags(flags, Set::remove, FLAGS_REMOVED); } - private @NonNull BossBar editFlags(final Flag[] flags, final BiPredicate, Flag> predicate, final BiConsumer> onChange) { + private @NotNull BossBar editFlags(final Flag[] flags, final BiPredicate, Flag> predicate, final BiConsumer> onChange) { if (flags.length == 0) return this; Set changes = null; for (int i = 0, length = flags.length; i < length; i++) { @@ -206,16 +206,16 @@ public boolean hasFlag(final @NonNull Flag flag) { } @Override - public @NonNull BossBar addFlags(final @NonNull Iterable flags) { + public @NotNull BossBar addFlags(final @NotNull Iterable flags) { return this.editFlags(flags, Set::add, FLAGS_ADDED); } @Override - public @NonNull BossBar removeFlags(final @NonNull Iterable flags) { + public @NotNull BossBar removeFlags(final @NotNull Iterable flags) { return this.editFlags(flags, Set::remove, FLAGS_REMOVED); } - private @NonNull BossBar editFlags(final Iterable flags, final BiPredicate, Flag> predicate, final BiConsumer> onChange) { + private @NotNull BossBar editFlags(final Iterable flags, final BiPredicate, Flag> predicate, final BiConsumer> onChange) { Set changes = null; for (final Flag flag : flags) { if (predicate.test(this.flags, flag)) { @@ -232,25 +232,25 @@ public boolean hasFlag(final @NonNull Flag flag) { } @Override - public @NonNull BossBar addListener(final @NonNull Listener listener) { + public @NotNull BossBar addListener(final @NotNull Listener listener) { this.listeners.add(listener); return this; } @Override - public @NonNull BossBar removeListener(final @NonNull Listener listener) { + public @NotNull BossBar removeListener(final @NotNull Listener listener) { this.listeners.remove(listener); return this; } - private void forEachListener(final @NonNull Consumer consumer) { + private void forEachListener(final @NotNull Consumer consumer) { for (final Listener listener : this.listeners) { consumer.accept(listener); } } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("name", this.name), ExaminableProperty.of("progress", this.progress), 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 356cf042d..67dc9b84a 100644 --- a/api/src/main/java/net/kyori/adventure/identity/Identified.java +++ b/api/src/main/java/net/kyori/adventure/identity/Identified.java @@ -23,7 +23,7 @@ */ package net.kyori.adventure.identity; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * Something that can be identified by an {@link Identity}. @@ -37,5 +37,5 @@ public interface Identified { * @return the identity * @since 4.0.0 */ - @NonNull Identity identity(); + @NotNull Identity identity(); } diff --git a/api/src/main/java/net/kyori/adventure/identity/Identities.java b/api/src/main/java/net/kyori/adventure/identity/Identities.java index 86e533ce9..c56d159c8 100644 --- a/api/src/main/java/net/kyori/adventure/identity/Identities.java +++ b/api/src/main/java/net/kyori/adventure/identity/Identities.java @@ -24,14 +24,14 @@ package net.kyori.adventure.identity; import java.util.UUID; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; final class Identities { static final Identity NIL = new Identity() { private final UUID uuid = new UUID(0, 0); @Override - public @NonNull UUID uuid() { + public @NotNull UUID uuid() { return this.uuid; } 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 0123766ba..cccd63426 100644 --- a/api/src/main/java/net/kyori/adventure/identity/Identity.java +++ b/api/src/main/java/net/kyori/adventure/identity/Identity.java @@ -31,7 +31,7 @@ import net.kyori.adventure.text.Component; import net.kyori.examination.Examinable; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * An identity used to track the sender of messages for the social interaction features @@ -68,7 +68,7 @@ public interface Identity extends Examinable { * @return the {@code null} identity * @since 4.0.0 */ - static @NonNull Identity nil() { + static @NotNull Identity nil() { return Identities.NIL; } @@ -79,7 +79,7 @@ public interface Identity extends Examinable { * @return an identity * @since 4.0.0 */ - static @NonNull Identity identity(final @NonNull UUID uuid) { + static @NotNull Identity identity(final @NotNull UUID uuid) { if (uuid.equals(Identities.NIL.uuid())) return Identities.NIL; return new IdentityImpl(uuid); } @@ -90,10 +90,10 @@ public interface Identity extends Examinable { * @return the uuid * @since 4.0.0 */ - @NonNull UUID uuid(); + @NotNull UUID uuid(); @Override - default @NonNull Stream examinableProperties() { + default @NotNull Stream 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 24d727f18..5ed8e97b4 100644 --- a/api/src/main/java/net/kyori/adventure/identity/IdentityImpl.java +++ b/api/src/main/java/net/kyori/adventure/identity/IdentityImpl.java @@ -26,8 +26,8 @@ import java.util.UUID; import net.kyori.examination.Examinable; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; final class IdentityImpl implements Examinable, Identity { private final UUID uuid; @@ -37,7 +37,7 @@ final class IdentityImpl implements Examinable, Identity { } @Override - public @NonNull UUID uuid() { + public @NotNull UUID uuid() { return this.uuid; } 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 de8ae0b24..19a5719fb 100644 --- a/api/src/main/java/net/kyori/adventure/inventory/Book.java +++ b/api/src/main/java/net/kyori/adventure/inventory/Book.java @@ -31,9 +31,9 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.util.Buildable; import net.kyori.examination.Examinable; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; /** @@ -57,7 +57,7 @@ public interface Book extends Buildable, Examinable { * @return a book * @since 4.0.0 */ - static @NonNull Book book(final @NonNull Component title, final @NonNull Component author, final @NonNull Collection pages) { + static @NotNull Book book(final @NotNull Component title, final @NotNull Component author, final @NotNull Collection pages) { return new BookImpl(title, author, new ArrayList<>(pages)); } @@ -70,7 +70,7 @@ public interface Book extends Buildable, Examinable { * @return a book * @since 4.0.0 */ - static @NonNull Book book(final @NonNull Component title, final @NonNull Component author, final @NonNull Component@NonNull... pages) { + static @NotNull Book book(final @NotNull Component title, final @NotNull Component author, final @NotNull Component@NotNull... pages) { return book(title, author, Arrays.asList(pages)); } @@ -80,7 +80,7 @@ public interface Book extends Buildable, Examinable { * @return a builder * @since 4.0.0 */ - static @NonNull Builder builder() { + static @NotNull Builder builder() { return new BookImpl.BuilderImpl(); } @@ -90,7 +90,7 @@ public interface Book extends Buildable, Examinable { * @return the title * @since 4.0.0 */ - @NonNull Component title(); + @NotNull Component title(); /** * Changes the book's title. @@ -100,7 +100,7 @@ public interface Book extends Buildable, Examinable { * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - @NonNull Book title(final @NonNull Component title); + @NotNull Book title(final @NotNull Component title); /** * Gets the author. @@ -108,7 +108,7 @@ public interface Book extends Buildable, Examinable { * @return the author * @since 4.0.0 */ - @NonNull Component author(); + @NotNull Component author(); /** * Changes the book's author. @@ -118,7 +118,7 @@ public interface Book extends Buildable, Examinable { * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - @NonNull Book author(final @NonNull Component author); + @NotNull Book author(final @NotNull Component author); /** * Gets the list of pages. @@ -128,7 +128,7 @@ public interface Book extends Buildable, Examinable { * @return the list of pages * @since 4.0.0 */ - @Unmodifiable @NonNull List pages(); + @Unmodifiable @NotNull List pages(); /** * Returns an updated book with the provided pages. @@ -138,7 +138,7 @@ public interface Book extends Buildable, Examinable { * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - default @NonNull Book pages(final @NonNull Component@NonNull... pages) { + default @NotNull Book pages(final @NotNull Component@NotNull... pages) { return this.pages(Arrays.asList(pages)); } @@ -150,7 +150,7 @@ public interface Book extends Buildable, Examinable { * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - @NonNull Book pages(final @NonNull List pages); + @NotNull Book pages(final @NotNull List pages); /** * Create a new builder initialized with the attributes of this book. @@ -158,7 +158,7 @@ public interface Book extends Buildable, Examinable { * @return the builder */ @Override - default @NonNull Builder toBuilder() { + default @NotNull Builder toBuilder() { return builder() .title(this.title()) .author(this.author()) @@ -179,7 +179,7 @@ interface Builder extends Buildable.Builder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder title(final @NonNull Component title); + @NotNull Builder title(final @NotNull Component title); /** * Set the author. @@ -189,7 +189,7 @@ interface Builder extends Buildable.Builder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder author(final @NonNull Component author); + @NotNull Builder author(final @NotNull Component author); /** * Add a page to the book. @@ -202,7 +202,7 @@ interface Builder extends Buildable.Builder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder addPage(final @NonNull Component page); + @NotNull Builder addPage(final @NotNull Component page); /** * Add pages to the book. @@ -213,7 +213,7 @@ interface Builder extends Buildable.Builder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder pages(final @NonNull Component@NonNull... pages); + @NotNull Builder pages(final @NotNull Component@NotNull... pages); /** * Add pages to the book. @@ -224,7 +224,7 @@ interface Builder extends Buildable.Builder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder pages(final @NonNull Collection pages); + @NotNull Builder pages(final @NotNull Collection pages); /** * Builds. @@ -232,6 +232,6 @@ interface Builder extends Buildable.Builder { * @return a new book */ @Override - @NonNull Book build(); + @NotNull 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 bf3fad8e4..d573c29af 100644 --- a/api/src/main/java/net/kyori/adventure/inventory/BookImpl.java +++ b/api/src/main/java/net/kyori/adventure/inventory/BookImpl.java @@ -31,7 +31,7 @@ import net.kyori.adventure.text.Component; import net.kyori.examination.ExaminableProperty; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; import static java.util.Objects.requireNonNull; @@ -40,44 +40,44 @@ final class BookImpl implements Book { private final Component author; private final List pages; - BookImpl(final @NonNull Component title, final @NonNull Component author, final @NonNull List pages) { + BookImpl(final @NotNull Component title, final @NotNull Component author, final @NotNull List pages) { this.title = requireNonNull(title, "title"); this.author = requireNonNull(author, "author"); this.pages = Collections.unmodifiableList(requireNonNull(pages, "pages")); } @Override - public @NonNull Component title() { + public @NotNull Component title() { return this.title; } @Override - public @NonNull Book title(final @NonNull Component title) { + public @NotNull Book title(final @NotNull Component title) { return new BookImpl(requireNonNull(title, "title"), this.author, this.pages); } @Override - public @NonNull Component author() { + public @NotNull Component author() { return this.author; } @Override - public @NonNull Book author(final @NonNull Component author) { + public @NotNull Book author(final @NotNull Component author) { return new BookImpl(this.title, requireNonNull(author, "author"), this.pages); } @Override - public @NonNull List pages() { + public @NotNull List pages() { return this.pages; } @Override - public @NonNull Book pages(final @NonNull List pages) { + public @NotNull Book pages(final @NotNull List pages) { return new BookImpl(this.title, this.author, new ArrayList<>(requireNonNull(pages, "pages"))); } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("title", this.title), ExaminableProperty.of("author", this.author), @@ -114,37 +114,37 @@ static final class BuilderImpl implements Book.Builder { private final List pages = new ArrayList<>(); @Override - public @NonNull Builder title(final @NonNull Component title) { + public @NotNull Builder title(final @NotNull Component title) { this.title = requireNonNull(title, "title"); return this; } @Override - public @NonNull Builder author(final @NonNull Component author) { + public @NotNull Builder author(final @NotNull Component author) { this.author = requireNonNull(author, "author"); return this; } @Override - public @NonNull Builder addPage(final @NonNull Component page) { + public @NotNull Builder addPage(final @NotNull Component page) { this.pages.add(requireNonNull(page, "page")); return this; } @Override - public @NonNull Builder pages(final @NonNull Collection pages) { + public @NotNull Builder pages(final @NotNull Collection pages) { this.pages.addAll(requireNonNull(pages, "pages")); return this; } @Override - public @NonNull Builder pages(final @NonNull Component@NonNull... pages) { + public @NotNull Builder pages(final @NotNull Component@NotNull... pages) { Collections.addAll(this.pages, pages); return this; } @Override - public @NonNull Book build() { + public @NotNull 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 62c4a9ec5..cb080e960 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 @@ -24,7 +24,7 @@ package net.kyori.adventure.nbt.api; import net.kyori.adventure.util.Codec; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * Holds a compound binary tag. @@ -48,7 +48,7 @@ public interface BinaryTagHolder { * @throws EX if an error occurred while encoding the binary tag * @since 4.0.0 */ - static @NonNull BinaryTagHolder encode(final @NonNull T nbt, final @NonNull Codec codec) throws EX { + static @NotNull BinaryTagHolder encode(final @NotNull T nbt, final @NotNull Codec codec) throws EX { return new BinaryTagHolderImpl(codec.encode(nbt)); } @@ -59,7 +59,7 @@ public interface BinaryTagHolder { * @return the encoded binary tag * @since 4.0.0 */ - static @NonNull BinaryTagHolder of(final @NonNull String string) { + static @NotNull BinaryTagHolder of(final @NotNull String string) { return new BinaryTagHolderImpl(string); } @@ -69,7 +69,7 @@ public interface BinaryTagHolder { * @return the raw string value * @since 4.0.0 */ - @NonNull String string(); + @NotNull String string(); /** * Gets the held value as a binary tag. @@ -81,5 +81,5 @@ public interface BinaryTagHolder { * @throws DX if an error occurred while retrieving the binary tag * @since 4.0.0 */ - @NonNull T get(final @NonNull Codec codec) throws DX; + @NotNull T get(final @NotNull Codec 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 ee86c70c6..08f45eb4a 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,7 +24,7 @@ package net.kyori.adventure.nbt.api; import net.kyori.adventure.util.Codec; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; import static java.util.Objects.requireNonNull; @@ -36,12 +36,12 @@ final class BinaryTagHolderImpl implements BinaryTagHolder { } @Override - public @NonNull String string() { + public @NotNull String string() { return this.string; } @Override - public @NonNull T get(final @NonNull Codec codec) throws DX { + public @NotNull T get(final @NotNull Codec 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 0b87aa59d..eee5120fb 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.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * Something that has permissions. @@ -50,7 +50,7 @@ public interface PermissionChecker extends Predicate { * @return a {@link PermissionChecker} * @since 4.8.0 */ - static @NonNull PermissionChecker always(final TriState state) { + static @NotNull PermissionChecker always(final TriState state) { if (state == TriState.TRUE) return PermissionCheckers.TRUE; if (state == TriState.FALSE) return PermissionCheckers.FALSE; return PermissionCheckers.NOT_SET; @@ -63,7 +63,7 @@ public interface PermissionChecker extends Predicate { * @return a tri-state result * @since 4.8.0 */ - @NonNull TriState value(final String permission); + @NotNull TriState value(final String permission); @Override default boolean test(final String permission) { 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 126c54ccd..6319f0a6a 100644 --- a/api/src/main/java/net/kyori/adventure/permission/PermissionCheckers.java +++ b/api/src/main/java/net/kyori/adventure/permission/PermissionCheckers.java @@ -24,8 +24,8 @@ package net.kyori.adventure.permission; import net.kyori.adventure.util.TriState; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; final class PermissionCheckers { static final PermissionChecker NOT_SET = new Always(TriState.NOT_SET); @@ -43,7 +43,7 @@ private Always(final TriState value) { } @Override - public @NonNull TriState value(final String permission) { + public @NotNull 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 a12ef55fe..d0c842ba8 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.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * A pointer to a resource. @@ -45,7 +45,7 @@ public interface Pointer extends Examinable { * @return the pointer * @since 4.8.0 */ - static @NonNull Pointer pointer(final @NonNull Class type, final @NonNull Key key) { + static @NotNull Pointer pointer(final @NotNull Class type, final @NotNull Key key) { return new PointerImpl<>(type, key); } @@ -55,7 +55,7 @@ public interface Pointer extends Examinable { * @return the value type * @since 4.8.0 */ - @NonNull Class type(); + @NotNull Class type(); /** * Gets the key. @@ -63,10 +63,10 @@ public interface Pointer extends Examinable { * @return the key * @since 4.8.0 */ - @NonNull Key key(); + @NotNull Key key(); @Override - default @NonNull Stream examinableProperties() { + default @NotNull Stream 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 aaa735816..d3b6e3da0 100644 --- a/api/src/main/java/net/kyori/adventure/pointer/PointerImpl.java +++ b/api/src/main/java/net/kyori/adventure/pointer/PointerImpl.java @@ -25,8 +25,8 @@ import net.kyori.adventure.key.Key; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; final class PointerImpl implements Pointer { private final Class type; @@ -38,12 +38,12 @@ final class PointerImpl implements Pointer { } @Override - public @NonNull Class type() { + public @NotNull Class type() { return this.type; } @Override - public @NonNull Key key() { + public @NotNull 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 505917269..59e30d3a9 100644 --- a/api/src/main/java/net/kyori/adventure/pointer/Pointered.java +++ b/api/src/main/java/net/kyori/adventure/pointer/Pointered.java @@ -25,8 +25,10 @@ import java.util.Optional; import java.util.function.Supplier; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.PolyNull; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.UnknownNullability; /** * Something that can retrieve values based on a given {@link Pointer}. @@ -42,7 +44,7 @@ public interface Pointered { * @return the value * @since 4.8.0 */ - default @NonNull Optional get(final @NonNull Pointer pointer) { + default @NotNull Optional get(final @NotNull Pointer pointer) { return Optional.empty(); } @@ -57,8 +59,9 @@ public interface Pointered { * @return the value * @since 4.8.0 */ + @Contract("_, null -> null; _, !null -> !null") @SuppressWarnings("checkstyle:MethodName") - default @PolyNull T getOrDefault(final @NonNull Pointer pointer, final @PolyNull T defaultValue) { + default @Nullable T getOrDefault(final @NotNull Pointer pointer, final @Nullable T defaultValue) { return this.get(pointer).orElse(defaultValue); } @@ -74,7 +77,7 @@ public interface Pointered { * @since 4.8.0 */ @SuppressWarnings("checkstyle:MethodName") - default @PolyNull T getOrDefaultFrom(final @NonNull Pointer pointer, final @NonNull Supplier defaultValue) { + default @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer pointer, final @NotNull Supplier defaultValue) { return this.get(pointer).orElseGet(defaultValue); } } 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 225c51864..5e3e8e19c 100644 --- a/api/src/main/java/net/kyori/adventure/sound/Sound.java +++ b/api/src/main/java/net/kyori/adventure/sound/Sound.java @@ -28,8 +28,8 @@ import net.kyori.adventure.key.Keyed; import net.kyori.adventure.util.Index; import net.kyori.examination.Examinable; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; import static java.util.Objects.requireNonNull; @@ -65,12 +65,12 @@ public interface Sound extends Examinable { * @return the sound * @since 4.0.0 */ - static @NonNull Sound sound(final @NonNull Key name, final @NonNull Source source, final float volume, final float pitch) { + static @NotNull Sound sound(final @NotNull Key name, final @NotNull Source source, final float volume, final float pitch) { requireNonNull(name, "name"); requireNonNull(source, "source"); return new SoundImpl(source, volume, pitch) { @Override - public @NonNull Key name() { + public @NotNull Key name() { return name; } }; @@ -86,7 +86,7 @@ public interface Sound extends Examinable { * @return the sound * @since 4.0.0 */ - static @NonNull Sound sound(final @NonNull Type type, final @NonNull Source source, final float volume, final float pitch) { + static @NotNull Sound sound(final @NotNull Type type, final @NotNull Source source, final float volume, final float pitch) { requireNonNull(type, "type"); return sound(type.key(), source, volume, pitch); } @@ -101,12 +101,12 @@ public interface Sound extends Examinable { * @return the sound * @since 4.0.0 */ - static @NonNull Sound sound(final @NonNull Supplier type, final @NonNull Source source, final float volume, final float pitch) { + static @NotNull Sound sound(final @NotNull Supplier type, final @NotNull Source source, final float volume, final float pitch) { requireNonNull(type, "type"); requireNonNull(source, "source"); return new SoundImpl(source, volume, pitch) { @Override - public @NonNull Key name() { + public @NotNull Key name() { return type.get().key(); } }; @@ -122,7 +122,7 @@ public interface Sound extends Examinable { * @return the sound * @since 4.8.0 */ - static @NonNull Sound sound(final @NonNull Key name, final Source.@NonNull Provider source, final float volume, final float pitch) { + static @NotNull Sound sound(final @NotNull Key name, final Source.@NotNull Provider source, final float volume, final float pitch) { return sound(name, source.soundSource(), volume, pitch); } @@ -136,7 +136,7 @@ public interface Sound extends Examinable { * @return the sound * @since 4.8.0 */ - static @NonNull Sound sound(final @NonNull Type type, final Source.@NonNull Provider source, final float volume, final float pitch) { + static @NotNull Sound sound(final @NotNull Type type, final Source.@NotNull Provider source, final float volume, final float pitch) { return sound(type, source.soundSource(), volume, pitch); } @@ -150,7 +150,7 @@ public interface Sound extends Examinable { * @return the sound * @since 4.8.0 */ - static @NonNull Sound sound(final @NonNull Supplier type, final Source.@NonNull Provider source, final float volume, final float pitch) { + static @NotNull Sound sound(final @NotNull Supplier type, final Source.@NotNull Provider source, final float volume, final float pitch) { return sound(type, source.soundSource(), volume, pitch); } @@ -160,7 +160,7 @@ public interface Sound extends Examinable { * @return the name * @since 4.0.0 */ - @NonNull Key name(); + @NotNull Key name(); /** * Gets the source. @@ -168,7 +168,7 @@ public interface Sound extends Examinable { * @return the source * @since 4.0.0 */ - @NonNull Source source(); + @NotNull Source source(); /** * Gets the volume. @@ -227,7 +227,7 @@ public interface Provider { * @return the source * @since 4.8.0 */ - @NonNull Source soundSource(); + @NotNull Source soundSource(); } } @@ -244,6 +244,6 @@ interface Type extends Keyed { * @since 4.0.0 */ @Override - @NonNull Key key(); + @NotNull Key key(); } } 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 268570409..683a9fda4 100644 --- a/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java +++ b/api/src/main/java/net/kyori/adventure/sound/SoundImpl.java @@ -27,22 +27,22 @@ import net.kyori.adventure.util.ShadyPines; import net.kyori.examination.ExaminableProperty; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; abstract class SoundImpl implements Sound { private final Source source; private final float volume; private final float pitch; - SoundImpl(final @NonNull Source source, final float volume, final float pitch) { + SoundImpl(final @NotNull Source source, final float volume, final float pitch) { this.source = source; this.volume = volume; this.pitch = pitch; } @Override - public @NonNull Source source() { + public @NotNull Source source() { return this.source; } @@ -77,7 +77,7 @@ public int hashCode() { } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("name", this.name()), ExaminableProperty.of("source", this.source), 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 1c6867f49..31c0b661e 100644 --- a/api/src/main/java/net/kyori/adventure/sound/SoundStop.java +++ b/api/src/main/java/net/kyori/adventure/sound/SoundStop.java @@ -27,9 +27,9 @@ import net.kyori.adventure.audience.Audience; import net.kyori.adventure.key.Key; import net.kyori.examination.Examinable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; @@ -52,7 +52,7 @@ public interface SoundStop extends Examinable { * @return a sound stopper * @since 4.0.0 */ - static @NonNull SoundStop all() { + static @NotNull SoundStop all() { return SoundStopImpl.ALL; } @@ -63,11 +63,11 @@ public interface SoundStop extends Examinable { * @return a sound stopper * @since 4.0.0 */ - static @NonNull SoundStop named(final @NonNull Key sound) { + static @NotNull SoundStop named(final @NotNull Key sound) { requireNonNull(sound, "sound"); return new SoundStopImpl(null) { @Override - public @NonNull Key sound() { + public @NotNull Key sound() { return sound; } }; @@ -80,11 +80,11 @@ public interface SoundStop extends Examinable { * @return a sound stopper * @since 4.0.0 */ - static @NonNull SoundStop named(final Sound.@NonNull Type sound) { + static @NotNull SoundStop named(final Sound.@NotNull Type sound) { requireNonNull(sound, "sound"); return new SoundStopImpl(null) { @Override - public @NonNull Key sound() { + public @NotNull Key sound() { return sound.key(); } }; @@ -97,11 +97,11 @@ public interface SoundStop extends Examinable { * @return a sound stopper * @since 4.0.0 */ - static @NonNull SoundStop named(final @NonNull Supplier sound) { + static @NotNull SoundStop named(final @NotNull Supplier sound) { requireNonNull(sound, "sound"); return new SoundStopImpl(null) { @Override - public @NonNull Key sound() { + public @NotNull Key sound() { return sound.get().key(); } }; @@ -114,7 +114,7 @@ public interface SoundStop extends Examinable { * @return a sound stopper * @since 4.0.0 */ - static @NonNull SoundStop source(final Sound.@NonNull Source source) { + static @NotNull SoundStop source(final Sound.@NotNull Source source) { requireNonNull(source, "source"); return new SoundStopImpl(source) { @Override @@ -132,12 +132,12 @@ public interface SoundStop extends Examinable { * @return a sound stopper * @since 4.0.0 */ - static @NonNull SoundStop namedOnSource(final @NonNull Key sound, final Sound.@NonNull Source source) { + static @NotNull SoundStop namedOnSource(final @NotNull Key sound, final Sound.@NotNull Source source) { requireNonNull(sound, "sound"); requireNonNull(source, "source"); return new SoundStopImpl(source) { @Override - public @NonNull Key sound() { + public @NotNull Key sound() { return sound; } }; @@ -151,7 +151,7 @@ public interface SoundStop extends Examinable { * @return a sound stopper * @since 4.0.0 */ - static @NonNull SoundStop namedOnSource(final Sound.@NonNull Type sound, final Sound.@NonNull Source source) { + static @NotNull SoundStop namedOnSource(final Sound.@NotNull Type sound, final Sound.@NotNull Source source) { requireNonNull(sound, "sound"); return namedOnSource(sound.key(), source); } @@ -164,12 +164,12 @@ public interface SoundStop extends Examinable { * @return a sound stopper * @since 4.0.0 */ - static @NonNull SoundStop namedOnSource(final @NonNull Supplier sound, final Sound.@NonNull Source source) { + static @NotNull SoundStop namedOnSource(final @NotNull Supplier sound, final Sound.@NotNull Source source) { requireNonNull(sound, "sound"); requireNonNull(source, "source"); return new SoundStopImpl(source) { @Override - public @NonNull Key sound() { + public @NotNull 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 2a8cff636..ccb936a3b 100644 --- a/api/src/main/java/net/kyori/adventure/sound/SoundStopImpl.java +++ b/api/src/main/java/net/kyori/adventure/sound/SoundStopImpl.java @@ -28,8 +28,8 @@ import net.kyori.adventure.key.Key; import net.kyori.examination.ExaminableProperty; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; abstract class SoundStopImpl implements SoundStop { static final SoundStop ALL = new SoundStopImpl(null) { @@ -66,7 +66,7 @@ public int hashCode() { } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream 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 38dd23213..a5c7a36a9 100644 --- a/api/src/main/java/net/kyori/adventure/text/AbstractComponent.java +++ b/api/src/main/java/net/kyori/adventure/text/AbstractComponent.java @@ -32,9 +32,9 @@ import net.kyori.adventure.util.Buildable; import net.kyori.examination.ExaminableProperty; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.Debug; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; @@ -56,29 +56,29 @@ public abstract class AbstractComponent implements Component { */ protected final Style style; - protected AbstractComponent(final @NonNull List children, final @NonNull Style style) { + protected AbstractComponent(final @NotNull List children, final @NotNull Style style) { this.children = ComponentLike.asComponents(children, NOT_EMPTY); this.style = style; } @Override - public final @NonNull List children() { + public final @NotNull List children() { return this.children; } @Override - public final @NonNull Style style() { + public final @NotNull Style style() { return this.style; } @Override - public @NonNull Component replaceText(final @NonNull Consumer configurer) { + public @NotNull Component replaceText(final @NotNull Consumer configurer) { requireNonNull(configurer, "configurer"); return this.replaceText(Buildable.configureAndBuild(TextReplacementConfig.builder(), configurer)); } @Override - public @NonNull Component replaceText(final @NonNull TextReplacementConfig config) { + public @NotNull Component replaceText(final @NotNull TextReplacementConfig config) { requireNonNull(config, "replacement"); if (!(config instanceof TextReplacementConfigImpl)) { throw new IllegalArgumentException("Provided replacement was a custom TextReplacementConfig implementation, which is not supported."); @@ -112,7 +112,7 @@ protected Stream examinablePropertiesWithoutChildr } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.concat( this.examinablePropertiesWithoutChildren(), Stream.of( 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 0f7619740..cd5dc81ab 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.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * An abstract implementation of a component builder. @@ -65,7 +65,7 @@ abstract class AbstractComponentBuilder, B ex protected AbstractComponentBuilder() { } - protected AbstractComponentBuilder(final @NonNull C component) { + protected AbstractComponentBuilder(final @NotNull C component) { final List children = component.children(); if (!children.isEmpty()) { this.children = new ArrayList<>(children); @@ -77,7 +77,7 @@ protected AbstractComponentBuilder(final @NonNull C component) { @Override @SuppressWarnings("unchecked") - public @NonNull B append(final @NonNull Component component) { + public @NotNull B append(final @NotNull Component component) { if (component == Component.empty()) return (B) this; this.prepareChildren(); this.children.add(component); @@ -86,7 +86,7 @@ protected AbstractComponentBuilder(final @NonNull C component) { @Override @SuppressWarnings("unchecked") - public @NonNull B append(final @NonNull Component@NonNull... components) { + public @NotNull B append(final @NotNull Component@NotNull... components) { boolean prepared = false; for (int i = 0, length = components.length; i < length; i++) { final Component component = components[i]; @@ -103,7 +103,7 @@ protected AbstractComponentBuilder(final @NonNull C component) { @Override @SuppressWarnings("unchecked") - public @NonNull B append(final @NonNull ComponentLike@NonNull... components) { + public @NotNull B append(final @NotNull ComponentLike@NotNull... components) { boolean prepared = false; for (int i = 0, length = components.length; i < length; i++) { final Component component = components[i].asComponent(); @@ -120,7 +120,7 @@ protected AbstractComponentBuilder(final @NonNull C component) { @Override @SuppressWarnings("unchecked") - public @NonNull B append(final @NonNull Iterable components) { + public @NotNull B append(final @NotNull Iterable components) { boolean prepared = false; for (final ComponentLike like : components) { final Component component = like.asComponent(); @@ -143,7 +143,7 @@ private void prepareChildren() { @Override @SuppressWarnings("unchecked") - public @NonNull B applyDeep(final @NonNull Consumer> consumer) { + public @NotNull B applyDeep(final @NotNull Consumer> consumer) { this.apply(consumer); if (this.children == Collections.emptyList()) { return (B) this; @@ -163,7 +163,7 @@ private void prepareChildren() { @Override @SuppressWarnings("unchecked") - public @NonNull B mapChildren(final @NonNull Function, ? extends BuildableComponent> function) { + public @NotNull B mapChildren(final @NotNull Function, ? extends BuildableComponent> function) { if (this.children == Collections.emptyList()) { return (B) this; } @@ -184,7 +184,7 @@ private void prepareChildren() { @Override @SuppressWarnings("unchecked") - public @NonNull B mapChildrenDeep(final @NonNull Function, ? extends BuildableComponent> function) { + public @NotNull B mapChildrenDeep(final @NotNull Function, ? extends BuildableComponent> function) { if (this.children == Collections.emptyList()) { return (B) this; } @@ -210,13 +210,13 @@ private void prepareChildren() { } @Override - public @NonNull List children() { + public @NotNull List children() { return Collections.unmodifiableList(this.children); } @Override @SuppressWarnings("unchecked") - public @NonNull B style(final @NonNull Style style) { + public @NotNull B style(final @NotNull Style style) { this.style = style; this.styleBuilder = null; return (B) this; @@ -224,76 +224,76 @@ private void prepareChildren() { @Override @SuppressWarnings("unchecked") - public @NonNull B style(final @NonNull Consumer consumer) { + public @NotNull B style(final @NotNull Consumer consumer) { consumer.accept(this.styleBuilder()); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B font(final @Nullable Key font) { + public @NotNull B font(final @Nullable Key font) { this.styleBuilder().font(font); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B color(final @Nullable TextColor color) { + public @NotNull B color(final @Nullable TextColor color) { this.styleBuilder().color(color); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B colorIfAbsent(final @Nullable TextColor color) { + public @NotNull B colorIfAbsent(final @Nullable TextColor color) { this.styleBuilder().colorIfAbsent(color); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B decoration(final @NonNull TextDecoration decoration, final TextDecoration.@NonNull State state) { + public @NotNull B decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) { this.styleBuilder().decoration(decoration, state); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B clickEvent(final @Nullable ClickEvent event) { + public @NotNull B clickEvent(final @Nullable ClickEvent event) { this.styleBuilder().clickEvent(event); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B hoverEvent(final @Nullable HoverEventSource source) { + public @NotNull B hoverEvent(final @Nullable HoverEventSource source) { this.styleBuilder().hoverEvent(source); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B insertion(final @Nullable String insertion) { + public @NotNull B insertion(final @Nullable String insertion) { this.styleBuilder().insertion(insertion); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B mergeStyle(final @NonNull Component that, final @NonNull Set merges) { + public @NotNull B mergeStyle(final @NotNull Component that, final @NotNull Set merges) { this.styleBuilder().merge(that.style(), merges); return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B resetStyle() { + public @NotNull B resetStyle() { this.style = null; this.styleBuilder = null; return (B) this; } - private Style.@NonNull Builder styleBuilder() { + private Style.@NotNull Builder styleBuilder() { if (this.styleBuilder == null) { if (this.style != null) { this.styleBuilder = this.style.toBuilder(); @@ -309,7 +309,7 @@ protected final boolean hasStyle() { return this.styleBuilder != null || this.style != null; } - protected @NonNull Style buildStyle() { + protected @NotNull 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/BlockNBTComponent.java b/api/src/main/java/net/kyori/adventure/text/BlockNBTComponent.java index 75722bc62..4f83ee4b7 100644 --- a/api/src/main/java/net/kyori/adventure/text/BlockNBTComponent.java +++ b/api/src/main/java/net/kyori/adventure/text/BlockNBTComponent.java @@ -25,8 +25,8 @@ import java.util.regex.Matcher; import net.kyori.examination.Examinable; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; /** * Given an in-game position, this component reads the NBT of the associated block and displays that information. @@ -50,7 +50,7 @@ public interface BlockNBTComponent extends NBTComponent { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder pos(final @NonNull Pos pos); + @NotNull Builder pos(final @NotNull Pos pos); /** * Sets the block position to a {@link LocalPos} with the given values. @@ -144,7 +144,7 @@ interface Builder extends NBTComponentBuilder { * @since 4.0.0 */ @Contract("_, _, _ -> this") - default @NonNull Builder localPos(final double left, final double up, final double forwards) { + default @NotNull Builder localPos(final double left, final double up, final double forwards) { return this.pos(LocalPos.of(left, up, forwards)); } @@ -158,7 +158,7 @@ interface Builder extends NBTComponentBuilder { * @since 4.0.0 */ @Contract("_, _, _ -> this") - default @NonNull Builder worldPos(final WorldPos.@NonNull Coordinate x, final WorldPos.@NonNull Coordinate y, final WorldPos.@NonNull Coordinate z) { + default @NotNull Builder worldPos(final WorldPos.@NotNull Coordinate x, final WorldPos.@NotNull Coordinate y, final WorldPos.@NotNull Coordinate z) { return this.pos(WorldPos.of(x, y, z)); } @@ -172,7 +172,7 @@ interface Builder extends NBTComponentBuilder { * @since 4.0.0 */ @Contract("_, _, _ -> this") - default @NonNull Builder absoluteWorldPos(final int x, final int y, final int z) { + default @NotNull 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)); } @@ -186,7 +186,7 @@ interface Builder extends NBTComponentBuilder { * @since 4.0.0 */ @Contract("_, _, _ -> this") - default @NonNull Builder relativeWorldPos(final int x, final int y, final int z) { + default @NotNull 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)); } } @@ -209,7 +209,7 @@ interface Pos extends Examinable { * @throws IllegalArgumentException if the position was in an invalid format * @since 4.0.0 */ - static @NonNull Pos fromString(final @NonNull String input) throws IllegalArgumentException { + static @NotNull Pos fromString(final @NotNull String input) throws IllegalArgumentException { final Matcher localMatch = BlockNBTComponentImpl.Tokens.LOCAL_PATTERN.matcher(input); if (localMatch.matches()) { return BlockNBTComponent.LocalPos.of( @@ -238,7 +238,7 @@ interface Pos extends Examinable { * @see #fromString(String) * @since 4.0.0 */ - @NonNull String asString(); + @NotNull String asString(); } /** @@ -256,7 +256,7 @@ interface LocalPos extends Pos { * @return a local position * @since 4.0.0 */ - static @NonNull LocalPos of(final double left, final double up, final double forwards) { + static @NotNull LocalPos of(final double left, final double up, final double forwards) { return new BlockNBTComponentImpl.LocalPosImpl(left, up, forwards); } @@ -300,7 +300,7 @@ interface WorldPos extends Pos { * @return a world position * @since 4.0.0 */ - static @NonNull WorldPos of(final @NonNull Coordinate x, final @NonNull Coordinate y, final @NonNull Coordinate z) { + static @NotNull WorldPos of(final @NotNull Coordinate x, final @NotNull Coordinate y, final @NotNull Coordinate z) { return new BlockNBTComponentImpl.WorldPosImpl(x, y, z); } @@ -310,7 +310,7 @@ interface WorldPos extends Pos { * @return the x coordinate * @since 4.0.0 */ - @NonNull Coordinate x(); + @NotNull Coordinate x(); /** * Gets the y coordinate. @@ -318,7 +318,7 @@ interface WorldPos extends Pos { * @return the y coordinate * @since 4.0.0 */ - @NonNull Coordinate y(); + @NotNull Coordinate y(); /** * Gets the z coordinate. @@ -326,7 +326,7 @@ interface WorldPos extends Pos { * @return the z coordinate * @since 4.0.0 */ - @NonNull Coordinate z(); + @NotNull Coordinate z(); /** * A coordinate component within a {@link WorldPos}. @@ -341,7 +341,7 @@ interface Coordinate extends Examinable { * @return a coordinate * @since 4.0.0 */ - static @NonNull Coordinate absolute(final int value) { + static @NotNull Coordinate absolute(final int value) { return of(value, Type.ABSOLUTE); } @@ -352,7 +352,7 @@ interface Coordinate extends Examinable { * @return a coordinate * @since 4.0.0 */ - static @NonNull Coordinate relative(final int value) { + static @NotNull Coordinate relative(final int value) { return of(value, Type.RELATIVE); } @@ -364,7 +364,7 @@ interface Coordinate extends Examinable { * @return a coordinate * @since 4.0.0 */ - static @NonNull Coordinate of(final int value, final @NonNull Type type) { + static @NotNull Coordinate of(final int value, final @NotNull Type type) { return new BlockNBTComponentImpl.WorldPosImpl.CoordinateImpl(value, type); } @@ -382,7 +382,7 @@ interface Coordinate extends Examinable { * @return the type * @since 4.0.0 */ - @NonNull Type type(); + @NotNull 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 7d9887101..f4d67251e 100644 --- a/api/src/main/java/net/kyori/adventure/text/BlockNBTComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/BlockNBTComponentImpl.java @@ -30,48 +30,48 @@ import net.kyori.adventure.text.format.Style; import net.kyori.adventure.util.ShadyPines; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; final class BlockNBTComponentImpl extends NBTComponentImpl implements BlockNBTComponent { private final Pos pos; - BlockNBTComponentImpl(final @NonNull List children, final @NonNull Style style, final String nbtPath, final boolean interpret, final @NonNull Pos pos) { + BlockNBTComponentImpl(final @NotNull List children, final @NotNull Style style, final String nbtPath, final boolean interpret, final @NotNull Pos pos) { super(children, style, nbtPath, interpret); this.pos = pos; } @Override - public @NonNull BlockNBTComponent nbtPath(final @NonNull String nbtPath) { + public @NotNull BlockNBTComponent nbtPath(final @NotNull String nbtPath) { if (Objects.equals(this.nbtPath, nbtPath)) return this; return new BlockNBTComponentImpl(this.children, this.style, nbtPath, this.interpret, this.pos); } @Override - public @NonNull BlockNBTComponent interpret(final boolean interpret) { + public @NotNull BlockNBTComponent interpret(final boolean interpret) { if (this.interpret == interpret) return this; return new BlockNBTComponentImpl(this.children, this.style, this.nbtPath, interpret, this.pos); } @Override - public @NonNull Pos pos() { + public @NotNull Pos pos() { return this.pos; } @Override - public @NonNull BlockNBTComponent pos(final @NonNull Pos pos) { + public @NotNull BlockNBTComponent pos(final @NotNull Pos pos) { return new BlockNBTComponentImpl(this.children, this.style, this.nbtPath, this.interpret, pos); } @Override - public @NonNull BlockNBTComponent children(final @NonNull List children) { + public @NotNull BlockNBTComponent children(final @NotNull List children) { return new BlockNBTComponentImpl(children, this.style, this.nbtPath, this.interpret, this.pos); } @Override - public @NonNull BlockNBTComponent style(final @NonNull Style style) { + public @NotNull BlockNBTComponent style(final @NotNull Style style) { return new BlockNBTComponentImpl(this.children, style, this.nbtPath, this.interpret, this.pos); } @@ -92,7 +92,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("pos", this.pos) @@ -102,7 +102,7 @@ public int hashCode() { } @Override - public BlockNBTComponent.@NonNull Builder toBuilder() { + public BlockNBTComponent.@NotNull Builder toBuilder() { return new BuilderImpl(this); } @@ -112,19 +112,19 @@ static final class BuilderImpl extends NBTComponentImpl.BuilderImpl examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("left", this.left), ExaminableProperty.of("up", this.up), @@ -190,7 +190,7 @@ public String toString() { } @Override - public @NonNull String asString() { + public @NotNull String asString() { return Tokens.serializeLocal(this.left) + ' ' + Tokens.serializeLocal(this.up) + ' ' + Tokens.serializeLocal(this.forwards); } } @@ -207,22 +207,22 @@ static final class WorldPosImpl implements WorldPos { } @Override - public @NonNull Coordinate x() { + public @NotNull Coordinate x() { return this.x; } @Override - public @NonNull Coordinate y() { + public @NotNull Coordinate y() { return this.y; } @Override - public @NonNull Coordinate z() { + public @NotNull Coordinate z() { return this.z; } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("x", this.x), ExaminableProperty.of("y", this.y), @@ -254,7 +254,7 @@ public String toString() { } @Override - public @NonNull String asString() { + public @NotNull String asString() { return Tokens.serializeCoordinate(this.x()) + ' ' + Tokens.serializeCoordinate(this.y()) + ' ' + Tokens.serializeCoordinate(this.z()); } @@ -262,7 +262,7 @@ static final class CoordinateImpl implements Coordinate { private final int value; private final Type type; - CoordinateImpl(final int value, final @NonNull Type type) { + CoordinateImpl(final int value, final @NotNull Type type) { this.value = value; this.type = requireNonNull(type, "type"); } @@ -273,12 +273,12 @@ public int value() { } @Override - public @NonNull Type type() { + public @NotNull Type type() { return this.type; } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream 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 73b4b58c6..0e238fac5 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.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * A component which may be built. @@ -40,5 +40,5 @@ public interface BuildableComponent, B extend * @return the builder */ @Override - @NonNull B toBuilder(); + @NotNull 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 0c775ca2c..785f40a06 100644 --- a/api/src/main/java/net/kyori/adventure/text/Component.java +++ b/api/src/main/java/net/kyori/adventure/text/Component.java @@ -48,10 +48,10 @@ import net.kyori.adventure.util.Buildable; import net.kyori.adventure.util.IntFunction2; import net.kyori.examination.Examinable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; 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; /** @@ -115,7 +115,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @return an empty component * @since 4.0.0 */ - static @NonNull TextComponent empty() { + static @NotNull TextComponent empty() { return TextComponentImpl.EMPTY; } @@ -125,7 +125,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 @NonNull TextComponent newline() { + static @NotNull TextComponent newline() { return TextComponentImpl.NEWLINE; } @@ -135,7 +135,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @return a text component with a single space as the content * @since 4.0.0 */ - static @NonNull TextComponent space() { + static @NotNull TextComponent space() { return TextComponentImpl.SPACE; } @@ -148,7 +148,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent join(final @NonNull ComponentLike separator, final @NonNull ComponentLike@NonNull... components) { + static @NotNull TextComponent join(final @NotNull ComponentLike separator, final @NotNull ComponentLike@NotNull... components) { return join(separator, Arrays.asList(components)); } @@ -161,7 +161,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent join(final @NonNull ComponentLike separator, final Iterable components) { + static @NotNull TextComponent join(final @NotNull ComponentLike separator, final Iterable components) { final Iterator it = components.iterator(); if (!it.hasNext()) { return Component.empty(); @@ -182,7 +182,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @return a collector that can join components * @since 4.6.0 */ - static @NonNull Collector, Component> toComponent() { + static @NotNull Collector, Component> toComponent() { return toComponent(Component.empty()); } @@ -193,7 +193,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @return a collector that can join components * @since 4.6.0 */ - static @NonNull Collector, Component> toComponent(final @NonNull Component separator) { + static @NotNull Collector, Component> toComponent(final @NotNull Component separator) { return Collector.of( Component::text, (builder, add) -> { @@ -227,7 +227,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static BlockNBTComponent.@NonNull Builder blockNBT() { + static BlockNBTComponent.@NotNull Builder blockNBT() { return new BlockNBTComponentImpl.BuilderImpl(); } @@ -239,7 +239,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_ -> new") - static @NonNull BlockNBTComponent blockNBT(final @NonNull Consumer consumer) { + static @NotNull BlockNBTComponent blockNBT(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(blockNBT(), consumer); } @@ -252,7 +252,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull BlockNBTComponent blockNBT(final @NonNull String nbtPath, final BlockNBTComponent.@NonNull Pos pos) { + static @NotNull BlockNBTComponent blockNBT(final @NotNull String nbtPath, final BlockNBTComponent.@NotNull Pos pos) { return blockNBT(nbtPath, NBTComponentImpl.INTERPRET_DEFAULT, pos); } @@ -266,7 +266,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull BlockNBTComponent blockNBT(final @NonNull String nbtPath, final boolean interpret, final BlockNBTComponent.@NonNull Pos pos) { + static @NotNull BlockNBTComponent blockNBT(final @NotNull String nbtPath, final boolean interpret, final BlockNBTComponent.@NotNull Pos pos) { return new BlockNBTComponentImpl(Collections.emptyList(), Style.empty(), nbtPath, interpret, pos); } @@ -283,7 +283,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static EntityNBTComponent.@NonNull Builder entityNBT() { + static EntityNBTComponent.@NotNull Builder entityNBT() { return new EntityNBTComponentImpl.BuilderImpl(); } @@ -295,7 +295,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_ -> new") - static @NonNull EntityNBTComponent entityNBT(final @NonNull Consumer consumer) { + static @NotNull EntityNBTComponent entityNBT(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(entityNBT(), consumer); } @@ -308,7 +308,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_, _ -> new") - static @NonNull EntityNBTComponent entityNBT(final @NonNull String nbtPath, final @NonNull String selector) { + static @NotNull EntityNBTComponent entityNBT(final @NotNull String nbtPath, final @NotNull String selector) { return entityNBT().nbtPath(nbtPath).selector(selector).build(); } @@ -325,7 +325,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static KeybindComponent.@NonNull Builder keybind() { + static KeybindComponent.@NotNull Builder keybind() { return new KeybindComponentImpl.BuilderImpl(); } @@ -337,7 +337,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_ -> new") - static @NonNull KeybindComponent keybind(final @NonNull Consumer consumer) { + static @NotNull KeybindComponent keybind(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(keybind(), consumer); } @@ -349,7 +349,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull KeybindComponent keybind(final @NonNull String keybind) { + static @NotNull KeybindComponent keybind(final @NotNull String keybind) { return keybind(keybind, Style.empty()); } @@ -362,7 +362,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull KeybindComponent keybind(final @NonNull String keybind, final @NonNull Style style) { + static @NotNull KeybindComponent keybind(final @NotNull String keybind, final @NotNull Style style) { return new KeybindComponentImpl(Collections.emptyList(), style, keybind); } @@ -375,7 +375,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull KeybindComponent keybind(final @NonNull String keybind, final @Nullable TextColor color) { + static @NotNull KeybindComponent keybind(final @NotNull String keybind, final @Nullable TextColor color) { return keybind(keybind, Style.style(color)); } @@ -389,7 +389,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull KeybindComponent keybind(final @NonNull String keybind, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull KeybindComponent keybind(final @NotNull String keybind, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return keybind(keybind, Style.style(color, decorations)); } @@ -403,7 +403,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull KeybindComponent keybind(final @NonNull String keybind, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull KeybindComponent keybind(final @NotNull String keybind, final @Nullable TextColor color, final @NotNull Set decorations) { return keybind(keybind, Style.style(color, decorations)); } @@ -420,7 +420,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static ScoreComponent.@NonNull Builder score() { + static ScoreComponent.@NotNull Builder score() { return new ScoreComponentImpl.BuilderImpl(); } @@ -432,7 +432,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_ -> new") - static @NonNull ScoreComponent score(final @NonNull Consumer consumer) { + static @NotNull ScoreComponent score(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(score(), consumer); } @@ -445,7 +445,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull ScoreComponent score(final @NonNull String name, final @NonNull String objective) { + static @NotNull ScoreComponent score(final @NotNull String name, final @NotNull String objective) { return score(name, objective, null); } @@ -461,7 +461,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex */ @Contract(value = "_, _, _ -> new", pure = true) @Deprecated - static @NonNull ScoreComponent score(final @NonNull String name, final @NonNull String objective, final @Nullable String value) { + static @NotNull ScoreComponent score(final @NotNull String name, final @NotNull String objective, final @Nullable String value) { return new ScoreComponentImpl(Collections.emptyList(), Style.empty(), name, objective, value); } @@ -478,7 +478,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static SelectorComponent.@NonNull Builder selector() { + static SelectorComponent.@NotNull Builder selector() { return new SelectorComponentImpl.BuilderImpl(); } @@ -490,7 +490,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_ -> new") - static @NonNull SelectorComponent selector(final @NonNull Consumer consumer) { + static @NotNull SelectorComponent selector(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(selector(), consumer); } @@ -502,7 +502,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull SelectorComponent selector(final @NonNull String pattern) { + static @NotNull SelectorComponent selector(final @NotNull String pattern) { return new SelectorComponentImpl(Collections.emptyList(), Style.empty(), pattern); } @@ -519,7 +519,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static StorageNBTComponent.@NonNull Builder storageNBT() { + static StorageNBTComponent.@NotNull Builder storageNBT() { return new StorageNBTComponentImpl.BuilderImpl(); } @@ -531,7 +531,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_ -> new") - static @NonNull StorageNBTComponent storageNBT(final @NonNull Consumer consumer) { + static @NotNull StorageNBTComponent storageNBT(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(storageNBT(), consumer); } @@ -544,7 +544,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull StorageNBTComponent storageNBT(final @NonNull String nbtPath, final @NonNull Key storage) { + static @NotNull StorageNBTComponent storageNBT(final @NotNull String nbtPath, final @NotNull Key storage) { return storageNBT(nbtPath, NBTComponentImpl.INTERPRET_DEFAULT, storage); } @@ -558,7 +558,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull StorageNBTComponent storageNBT(final @NonNull String nbtPath, final boolean interpret, final @NonNull Key storage) { + static @NotNull StorageNBTComponent storageNBT(final @NotNull String nbtPath, final boolean interpret, final @NotNull Key storage) { return new StorageNBTComponentImpl(Collections.emptyList(), Style.empty(), nbtPath, interpret, storage); } @@ -575,7 +575,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static TextComponent.@NonNull Builder text() { + static TextComponent.@NotNull Builder text() { return new TextComponentImpl.BuilderImpl(); } @@ -587,7 +587,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_ -> new") - static @NonNull TextComponent text(final @NonNull Consumer consumer) { + static @NotNull TextComponent text(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(text(), consumer); } @@ -599,7 +599,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull TextComponent text(final @NonNull String content) { + static @NotNull TextComponent text(final @NotNull String content) { if (content.isEmpty()) return empty(); return new TextComponentImpl(Collections.emptyList(), Style.empty(), content); } @@ -613,7 +613,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final @NonNull String content, final @NonNull Style style) { + static @NotNull TextComponent text(final @NotNull String content, final @NotNull Style style) { return new TextComponentImpl(Collections.emptyList(), style, content); } @@ -626,7 +626,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final @NonNull String content, final @Nullable TextColor color) { + static @NotNull TextComponent text(final @NotNull String content, final @Nullable TextColor color) { return new TextComponentImpl(Collections.emptyList(), Style.style(color), content); } @@ -640,7 +640,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final @NonNull String content, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TextComponent text(final @NotNull String content, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return new TextComponentImpl(Collections.emptyList(), Style.style(color, decorations), content); } @@ -654,7 +654,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final @NonNull String content, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TextComponent text(final @NotNull String content, final @Nullable TextColor color, final @NotNull Set decorations) { return new TextComponentImpl(Collections.emptyList(), Style.style(color, decorations), content); } @@ -666,7 +666,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull TextComponent text(final boolean value) { + static @NotNull TextComponent text(final boolean value) { return text(String.valueOf(value)); } @@ -679,7 +679,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final boolean value, final @NonNull Style style) { + static @NotNull TextComponent text(final boolean value, final @NotNull Style style) { return text(String.valueOf(value), style); } @@ -692,7 +692,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final boolean value, final @Nullable TextColor color) { + static @NotNull TextComponent text(final boolean value, final @Nullable TextColor color) { return text(String.valueOf(value), color); } @@ -706,7 +706,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final boolean value, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TextComponent text(final boolean value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return text(String.valueOf(value), color, decorations); } @@ -720,7 +720,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final boolean value, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TextComponent text(final boolean value, final @Nullable TextColor color, final @NotNull Set decorations) { return text(String.valueOf(value), color, decorations); } @@ -732,7 +732,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static @NonNull TextComponent text(final char value) { + static @NotNull TextComponent text(final char value) { if (value == '\n') return newline(); if (value == ' ') return space(); return text(String.valueOf(value)); @@ -747,7 +747,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final char value, final @NonNull Style style) { + static @NotNull TextComponent text(final char value, final @NotNull Style style) { return text(String.valueOf(value), style); } @@ -760,7 +760,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final char value, final @Nullable TextColor color) { + static @NotNull TextComponent text(final char value, final @Nullable TextColor color) { return text(String.valueOf(value), color); } @@ -774,7 +774,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final char value, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TextComponent text(final char value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return text(String.valueOf(value), color, decorations); } @@ -788,7 +788,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final char value, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TextComponent text(final char value, final @Nullable TextColor color, final @NotNull Set decorations) { return text(String.valueOf(value), color, decorations); } @@ -800,7 +800,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull TextComponent text(final double value) { + static @NotNull TextComponent text(final double value) { return text(String.valueOf(value)); } @@ -813,7 +813,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final double value, final @NonNull Style style) { + static @NotNull TextComponent text(final double value, final @NotNull Style style) { return text(String.valueOf(value), style); } @@ -826,7 +826,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final double value, final @Nullable TextColor color) { + static @NotNull TextComponent text(final double value, final @Nullable TextColor color) { return text(String.valueOf(value), color); } @@ -840,7 +840,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final double value, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TextComponent text(final double value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return text(String.valueOf(value), color, decorations); } @@ -854,7 +854,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final double value, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TextComponent text(final double value, final @Nullable TextColor color, final @NotNull Set decorations) { return text(String.valueOf(value), color, decorations); } @@ -866,7 +866,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull TextComponent text(final float value) { + static @NotNull TextComponent text(final float value) { return text(String.valueOf(value)); } @@ -879,7 +879,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final float value, final @NonNull Style style) { + static @NotNull TextComponent text(final float value, final @NotNull Style style) { return text(String.valueOf(value), style); } @@ -892,7 +892,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final float value, final @Nullable TextColor color) { + static @NotNull TextComponent text(final float value, final @Nullable TextColor color) { return text(String.valueOf(value), color); } @@ -906,7 +906,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final float value, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TextComponent text(final float value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return text(String.valueOf(value), color, decorations); } @@ -920,7 +920,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final float value, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TextComponent text(final float value, final @Nullable TextColor color, final @NotNull Set decorations) { return text(String.valueOf(value), color, decorations); } @@ -932,7 +932,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull TextComponent text(final int value) { + static @NotNull TextComponent text(final int value) { return text(String.valueOf(value)); } @@ -945,7 +945,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final int value, final @NonNull Style style) { + static @NotNull TextComponent text(final int value, final @NotNull Style style) { return text(String.valueOf(value), style); } @@ -958,7 +958,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final int value, final @Nullable TextColor color) { + static @NotNull TextComponent text(final int value, final @Nullable TextColor color) { return text(String.valueOf(value), color); } @@ -972,7 +972,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final int value, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TextComponent text(final int value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return text(String.valueOf(value), color, decorations); } @@ -986,7 +986,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final int value, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TextComponent text(final int value, final @Nullable TextColor color, final @NotNull Set decorations) { return text(String.valueOf(value), color, decorations); } @@ -998,7 +998,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull TextComponent text(final long value) { + static @NotNull TextComponent text(final long value) { return text(String.valueOf(value)); } @@ -1011,7 +1011,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final long value, final @NonNull Style style) { + static @NotNull TextComponent text(final long value, final @NotNull Style style) { return text(String.valueOf(value), style); } @@ -1024,7 +1024,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TextComponent text(final long value, final @Nullable TextColor color) { + static @NotNull TextComponent text(final long value, final @Nullable TextColor color) { return text(String.valueOf(value), color); } @@ -1038,7 +1038,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final long value, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TextComponent text(final long value, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return text(String.valueOf(value), color, decorations); } @@ -1052,7 +1052,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TextComponent text(final long value, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TextComponent text(final long value, final @Nullable TextColor color, final @NotNull Set decorations) { return text(String.valueOf(value), color, decorations); } @@ -1069,7 +1069,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(pure = true) - static TranslatableComponent.@NonNull Builder translatable() { + static TranslatableComponent.@NotNull Builder translatable() { return new TranslatableComponentImpl.BuilderImpl(); } @@ -1081,7 +1081,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract("_ -> new") - static @NonNull TranslatableComponent translatable(final @NonNull Consumer consumer) { + static @NotNull TranslatableComponent translatable(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(translatable(), consumer); } @@ -1093,7 +1093,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key) { + static @NotNull TranslatableComponent translatable(final @NotNull String key) { return translatable(key, Style.empty()); } @@ -1105,7 +1105,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), Style.empty()); } @@ -1118,7 +1118,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @NonNull Style style) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull Style style) { return new TranslatableComponentImpl(Collections.emptyList(), style, key, Collections.emptyList()); } @@ -1131,7 +1131,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @NonNull Style style) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull Style style) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), style); } @@ -1144,7 +1144,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @Nullable TextColor color) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color) { return translatable(key, Style.style(color)); } @@ -1157,7 +1157,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @Nullable TextColor color) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), color); } @@ -1171,7 +1171,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return translatable(key, Style.style(color, decorations)); } @@ -1185,7 +1185,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), color, decorations); } @@ -1199,7 +1199,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull Set decorations) { return translatable(key, Style.style(color, decorations)); } @@ -1213,7 +1213,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @Nullable TextColor color, final @NonNull Set decorations) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull Set decorations) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), color, decorations); } @@ -1226,7 +1226,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @NonNull ComponentLike@NonNull... args) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull ComponentLike@NotNull... args) { return translatable(key, Style.empty(), args); } @@ -1239,7 +1239,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @NonNull ComponentLike@NonNull... args) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull ComponentLike@NotNull... args) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), args); } @@ -1253,7 +1253,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @NonNull Style style, final @NonNull ComponentLike@NonNull... args) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull Style style, final @NotNull ComponentLike@NotNull... args) { return new TranslatableComponentImpl(Collections.emptyList(), style, key, args); } @@ -1267,7 +1267,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @NonNull Style style, final @NonNull ComponentLike@NonNull... args) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull Style style, final @NotNull ComponentLike@NotNull... args) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), style, args); } @@ -1281,7 +1281,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @Nullable TextColor color, final @NonNull ComponentLike@NonNull... args) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull ComponentLike@NotNull... args) { return translatable(key, Style.style(color), args); } @@ -1295,7 +1295,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @Nullable TextColor color, final @NonNull ComponentLike@NonNull... args) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull ComponentLike@NotNull... args) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), color, args); } @@ -1310,7 +1310,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @Nullable TextColor color, final @NonNull Set decorations, final @NonNull ComponentLike@NonNull... args) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull Set decorations, final @NotNull ComponentLike@NotNull... args) { return translatable(key, Style.style(color, decorations), args); } @@ -1325,7 +1325,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @Nullable TextColor color, final @NonNull Set decorations, final @NonNull ComponentLike@NonNull... args) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull Set decorations, final @NotNull ComponentLike@NotNull... args) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), color, decorations, args); } @@ -1338,7 +1338,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @NonNull List args) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull List args) { return new TranslatableComponentImpl(Collections.emptyList(), Style.empty(), key, args); } @@ -1351,7 +1351,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @NonNull List args) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull List args) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), args); } @@ -1365,7 +1365,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @NonNull Style style, final @NonNull List args) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @NotNull Style style, final @NotNull List args) { return new TranslatableComponentImpl(Collections.emptyList(), style, key, args); } @@ -1379,7 +1379,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.8.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @NonNull Style style, final @NonNull List args) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @NotNull Style style, final @NotNull List args) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), style, args); } @@ -1393,7 +1393,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex * @since 4.0.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static TranslatableComponent translatable(final @NonNull String key, final @Nullable TextColor color, final @NonNull List args) { + static TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull List args) { return translatable(key, Style.style(color), args); } @@ -1407,7 +1407,7 @@ static TranslatableComponent translatable(final @NonNull String key, final @Null * @since 4.8.0 */ @Contract(value = "_, _, _ -> new", pure = true) - static TranslatableComponent translatable(final @NonNull Translatable translatable, final @Nullable TextColor color, final @NonNull List args) { + static TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull List args) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), color, args); } @@ -1422,7 +1422,7 @@ static TranslatableComponent translatable(final @NonNull Translatable translatab * @since 4.0.0 */ @Contract(value = "_, _, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull String key, final @Nullable TextColor color, final @NonNull Set decorations, final @NonNull List args) { + static @NotNull TranslatableComponent translatable(final @NotNull String key, final @Nullable TextColor color, final @NotNull Set decorations, final @NotNull List args) { return translatable(key, Style.style(color, decorations), args); } @@ -1437,7 +1437,7 @@ static TranslatableComponent translatable(final @NonNull Translatable translatab * @since 4.8.0 */ @Contract(value = "_, _, _, _ -> new", pure = true) - static @NonNull TranslatableComponent translatable(final @NonNull Translatable translatable, final @Nullable TextColor color, final @NonNull Set decorations, final @NonNull List args) { + static @NotNull TranslatableComponent translatable(final @NotNull Translatable translatable, final @Nullable TextColor color, final @NotNull Set decorations, final @NotNull List args) { return translatable(Objects.requireNonNull(translatable, "translatable").translationKey(), color, decorations, args); } @@ -1447,7 +1447,7 @@ static TranslatableComponent translatable(final @NonNull Translatable translatab * @return the unmodifiable list of children * @since 4.0.0 */ - @Unmodifiable @NonNull List children(); + @Unmodifiable @NotNull List children(); /** * Sets the list of children. @@ -1459,7 +1459,7 @@ static TranslatableComponent translatable(final @NonNull Translatable translatab * @since 4.0.0 */ @Contract(pure = true) - @NonNull Component children(final @NonNull List children); + @NotNull Component children(final @NotNull List children); /** * Checks if this component contains a component. @@ -1472,7 +1472,7 @@ static TranslatableComponent translatable(final @NonNull Translatable translatab * component, {@code false} otherwise * @since 4.0.0 */ - default boolean contains(final @NonNull Component that) { + default boolean contains(final @NotNull Component that) { return this.contains(that, EQUALS_IDENTITY); } @@ -1485,7 +1485,7 @@ default boolean contains(final @NonNull Component that) { * component, {@code false} otherwise * @since 4.8.0 */ - default boolean contains(final @NonNull Component that, final @NonNull BiPredicate equals) { + default boolean contains(final @NotNull Component that, final @NotNull BiPredicate equals) { if (equals.test(this, that)) return true; for (final Component child : this.children()) { if (child.contains(that, equals)) return true; @@ -1517,7 +1517,7 @@ default boolean contains(final @NonNull Component that, final @NonNull BiPredica * @since 4.0.0 */ @Deprecated - default void detectCycle(final @NonNull Component that) { + default void detectCycle(final @NotNull Component that) { if (that.contains(this)) { throw new IllegalStateException("Component cycle detected between " + this + " and " + that); } @@ -1531,7 +1531,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - @NonNull Component append(final @NonNull Component component); + @NotNull Component append(final @NotNull Component component); /** * Appends a component to this component. @@ -1540,7 +1540,7 @@ default void detectCycle(final @NonNull Component that) { * @return a component with the component added * @since 4.0.0 */ - default @NonNull Component append(final @NonNull ComponentLike component) { + default @NotNull Component append(final @NotNull ComponentLike component) { return this.append(component.asComponent()); } @@ -1552,7 +1552,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component append(final @NonNull ComponentBuilder builder) { + default @NotNull Component append(final @NotNull ComponentBuilder builder) { return this.append(builder.build()); } @@ -1562,7 +1562,7 @@ default void detectCycle(final @NonNull Component that) { * @return the style of this component * @since 4.0.0 */ - @NonNull Style style(); + @NotNull Style style(); /** * Sets the style of this component. @@ -1572,7 +1572,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - @NonNull Component style(final @NonNull Style style); + @NotNull Component style(final @NotNull Style style); /** * Sets the style of this component. @@ -1582,7 +1582,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component style(final @NonNull Consumer consumer) { + default @NotNull Component style(final @NotNull Consumer consumer) { return this.style(this.style().edit(consumer)); } @@ -1595,7 +1595,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component style(final @NonNull Consumer consumer, final Style.Merge.@NonNull Strategy strategy) { + default @NotNull Component style(final @NotNull Consumer consumer, final Style.Merge.@NotNull Strategy strategy) { return this.style(this.style().edit(consumer, strategy)); } @@ -1607,7 +1607,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component style(final Style.@NonNull Builder style) { + default @NotNull Component style(final Style.@NotNull Builder style) { return this.style(style.build()); } @@ -1619,7 +1619,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component mergeStyle(final @NonNull Component that) { + default @NotNull Component mergeStyle(final @NotNull Component that) { return this.mergeStyle(that, Style.Merge.all()); } @@ -1632,7 +1632,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component mergeStyle(final @NonNull Component that, final Style.@NonNull Merge@NonNull... merges) { + default @NotNull Component mergeStyle(final @NotNull Component that, final Style.@NotNull Merge@NotNull... merges) { return this.mergeStyle(that, Style.Merge.of(merges)); } @@ -1645,7 +1645,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component mergeStyle(final @NonNull Component that, final @NonNull Set merges) { + default @NotNull Component mergeStyle(final @NotNull Component that, final @NotNull Set merges) { return this.style(this.style().merge(that.style(), merges)); } @@ -1667,7 +1667,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component color(final @Nullable TextColor color) { + default @NotNull Component color(final @Nullable TextColor color) { return this.style(this.style().color(color)); } @@ -1679,7 +1679,7 @@ default void detectCycle(final @NonNull Component that) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component colorIfAbsent(final @Nullable TextColor color) { + default @NotNull Component colorIfAbsent(final @Nullable TextColor color) { if (this.color() == null) return this.color(color); return this; } @@ -1692,7 +1692,7 @@ default void detectCycle(final @NonNull Component that) { * component does not have the decoration * @since 4.0.0 */ - default boolean hasDecoration(final @NonNull TextDecoration decoration) { + default boolean hasDecoration(final @NotNull TextDecoration decoration) { return this.decoration(decoration) == TextDecoration.State.TRUE; } @@ -1704,7 +1704,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component decorate(final @NonNull TextDecoration decoration) { + default @NotNull Component decorate(final @NotNull TextDecoration decoration) { return this.decoration(decoration, TextDecoration.State.TRUE); } @@ -1717,7 +1717,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * and {@link TextDecoration.State#NOT_SET} if not set * @since 4.0.0 */ - default TextDecoration.@NonNull State decoration(final @NonNull TextDecoration decoration) { + default TextDecoration.@NotNull State decoration(final @NotNull TextDecoration decoration) { return this.style().decoration(decoration); } @@ -1731,7 +1731,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component decoration(final @NonNull TextDecoration decoration, final boolean flag) { + default @NotNull Component decoration(final @NotNull TextDecoration decoration, final boolean flag) { return this.decoration(decoration, TextDecoration.State.byBoolean(flag)); } @@ -1747,7 +1747,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component decoration(final @NonNull TextDecoration decoration, final TextDecoration.@NonNull State state) { + default @NotNull Component decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) { return this.style(this.style().decoration(decoration, state)); } @@ -1757,7 +1757,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a set of decorations this component has * @since 4.0.0 */ - default @NonNull Map decorations() { + default @NotNull Map decorations() { return this.style().decorations(); } @@ -1771,7 +1771,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component decorations(final @NonNull Map decorations) { + default @NotNull Component decorations(final @NotNull Map decorations) { return this.style(this.style().decorations(decorations)); } @@ -1793,7 +1793,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component clickEvent(final @Nullable ClickEvent event) { + default @NotNull Component clickEvent(final @Nullable ClickEvent event) { return this.style(this.style().clickEvent(event)); } @@ -1815,7 +1815,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component hoverEvent(final @Nullable HoverEventSource source) { + default @NotNull Component hoverEvent(final @Nullable HoverEventSource source) { return this.style(this.style().hoverEvent(source)); } @@ -1837,7 +1837,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @since 4.0.0 */ @Contract(pure = true) - default @NonNull Component insertion(final @Nullable String insertion) { + default @NotNull Component insertion(final @Nullable String insertion) { return this.style(this.style().insertion(insertion)); } @@ -1860,7 +1860,7 @@ default boolean hasStyling() { * @since 4.2.0 */ @Contract(pure = true) - @NonNull Component replaceText(final @NonNull Consumer configurer); + @NotNull Component replaceText(final @NotNull Consumer configurer); /** * Finds and replaces any text with this or child {@link Component}s using the provided options. @@ -1870,7 +1870,7 @@ default boolean hasStyling() { * @since 4.2.0 */ @Contract(pure = true) - @NonNull Component replaceText(final @NonNull TextReplacementConfig config); + @NotNull Component replaceText(final @NotNull TextReplacementConfig config); /** * Finds and replaces text within any {@link Component}s using a string literal. @@ -1884,7 +1884,7 @@ default boolean hasStyling() { @ApiStatus.ScheduledForRemoval @Contract(pure = true) @Deprecated - default @NonNull Component replaceText(final @NonNull String search, final @Nullable ComponentLike replacement) { + default @NotNull Component replaceText(final @NotNull String search, final @Nullable ComponentLike replacement) { return this.replaceText(b -> b.matchLiteral(search).replacement(replacement)); } @@ -1900,7 +1900,7 @@ default boolean hasStyling() { @ApiStatus.ScheduledForRemoval @Contract(pure = true) @Deprecated - default @NonNull Component replaceText(final @NonNull Pattern pattern, final @NonNull Function replacement) { + default @NotNull Component replaceText(final @NotNull Pattern pattern, final @NotNull Function replacement) { return this.replaceText(b -> b.match(pattern).replacement(replacement)); } @@ -1916,7 +1916,7 @@ default boolean hasStyling() { @ApiStatus.ScheduledForRemoval @Contract(pure = true) @Deprecated - default @NonNull Component replaceFirstText(final @NonNull String search, final @Nullable ComponentLike replacement) { + default @NotNull Component replaceFirstText(final @NotNull String search, final @Nullable ComponentLike replacement) { return this.replaceText(b -> b.matchLiteral(search).once().replacement(replacement)); } @@ -1932,7 +1932,7 @@ default boolean hasStyling() { @ApiStatus.ScheduledForRemoval @Contract(pure = true) @Deprecated - default @NonNull Component replaceFirstText(final @NonNull Pattern pattern, final @NonNull Function replacement) { + default @NotNull Component replaceFirstText(final @NotNull Pattern pattern, final @NotNull Function replacement) { return this.replaceText(b -> b.match(pattern).once().replacement(replacement)); } @@ -1949,7 +1949,7 @@ default boolean hasStyling() { @ApiStatus.ScheduledForRemoval @Contract(pure = true) @Deprecated - default @NonNull Component replaceText(final @NonNull String search, final @Nullable ComponentLike replacement, final int numberOfReplacements) { + default @NotNull Component replaceText(final @NotNull String search, final @Nullable ComponentLike replacement, final int numberOfReplacements) { return this.replaceText(b -> b.matchLiteral(search).times(numberOfReplacements).replacement(replacement)); } @@ -1966,7 +1966,7 @@ default boolean hasStyling() { @ApiStatus.ScheduledForRemoval @Contract(pure = true) @Deprecated - default @NonNull Component replaceText(final @NonNull Pattern pattern, final @NonNull Function replacement, final int numberOfReplacements) { + default @NotNull Component replaceText(final @NotNull Pattern pattern, final @NotNull Function replacement, final int numberOfReplacements) { return this.replaceText(b -> b.match(pattern).times(numberOfReplacements).replacement(replacement)); } @@ -1985,7 +1985,7 @@ default boolean hasStyling() { @ApiStatus.ScheduledForRemoval @Contract(pure = true) @Deprecated - default @NonNull Component replaceText(final @NonNull String search, final @Nullable ComponentLike replacement, final @NonNull IntFunction2 fn) { + default @NotNull Component replaceText(final @NotNull String search, final @Nullable ComponentLike replacement, final @NotNull IntFunction2 fn) { return this.replaceText(b -> b.matchLiteral(search).replacement(replacement).condition(fn)); } @@ -2004,22 +2004,22 @@ default boolean hasStyling() { @ApiStatus.ScheduledForRemoval @Contract(pure = true) @Deprecated - default @NonNull Component replaceText(final @NonNull Pattern pattern, final @NonNull Function replacement, final @NonNull IntFunction2 fn) { + default @NotNull Component replaceText(final @NotNull Pattern pattern, final @NotNull Function replacement, final @NotNull IntFunction2 fn) { return this.replaceText(b -> b.match(pattern).replacement(replacement).condition(fn)); } @Override - default void componentBuilderApply(final @NonNull ComponentBuilder component) { + default void componentBuilderApply(final @NotNull ComponentBuilder component) { component.append(this); } @Override - default @NonNull Component asComponent() { + default @NotNull Component asComponent() { return this; } @Override - default @NonNull HoverEvent asHoverEvent(final @NonNull UnaryOperator op) { + default @NotNull HoverEvent asHoverEvent(final @NotNull UnaryOperator op) { return HoverEvent.showText(op.apply(this)); } } 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 98324a569..f9691157b 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.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * Something that can be applied to a {@link Component}. @@ -39,5 +39,5 @@ public interface ComponentApplicable { * @return a component with something applied. * @since 4.0.0 */ - @NonNull Component componentApply(final @NonNull Component component); + @NotNull Component componentApply(final @NotNull 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 7bfc67560..ea3520454 100644 --- a/api/src/main/java/net/kyori/adventure/text/ComponentBuilder.java +++ b/api/src/main/java/net/kyori/adventure/text/ComponentBuilder.java @@ -34,9 +34,9 @@ import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.util.Buildable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A component builder. @@ -54,7 +54,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B append(final @NonNull Component component); + @NotNull B append(final @NotNull Component component); /** * Appends a component to this component. @@ -64,7 +64,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - default @NonNull B append(final @NonNull ComponentLike component) { + default @NotNull B append(final @NotNull ComponentLike component) { return this.append(component.asComponent()); } @@ -76,7 +76,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - default @NonNull B append(final @NonNull ComponentBuilder builder) { + default @NotNull B append(final @NotNull ComponentBuilder builder) { return this.append(builder.build()); } @@ -88,7 +88,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B append(final @NonNull Component@NonNull... components); + @NotNull B append(final @NotNull Component@NotNull... components); /** * Appends components to this component. @@ -98,7 +98,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B append(final @NonNull ComponentLike@NonNull... components); + @NotNull B append(final @NotNull ComponentLike@NotNull... components); /** * Appends components to this component. @@ -108,7 +108,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B append(final @NonNull Iterable components); + @NotNull B append(final @NotNull Iterable components); /** * Applies an action to this builder. @@ -119,7 +119,7 @@ public interface ComponentBuilder, B extends */ @Contract("_ -> this") @SuppressWarnings("unchecked") - default @NonNull B apply(final @NonNull Consumer> consumer) { + default @NotNull B apply(final @NotNull Consumer> consumer) { consumer.accept(this); return (B) this; } @@ -133,7 +133,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B applyDeep(final @NonNull Consumer> action); + @NotNull B applyDeep(final @NotNull Consumer> action); /** * Replaces each child of this component with the resultant component from the function. @@ -143,7 +143,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B mapChildren(final @NonNull Function, ? extends BuildableComponent> function); + @NotNull B mapChildren(final @NotNull Function, ? extends BuildableComponent> function); /** * Replaces each child and sub-child of this component with the resultant @@ -154,7 +154,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B mapChildrenDeep(final @NonNull Function, ? extends BuildableComponent> function); + @NotNull B mapChildrenDeep(final @NotNull Function, ? extends BuildableComponent> function); /** * Get an unmodifiable list containing all children currently in this builder. @@ -162,7 +162,7 @@ public interface ComponentBuilder, B extends * @return the list of children * @since 4.6.0 */ - @NonNull List children(); + @NotNull List children(); /** * Sets the style. @@ -172,7 +172,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B style(final @NonNull Style style); + @NotNull B style(final @NotNull Style style); /** * Configures the style. @@ -182,7 +182,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B style(final @NonNull Consumer consumer); + @NotNull B style(final @NotNull Consumer consumer); /** * Sets the font of this component. @@ -192,7 +192,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B font(final @Nullable Key font); + @NotNull B font(final @Nullable Key font); /** * Sets the color of this component. @@ -202,7 +202,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B color(final @Nullable TextColor color); + @NotNull B color(final @Nullable TextColor color); /** * Sets the color of this component if there isn't one set already. @@ -212,7 +212,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B colorIfAbsent(final @Nullable TextColor color); + @NotNull B colorIfAbsent(final @Nullable TextColor color); /** * Sets the state of a set of decorations to {@code flag} on this component. @@ -225,7 +225,7 @@ public interface ComponentBuilder, B extends */ @Contract("_, _ -> this") @SuppressWarnings("unchecked") - default @NonNull B decorations(final @NonNull Set decorations, final boolean flag) { + default @NotNull B decorations(final @NotNull Set decorations, final boolean flag) { final TextDecoration.State state = TextDecoration.State.byBoolean(flag); decorations.forEach(decoration -> this.decoration(decoration, state)); return (B) this; @@ -239,7 +239,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - default @NonNull B decorate(final @NonNull TextDecoration decoration) { + default @NotNull B decorate(final @NotNull TextDecoration decoration) { return this.decoration(decoration, TextDecoration.State.TRUE); } @@ -252,7 +252,7 @@ public interface ComponentBuilder, B extends */ @Contract("_ -> this") @SuppressWarnings("unchecked") - default @NonNull B decorate(final @NonNull TextDecoration@NonNull... decorations) { + default @NotNull B decorate(final @NotNull TextDecoration@NotNull... decorations) { for (int i = 0, length = decorations.length; i < length; i++) { this.decorate(decorations[i]); } @@ -269,7 +269,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_, _ -> this") - default @NonNull B decoration(final @NonNull TextDecoration decoration, final boolean flag) { + default @NotNull B decoration(final @NotNull TextDecoration decoration, final boolean flag) { return this.decoration(decoration, TextDecoration.State.byBoolean(flag)); } @@ -285,7 +285,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_, _ -> this") - @NonNull B decoration(final @NonNull TextDecoration decoration, final TextDecoration.@NonNull State state); + @NotNull B decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state); /** * Sets the click event of this component. @@ -295,7 +295,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B clickEvent(final @Nullable ClickEvent event); + @NotNull B clickEvent(final @Nullable ClickEvent event); /** * Sets the hover event of this component. @@ -305,7 +305,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B hoverEvent(final @Nullable HoverEventSource source); + @NotNull B hoverEvent(final @Nullable HoverEventSource source); /** * Sets the string to be inserted when this component is shift-clicked. @@ -315,7 +315,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B insertion(final @Nullable String insertion); + @NotNull B insertion(final @Nullable String insertion); /** * Merges styling from another component into this component. @@ -325,7 +325,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_ -> this") - default @NonNull B mergeStyle(final @NonNull Component that) { + default @NotNull B mergeStyle(final @NotNull Component that) { return this.mergeStyle(that, Style.Merge.all()); } @@ -338,7 +338,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_, _ -> this") - default @NonNull B mergeStyle(final @NonNull Component that, final Style.@NonNull Merge@NonNull... merges) { + default @NotNull B mergeStyle(final @NotNull Component that, final Style.@NotNull Merge@NotNull... merges) { return this.mergeStyle(that, Style.Merge.of(merges)); } @@ -351,7 +351,7 @@ public interface ComponentBuilder, B extends * @since 4.0.0 */ @Contract("_, _ -> this") - @NonNull B mergeStyle(final @NonNull Component that, final @NonNull Set merges); + @NotNull B mergeStyle(final @NotNull Component that, final @NotNull Set merges); /** * Resets all styling on this component. @@ -359,7 +359,7 @@ public interface ComponentBuilder, B extends * @return this builder * @since 4.0.0 */ - @NonNull B resetStyle(); + @NotNull B resetStyle(); /** * Build a component. @@ -367,7 +367,7 @@ public interface ComponentBuilder, B extends * @return the component */ @Override - @NonNull C build(); + @NotNull C build(); /** * Applies {@code applicable}. @@ -378,18 +378,18 @@ public interface ComponentBuilder, B extends */ @Contract("_ -> this") @SuppressWarnings("unchecked") - default @NonNull B applicableApply(final @NonNull ComponentBuilderApplicable applicable) { + default @NotNull B applicableApply(final @NotNull ComponentBuilderApplicable applicable) { applicable.componentBuilderApply(this); return (B) this; } @Override - default void componentBuilderApply(final @NonNull ComponentBuilder component) { + default void componentBuilderApply(final @NotNull ComponentBuilder component) { component.append(this); } @Override - default @NonNull Component asComponent() { + default @NotNull 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 60a34e101..f50a31909 100644 --- a/api/src/main/java/net/kyori/adventure/text/ComponentBuilderApplicable.java +++ b/api/src/main/java/net/kyori/adventure/text/ComponentBuilderApplicable.java @@ -24,8 +24,8 @@ package net.kyori.adventure.text; import net.kyori.adventure.text.format.StyleBuilderApplicable; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; /** * Something that can be applied to a {@link ComponentBuilder}. @@ -42,5 +42,5 @@ public interface ComponentBuilderApplicable { * @since 4.0.0 */ @Contract(mutates = "param") - void componentBuilderApply(final @NonNull ComponentBuilder component); + void componentBuilderApply(final @NotNull ComponentBuilder component); } 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 ab67e4001..62b66bde1 100644 --- a/api/src/main/java/net/kyori/adventure/text/ComponentLike.java +++ b/api/src/main/java/net/kyori/adventure/text/ComponentLike.java @@ -27,9 +27,9 @@ import java.util.Collections; import java.util.List; import java.util.function.Predicate; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Something that can be represented as a {@link Component}. @@ -45,7 +45,7 @@ public interface ComponentLike { * @return the components * @since 4.8.0 */ - static @NonNull List asComponents(final @NonNull List likes) { + static @NotNull List asComponents(final @NotNull List likes) { return asComponents(likes, null); } @@ -59,7 +59,7 @@ public interface ComponentLike { * @return the components * @since 4.8.0 */ - static @NonNull List asComponents(final @NonNull List likes, final @Nullable Predicate filter) { + static @NotNull List asComponents(final @NotNull List likes, final @Nullable Predicate filter) { if (likes.isEmpty()) { // We do not need to create a new list if the one we are copying is empty - we can // simply just return our known-empty list instead. @@ -94,5 +94,5 @@ public interface ComponentLike { * @since 4.0.0 */ @Contract(pure = true) - @NonNull Component asComponent(); + @NotNull 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 0ac086be5..da302f95c 100644 --- a/api/src/main/java/net/kyori/adventure/text/EntityNBTComponent.java +++ b/api/src/main/java/net/kyori/adventure/text/EntityNBTComponent.java @@ -23,8 +23,8 @@ */ package net.kyori.adventure.text; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; /** * Given a Minecraft selector, this component reads the NBT of the associated entity and displays that information. @@ -48,7 +48,7 @@ public interface EntityNBTComponent extends NBTComponent { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder selector(final @NonNull String selector); + @NotNull Builder selector(final @NotNull 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 4b5a0ba52..16f398bcf 100644 --- a/api/src/main/java/net/kyori/adventure/text/EntityNBTComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/EntityNBTComponentImpl.java @@ -28,47 +28,47 @@ import java.util.stream.Stream; import net.kyori.adventure.text.format.Style; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; final class EntityNBTComponentImpl extends NBTComponentImpl implements EntityNBTComponent { private final String selector; - EntityNBTComponentImpl(final @NonNull List children, final @NonNull Style style, final String nbtPath, final boolean interpret, final String selector) { + EntityNBTComponentImpl(final @NotNull List children, final @NotNull Style style, final String nbtPath, final boolean interpret, final String selector) { super(children, style, nbtPath, interpret); this.selector = selector; } @Override - public @NonNull EntityNBTComponent nbtPath(final @NonNull String nbtPath) { + public @NotNull EntityNBTComponent nbtPath(final @NotNull String nbtPath) { if (Objects.equals(this.nbtPath, nbtPath)) return this; return new EntityNBTComponentImpl(this.children, this.style, nbtPath, this.interpret, this.selector); } @Override - public @NonNull EntityNBTComponent interpret(final boolean interpret) { + public @NotNull EntityNBTComponent interpret(final boolean interpret) { if (this.interpret == interpret) return this; return new EntityNBTComponentImpl(this.children, this.style, this.nbtPath, interpret, this.selector); } @Override - public @NonNull String selector() { + public @NotNull String selector() { return this.selector; } @Override - public @NonNull EntityNBTComponent selector(final @NonNull String selector) { + public @NotNull EntityNBTComponent selector(final @NotNull String selector) { if (Objects.equals(this.selector, selector)) return this; return new EntityNBTComponentImpl(this.children, this.style, this.nbtPath, this.interpret, selector); } @Override - public @NonNull EntityNBTComponent children(final @NonNull List children) { + public @NotNull EntityNBTComponent children(final @NotNull List children) { return new EntityNBTComponentImpl(children, this.style, this.nbtPath, this.interpret, this.selector); } @Override - public @NonNull EntityNBTComponent style(final @NonNull Style style) { + public @NotNull EntityNBTComponent style(final @NotNull Style style) { return new EntityNBTComponentImpl(this.children, style, this.nbtPath, this.interpret, this.selector); } @@ -89,7 +89,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("selector", this.selector) @@ -99,7 +99,7 @@ public int hashCode() { } @Override - public EntityNBTComponent.@NonNull Builder toBuilder() { + public EntityNBTComponent.@NotNull Builder toBuilder() { return new BuilderImpl(this); } @@ -109,19 +109,19 @@ static final class BuilderImpl extends NBTComponentImpl.BuilderImpl { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder keybind(final @NonNull String keybind); + @NotNull Builder keybind(final @NotNull String keybind); } } 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 dd4dd1be5..888bd2309 100644 --- a/api/src/main/java/net/kyori/adventure/text/KeybindComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/KeybindComponentImpl.java @@ -28,37 +28,37 @@ import java.util.stream.Stream; import net.kyori.adventure.text.format.Style; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; final class KeybindComponentImpl extends AbstractComponent implements KeybindComponent { private final String keybind; - KeybindComponentImpl(final @NonNull List children, final @NonNull Style style, final @NonNull String keybind) { + KeybindComponentImpl(final @NotNull List children, final @NotNull Style style, final @NotNull String keybind) { super(children, style); this.keybind = requireNonNull(keybind, "keybind"); } @Override - public @NonNull String keybind() { + public @NotNull String keybind() { return this.keybind; } @Override - public @NonNull KeybindComponent keybind(final @NonNull String keybind) { + public @NotNull KeybindComponent keybind(final @NotNull String keybind) { if (Objects.equals(this.keybind, keybind)) return this; return new KeybindComponentImpl(this.children, this.style, requireNonNull(keybind, "keybind")); } @Override - public @NonNull KeybindComponent children(final @NonNull List children) { + public @NotNull KeybindComponent children(final @NotNull List children) { return new KeybindComponentImpl(children, this.style, this.keybind); } @Override - public @NonNull KeybindComponent style(final @NonNull Style style) { + public @NotNull KeybindComponent style(final @NotNull Style style) { return new KeybindComponentImpl(this.children, style, this.keybind); } @@ -79,7 +79,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("keybind", this.keybind) @@ -89,7 +89,7 @@ public int hashCode() { } @Override - public @NonNull Builder toBuilder() { + public @NotNull Builder toBuilder() { return new BuilderImpl(this); } @@ -99,19 +99,19 @@ static final class BuilderImpl extends AbstractComponentBuilder, B extends NBTCompone * @return the NBT path * @since 4.0.0 */ - @NonNull String nbtPath(); + @NotNull String nbtPath(); /** * Sets the NBT path. @@ -63,7 +63,7 @@ public interface NBTComponent, B extends NBTCompone * @since 4.0.0 */ @Contract(pure = true) - @NonNull C nbtPath(final @NonNull String nbtPath); + @NotNull C nbtPath(final @NotNull String nbtPath); /** * Gets if we should be interpreting. @@ -81,5 +81,5 @@ public interface NBTComponent, B extends NBTCompone * @since 4.0.0 */ @Contract(pure = true) - @NonNull C interpret(final boolean interpret); + @NotNull C interpret(final boolean interpret); } 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 42c859fa9..db27d5e0f 100644 --- a/api/src/main/java/net/kyori/adventure/text/NBTComponentBuilder.java +++ b/api/src/main/java/net/kyori/adventure/text/NBTComponentBuilder.java @@ -23,8 +23,8 @@ */ package net.kyori.adventure.text; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; /* * This can't be a child of NBTComponent. @@ -44,7 +44,7 @@ public interface NBTComponentBuilder, B extends NBT * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B nbtPath(final @NonNull String nbtPath); + @NotNull B nbtPath(final @NotNull String nbtPath); /** * Sets whether to interpret. @@ -54,5 +54,5 @@ public interface NBTComponentBuilder, B extends NBT * @since 4.0.0 */ @Contract("_ -> this") - @NonNull B interpret(final boolean interpret); + @NotNull B interpret(final boolean interpret); } 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 a8a62f0ee..9cd247596 100644 --- a/api/src/main/java/net/kyori/adventure/text/NBTComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/NBTComponentImpl.java @@ -28,22 +28,22 @@ import java.util.stream.Stream; import net.kyori.adventure.text.format.Style; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; abstract class NBTComponentImpl, B extends NBTComponentBuilder> extends AbstractComponent implements NBTComponent { static final boolean INTERPRET_DEFAULT = false; final String nbtPath; final boolean interpret; - NBTComponentImpl(final @NonNull List children, final @NonNull Style style, final String nbtPath, final boolean interpret) { + NBTComponentImpl(final @NotNull List children, final @NotNull Style style, final String nbtPath, final boolean interpret) { super(children, style); this.nbtPath = nbtPath; this.interpret = interpret; } @Override - public @NonNull String nbtPath() { + public @NotNull String nbtPath() { return this.nbtPath; } @@ -70,7 +70,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("nbtPath", this.nbtPath), @@ -87,7 +87,7 @@ static abstract class BuilderImpl, B extends NBTCom BuilderImpl() { } - BuilderImpl(final @NonNull C component) { + BuilderImpl(final @NotNull C component) { super(component); this.nbtPath = component.nbtPath(); this.interpret = component.interpret(); @@ -95,14 +95,14 @@ static abstract class BuilderImpl, B extends NBTCom @Override @SuppressWarnings("unchecked") - public @NonNull B nbtPath(final @NonNull String nbtPath) { + public @NotNull B nbtPath(final @NotNull String nbtPath) { this.nbtPath = nbtPath; return (B) this; } @Override @SuppressWarnings("unchecked") - public @NonNull B interpret(final boolean interpret) { + public @NotNull B interpret(final boolean interpret) { this.interpret = interpret; return (B) this; } 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 31eaf2dbd..fabb7940f 100644 --- a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java +++ b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java @@ -32,8 +32,8 @@ import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.util.MonkeyBars; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Some magic to change return types. @@ -43,38 +43,38 @@ */ public interface ScopedComponent extends Component { @Override - @NonNull C children(final @NonNull List children); + @NotNull C children(final @NotNull List children); @Override - @NonNull C style(final @NonNull Style style); + @NotNull C style(final @NotNull Style style); @Override @SuppressWarnings("unchecked") - default @NonNull C style(final @NonNull Consumer style) { + default @NotNull C style(final @NotNull Consumer style) { return (C) Component.super.style(style); } @Override @SuppressWarnings("unchecked") - default @NonNull C style(final Style.@NonNull Builder style) { + default @NotNull C style(final Style.@NotNull Builder style) { return (C) Component.super.style(style); } @Override @SuppressWarnings("unchecked") - default @NonNull C mergeStyle(final @NonNull Component that) { + default @NotNull C mergeStyle(final @NotNull Component that) { return (C) Component.super.mergeStyle(that); } @Override @SuppressWarnings("unchecked") - default @NonNull C mergeStyle(final @NonNull Component that, final Style.@NonNull Merge@NonNull... merges) { + default @NotNull C mergeStyle(final @NotNull Component that, final Style.@NotNull Merge@NotNull... merges) { return (C) Component.super.mergeStyle(that, merges); } @Override @SuppressWarnings("unchecked") - default @NonNull C append(final @NonNull Component component) { + default @NotNull C append(final @NotNull Component component) { if (component == Component.empty()) return (C) this; final List oldChildren = this.children(); return this.children(MonkeyBars.addOne(oldChildren, component)); @@ -82,67 +82,67 @@ public interface ScopedComponent extends Component { @Override @SuppressWarnings("unchecked") - default @NonNull C append(final @NonNull ComponentLike component) { + default @NotNull C append(final @NotNull ComponentLike component) { return (C) Component.super.append(component); } @Override @SuppressWarnings("unchecked") - default @NonNull C append(final @NonNull ComponentBuilder builder) { + default @NotNull C append(final @NotNull ComponentBuilder builder) { return (C) Component.super.append(builder); } @Override @SuppressWarnings("unchecked") - default @NonNull C mergeStyle(final @NonNull Component that, final @NonNull Set merges) { + default @NotNull C mergeStyle(final @NotNull Component that, final @NotNull Set merges) { return (C) Component.super.mergeStyle(that, merges); } @Override @SuppressWarnings("unchecked") - default @NonNull C color(final @Nullable TextColor color) { + default @NotNull C color(final @Nullable TextColor color) { return (C) Component.super.color(color); } @Override @SuppressWarnings("unchecked") - default @NonNull C colorIfAbsent(final @Nullable TextColor color) { + default @NotNull C colorIfAbsent(final @Nullable TextColor color) { return (C) Component.super.colorIfAbsent(color); } @Override @SuppressWarnings("unchecked") - default @NonNull Component decorate(final @NonNull TextDecoration decoration) { + default @NotNull Component decorate(final @NotNull TextDecoration decoration) { return (C) Component.super.decorate(decoration); } @Override @SuppressWarnings("unchecked") - default @NonNull C decoration(final @NonNull TextDecoration decoration, final boolean flag) { + default @NotNull C decoration(final @NotNull TextDecoration decoration, final boolean flag) { return (C) Component.super.decoration(decoration, flag); } @Override @SuppressWarnings("unchecked") - default @NonNull C decoration(final @NonNull TextDecoration decoration, final TextDecoration.@NonNull State state) { + default @NotNull C decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) { return (C) Component.super.decoration(decoration, state); } @Override @SuppressWarnings("unchecked") - default @NonNull C clickEvent(final @Nullable ClickEvent event) { + default @NotNull C clickEvent(final @Nullable ClickEvent event) { return (C) Component.super.clickEvent(event); } @Override @SuppressWarnings("unchecked") - default @NonNull C hoverEvent(final @Nullable HoverEventSource event) { + default @NotNull C hoverEvent(final @Nullable HoverEventSource event) { return (C) Component.super.hoverEvent(event); } @Override @SuppressWarnings("unchecked") - default @NonNull C insertion(final @Nullable String insertion) { + default @NotNull 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 ec54c8b64..e95d10db5 100644 --- a/api/src/main/java/net/kyori/adventure/text/ScoreComponent.java +++ b/api/src/main/java/net/kyori/adventure/text/ScoreComponent.java @@ -23,9 +23,9 @@ */ package net.kyori.adventure.text; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A component that can display a player's score from a scoreboard objective, @@ -56,7 +56,7 @@ public interface ScoreComponent extends BuildableComponent { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder name(final @NonNull String name); + @NotNull Builder name(final @NotNull String name); /** * Sets the score objective. @@ -132,7 +132,7 @@ interface Builder extends ComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder objective(final @NonNull String objective); + @NotNull Builder objective(final @NotNull String objective); /** * Sets the value. @@ -144,6 +144,6 @@ interface Builder extends ComponentBuilder { */ @Deprecated @Contract("_ -> this") - @NonNull Builder value(final @Nullable String value); + @NotNull 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 88f5c91f6..45d0e030b 100644 --- a/api/src/main/java/net/kyori/adventure/text/ScoreComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/ScoreComponentImpl.java @@ -28,8 +28,8 @@ import java.util.stream.Stream; import net.kyori.adventure.text.format.Style; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; @@ -39,7 +39,7 @@ final class ScoreComponentImpl extends AbstractComponent implements ScoreCompone @Deprecated private final @Nullable String value; - ScoreComponentImpl(final @NonNull List children, final @NonNull Style style, final @NonNull String name, final @NonNull String objective, final @Nullable String value) { + ScoreComponentImpl(final @NotNull List children, final @NotNull Style style, final @NotNull String name, final @NotNull String objective, final @Nullable String value) { super(children, style); this.name = name; this.objective = objective; @@ -47,23 +47,23 @@ final class ScoreComponentImpl extends AbstractComponent implements ScoreCompone } @Override - public @NonNull String name() { + public @NotNull String name() { return this.name; } @Override - public @NonNull ScoreComponent name(final @NonNull String name) { + public @NotNull ScoreComponent name(final @NotNull String name) { if (Objects.equals(this.name, name)) return this; return new ScoreComponentImpl(this.children, this.style, requireNonNull(name, "name"), this.objective, this.value); } @Override - public @NonNull String objective() { + public @NotNull String objective() { return this.objective; } @Override - public @NonNull ScoreComponent objective(final @NonNull String objective) { + public @NotNull ScoreComponent objective(final @NotNull String objective) { if (Objects.equals(this.objective, objective)) return this; return new ScoreComponentImpl(this.children, this.style, this.name, requireNonNull(objective, "objective"), this.value); } @@ -76,18 +76,18 @@ final class ScoreComponentImpl extends AbstractComponent implements ScoreCompone @Override @Deprecated - public @NonNull ScoreComponent value(final @Nullable String value) { + public @NotNull ScoreComponent value(final @Nullable String value) { if (Objects.equals(this.value, value)) return this; return new ScoreComponentImpl(this.children, this.style, this.name, this.objective, value); } @Override - public @NonNull ScoreComponent children(final @NonNull List children) { + public @NotNull ScoreComponent children(final @NotNull List children) { return new ScoreComponentImpl(children, this.style, this.name, this.objective, this.value); } @Override - public @NonNull ScoreComponent style(final @NonNull Style style) { + public @NotNull ScoreComponent style(final @NotNull Style style) { return new ScoreComponentImpl(this.children, style, this.name, this.objective, this.value); } @@ -113,7 +113,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("name", this.name), @@ -125,7 +125,7 @@ public int hashCode() { } @Override - public @NonNull Builder toBuilder() { + public @NotNull Builder toBuilder() { return new BuilderImpl(this); } @@ -138,7 +138,7 @@ static final class BuilderImpl extends AbstractComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder pattern(final @NonNull String pattern); + @NotNull Builder pattern(final @NotNull String pattern); } } 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 07b9bfca0..144b96456 100644 --- a/api/src/main/java/net/kyori/adventure/text/SelectorComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/SelectorComponentImpl.java @@ -28,37 +28,37 @@ import java.util.stream.Stream; import net.kyori.adventure.text.format.Style; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; final class SelectorComponentImpl extends AbstractComponent implements SelectorComponent { private final String pattern; - SelectorComponentImpl(final @NonNull List children, final @NonNull Style style, final @NonNull String pattern) { + SelectorComponentImpl(final @NotNull List children, final @NotNull Style style, final @NotNull String pattern) { super(children, style); this.pattern = pattern; } @Override - public @NonNull String pattern() { + public @NotNull String pattern() { return this.pattern; } @Override - public @NonNull SelectorComponent pattern(final @NonNull String pattern) { + public @NotNull SelectorComponent pattern(final @NotNull String pattern) { if (Objects.equals(this.pattern, pattern)) return this; return new SelectorComponentImpl(this.children, this.style, requireNonNull(pattern, "pattern")); } @Override - public @NonNull SelectorComponent children(final @NonNull List children) { + public @NotNull SelectorComponent children(final @NotNull List children) { return new SelectorComponentImpl(children, this.style, this.pattern); } @Override - public @NonNull SelectorComponent style(final @NonNull Style style) { + public @NotNull SelectorComponent style(final @NotNull Style style) { return new SelectorComponentImpl(this.children, style, this.pattern); } @@ -79,7 +79,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("pattern", this.pattern) @@ -89,7 +89,7 @@ public int hashCode() { } @Override - public @NonNull Builder toBuilder() { + public @NotNull Builder toBuilder() { return new BuilderImpl(this); } @@ -99,19 +99,19 @@ static final class BuilderImpl extends AbstractComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder storage(final @NonNull Key storage); + @NotNull Builder storage(final @NotNull 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 55d54fdd6..3860319c8 100644 --- a/api/src/main/java/net/kyori/adventure/text/StorageNBTComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/StorageNBTComponentImpl.java @@ -29,48 +29,47 @@ import net.kyori.adventure.key.Key; import net.kyori.adventure.text.format.Style; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; final class StorageNBTComponentImpl extends NBTComponentImpl implements StorageNBTComponent { private final Key storage; - StorageNBTComponentImpl(final @NonNull List children, final @NonNull Style style, final String nbtPath, final boolean interpret, final Key storage) { + StorageNBTComponentImpl(final @NotNull List children, final @NotNull Style style, final String nbtPath, final boolean interpret, final Key storage) { super(children, style, nbtPath, interpret); this.storage = storage; } @Override - public @NonNull StorageNBTComponent nbtPath(final @NonNull String nbtPath) { + public @NotNull StorageNBTComponent nbtPath(final @NotNull String nbtPath) { if (Objects.equals(this.nbtPath, nbtPath)) return this; return new StorageNBTComponentImpl(this.children, this.style, nbtPath, this.interpret, this.storage); } @Override - public @NonNull StorageNBTComponent interpret(final boolean interpret) { + public @NotNull StorageNBTComponent interpret(final boolean interpret) { if (this.interpret == interpret) return this; return new StorageNBTComponentImpl(this.children, this.style, this.nbtPath, interpret, this.storage); } @Override - public @NonNull Key storage() { + public @NotNull Key storage() { return this.storage; } @Override - public @NonNull StorageNBTComponent storage(final @NonNull Key storage) { + public @NotNull StorageNBTComponent storage(final @NotNull Key storage) { if (Objects.equals(this.storage, storage)) return this; return new StorageNBTComponentImpl(this.children, this.style, this.nbtPath, this.interpret, storage); } @Override - public @NonNull StorageNBTComponent children(final @NonNull List children) { + public @NotNull StorageNBTComponent children(final @NotNull List children) { return new StorageNBTComponentImpl(children, this.style, this.nbtPath, this.interpret, this.storage); } @Override - public @NonNull StorageNBTComponent style(final @NonNull Style style) { + public @NotNull StorageNBTComponent style(final @NotNull Style style) { return new StorageNBTComponentImpl(this.children, style, this.nbtPath, this.interpret, this.storage); } @@ -91,7 +90,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("storage", this.storage) @@ -101,29 +100,29 @@ public int hashCode() { } @Override - public StorageNBTComponent.@NonNull Builder toBuilder() { + public StorageNBTComponent.@NotNull Builder toBuilder() { return new BuilderImpl(this); } static class BuilderImpl extends NBTComponentImpl.BuilderImpl implements StorageNBTComponent.Builder { - private @MonotonicNonNull Key storage; + private @Nullable Key storage; BuilderImpl() { } - BuilderImpl(final @NonNull StorageNBTComponent component) { + BuilderImpl(final @NotNull StorageNBTComponent component) { super(component); this.storage = component.storage(); } @Override - public StorageNBTComponent.@NonNull Builder storage(final @NonNull Key storage) { + public StorageNBTComponent.@NotNull Builder storage(final @NotNull Key storage) { this.storage = storage; return this; } @Override - public @NonNull StorageNBTComponent build() { + public @NotNull 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 new StorageNBTComponentImpl(this.children, this.buildStyle(), this.nbtPath, this.interpret, 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 ceaaa21f2..777988d4f 100644 --- a/api/src/main/java/net/kyori/adventure/text/TextComponent.java +++ b/api/src/main/java/net/kyori/adventure/text/TextComponent.java @@ -25,8 +25,8 @@ import java.util.Arrays; import net.kyori.adventure.text.format.Style; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; /** * A component that displays a string. @@ -47,7 +47,7 @@ public interface TextComponent extends BuildableComponent { * @return the plain text content * @since 4.0.0 */ - @NonNull String content(); + @NotNull String content(); /** * Sets the plain text content. @@ -92,6 +92,6 @@ interface Builder extends ComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder content(final @NonNull String content); + @NotNull Builder content(final @NotNull 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 41bcdddb2..421b5105e 100644 --- a/api/src/main/java/net/kyori/adventure/text/TextComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/TextComponentImpl.java @@ -30,8 +30,8 @@ import net.kyori.adventure.text.format.Style; import net.kyori.adventure.util.Nag; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.VisibleForTesting; import static java.util.Objects.requireNonNull; @@ -45,13 +45,13 @@ final class TextComponentImpl extends AbstractComponent implements TextComponent static final TextComponent NEWLINE = createDirect("\n"); static final TextComponent SPACE = createDirect(" "); - private static @NonNull TextComponent createDirect(final @NonNull String content) { + private static @NotNull TextComponent createDirect(final @NotNull String content) { return new TextComponentImpl(Collections.emptyList(), Style.empty(), content); } private final String content; - TextComponentImpl(final @NonNull List children, final @NonNull Style style, final @NonNull String content) { + TextComponentImpl(final @NotNull List children, final @NotNull Style style, final @NotNull String content) { super(children, style); this.content = content; @@ -72,23 +72,23 @@ final class TextComponentImpl extends AbstractComponent implements TextComponent } @Override - public @NonNull String content() { + public @NotNull String content() { return this.content; } @Override - public @NonNull TextComponent content(final @NonNull String content) { + public @NotNull TextComponent content(final @NotNull String content) { if (Objects.equals(this.content, content)) return this; return new TextComponentImpl(this.children, this.style, requireNonNull(content, "content")); } @Override - public @NonNull TextComponent children(final @NonNull List children) { + public @NotNull TextComponent children(final @NotNull List children) { return new TextComponentImpl(children, this.style, this.content); } @Override - public @NonNull TextComponent style(final @NonNull Style style) { + public @NotNull TextComponent style(final @NotNull Style style) { return new TextComponentImpl(this.children, style, this.content); } @@ -109,7 +109,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("content", this.content) @@ -119,7 +119,7 @@ public int hashCode() { } @Override - public @NonNull Builder toBuilder() { + public @NotNull Builder toBuilder() { return new BuilderImpl(this); } @@ -134,24 +134,24 @@ static final class BuilderImpl extends AbstractComponentBuilder this") - default @NonNull Builder match(final @NonNull @RegExp String pattern) { + default @NotNull Builder match(final @NotNull @RegExp String pattern) { return this.match(Pattern.compile(pattern)); } @@ -110,7 +110,7 @@ default Builder matchLiteral(final String literal) { * @since 4.2.0 */ @Contract("_ -> this") - @NonNull Builder match(final @NonNull Pattern pattern); + @NotNull Builder match(final @NotNull Pattern pattern); /* * --------------------------- @@ -124,7 +124,7 @@ default Builder matchLiteral(final String literal) { * @return this builder * @since 4.2.0 */ - default @NonNull Builder once() { + default @NotNull Builder once() { return this.times(1); } @@ -136,7 +136,7 @@ default Builder matchLiteral(final String literal) { * @since 4.2.0 */ @Contract("_ -> this") - default @NonNull Builder times(final int times) { + default @NotNull Builder times(final int times) { return this.condition((index, replaced) -> replaced < times ? PatternReplacementResult.REPLACE : PatternReplacementResult.STOP); } @@ -149,7 +149,7 @@ default Builder matchLiteral(final String literal) { * @since 4.2.0 */ @Contract("_ -> this") - default @NonNull Builder condition(final @NonNull IntFunction2 condition) { + default @NotNull Builder condition(final @NotNull IntFunction2 condition) { return this.condition((result, matchCount, replaced) -> condition.apply(matchCount, replaced)); } @@ -162,7 +162,7 @@ default Builder matchLiteral(final String literal) { * @since 4.8.0 */ @Contract("_ -> this") - @NonNull Builder condition(final @NonNull Condition condition); + @NotNull Builder condition(final @NotNull Condition condition); /* * ------------------------- @@ -178,7 +178,7 @@ default Builder matchLiteral(final String literal) { * @since 4.2.0 */ @Contract("_ -> this") - default @NonNull Builder replacement(final @NonNull String replacement) { + default @NotNull Builder replacement(final @NotNull String replacement) { requireNonNull(replacement, "replacement"); return this.replacement(builder -> builder.content(replacement)); } @@ -191,7 +191,7 @@ default Builder matchLiteral(final String literal) { * @since 4.2.0 */ @Contract("_ -> this") - default @NonNull Builder replacement(final @Nullable ComponentLike replacement) { + default @NotNull Builder replacement(final @Nullable ComponentLike replacement) { final @Nullable Component baked = replacement == null ? null : replacement.asComponent(); return this.replacement((result, input) -> baked); } @@ -204,7 +204,7 @@ default Builder matchLiteral(final String literal) { * @since 4.2.0 */ @Contract("_ -> this") - default @NonNull Builder replacement(final @NonNull Function replacement) { + default @NotNull Builder replacement(final @NotNull Function replacement) { requireNonNull(replacement, "replacement"); return this.replacement((result, input) -> replacement.apply(input)); @@ -218,7 +218,7 @@ default Builder matchLiteral(final String literal) { * @since 4.2.0 */ @Contract("_ -> this") - @NonNull Builder replacement(final @NonNull BiFunction replacement); + @NotNull Builder replacement(final @NotNull BiFunction replacement); } /** @@ -237,6 +237,6 @@ interface Condition { * @return whether a certain match should * @since 4.8.0 */ - @NonNull PatternReplacementResult shouldReplace(final @NonNull MatchResult result, final int matchCount, final int replaced); + @NotNull PatternReplacementResult shouldReplace(final @NotNull 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 cbf99a63f..c7bfea58b 100644 --- a/api/src/main/java/net/kyori/adventure/text/TextReplacementConfigImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/TextReplacementConfigImpl.java @@ -29,9 +29,8 @@ import java.util.stream.Stream; import net.kyori.examination.ExaminableProperty; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; @@ -47,7 +46,7 @@ final class TextReplacementConfigImpl implements TextReplacementConfig { } @Override - public @NonNull Pattern matchPattern() { + public @NotNull Pattern matchPattern() { return this.matchPattern; } @@ -56,12 +55,12 @@ TextReplacementRenderer.State createState() { } @Override - public TextReplacementConfig.@NonNull Builder toBuilder() { + public TextReplacementConfig.@NotNull Builder toBuilder() { return new Builder(this); } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("matchPattern", this.matchPattern), ExaminableProperty.of("replacement", this.replacement), @@ -75,8 +74,8 @@ public String toString() { } static final class Builder implements TextReplacementConfig.Builder { - @MonotonicNonNull Pattern matchPattern; - @MonotonicNonNull BiFunction replacement; + @Nullable Pattern matchPattern; + @Nullable BiFunction replacement; TextReplacementConfig.Condition continuer = (matchResult, index, replacement) -> PatternReplacementResult.REPLACE; Builder() { @@ -89,25 +88,25 @@ static final class Builder implements TextReplacementConfig.Builder { } @Override - public @NonNull Builder match(final @NonNull Pattern pattern) { + public @NotNull Builder match(final @NotNull Pattern pattern) { this.matchPattern = requireNonNull(pattern, "pattern"); return this; } @Override - public @NonNull Builder condition(final TextReplacementConfig.@NonNull Condition condition) { + public @NotNull Builder condition(final TextReplacementConfig.@NotNull Condition condition) { this.continuer = requireNonNull(condition, "continuation"); return this; } @Override - public @NonNull Builder replacement(final @NonNull BiFunction replacement) { + public @NotNull Builder replacement(final @NotNull BiFunction replacement) { this.replacement = requireNonNull(replacement, "replacement"); return this; } @Override - public @NonNull TextReplacementConfig build() { + public @NotNull 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 6de81470d..4b2f28b90 100644 --- a/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java +++ b/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java @@ -31,8 +31,8 @@ import java.util.regex.Pattern; import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.renderer.ComponentRenderer; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A renderer performing a replacement on every {@link TextComponent} element of a component tree. @@ -44,7 +44,7 @@ private TextReplacementRenderer() { } @Override - public @NonNull Component render(final @NonNull Component component, final @NonNull State state) { + public @NotNull Component render(final @NotNull Component component, final @NotNull State state) { if (!state.running) return component; final boolean prevFirstMatch = state.firstMatch; state.firstMatch = true; @@ -194,7 +194,7 @@ static final class State { int replaceCount = 0; boolean firstMatch = true; - State(final @NonNull Pattern pattern, final @NonNull BiFunction replacement, final TextReplacementConfig.@NonNull Condition continuer) { + State(final @NotNull Pattern pattern, final @NotNull BiFunction replacement, final TextReplacementConfig.@NotNull 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 08bd6a387..0ff139444 100644 --- a/api/src/main/java/net/kyori/adventure/text/TranslatableComponent.java +++ b/api/src/main/java/net/kyori/adventure/text/TranslatableComponent.java @@ -30,8 +30,8 @@ import net.kyori.adventure.translation.GlobalTranslator; import net.kyori.adventure.translation.Translatable; import net.kyori.adventure.translation.TranslationRegistry; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; /** * A component that can display translated text. @@ -65,7 +65,7 @@ public interface TranslatableComponent extends BuildableComponent args(); + @NotNull List args(); /** * Sets the translation arguments for this component. @@ -105,7 +105,7 @@ public interface TranslatableComponent extends BuildableComponent args); + @NotNull TranslatableComponent args(final @NotNull List args); /** * A text component builder. @@ -131,7 +131,7 @@ interface Builder extends ComponentBuilder { * @since 4.8.0 */ @Contract(pure = true) - default @NonNull Builder key(final @NonNull Translatable translatable) { + default @NotNull Builder key(final @NotNull Translatable translatable) { return this.key(Objects.requireNonNull(translatable, "translatable").translationKey()); } @@ -143,7 +143,7 @@ interface Builder extends ComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder key(final @NonNull String key); + @NotNull Builder key(final @NotNull String key); /** * Sets the translation args. @@ -153,7 +153,7 @@ interface Builder extends ComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder args(final @NonNull ComponentBuilder arg); + @NotNull Builder args(final @NotNull ComponentBuilder arg); /** * Sets the translation args. @@ -164,7 +164,7 @@ interface Builder extends ComponentBuilder { */ @Contract("_ -> this") @SuppressWarnings("checkstyle:GenericWhitespace") - @NonNull Builder args(final @NonNull ComponentBuilder@NonNull... args); + @NotNull Builder args(final @NotNull ComponentBuilder@NotNull... args); /** * Sets the translation args. @@ -174,7 +174,7 @@ interface Builder extends ComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder args(final @NonNull Component arg); + @NotNull Builder args(final @NotNull Component arg); /** * Sets the translation args. @@ -184,7 +184,7 @@ interface Builder extends ComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder args(final @NonNull ComponentLike@NonNull... args); + @NotNull Builder args(final @NotNull ComponentLike@NotNull... args); /** * Sets the translation args. @@ -194,6 +194,6 @@ interface Builder extends ComponentBuilder { * @since 4.0.0 */ @Contract("_ -> this") - @NonNull Builder args(final @NonNull List args); + @NotNull Builder args(final @NotNull List args); } } 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 cf49cdf60..1727c2df1 100644 --- a/api/src/main/java/net/kyori/adventure/text/TranslatableComponentImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/TranslatableComponentImpl.java @@ -31,8 +31,8 @@ import java.util.stream.Stream; import net.kyori.adventure.text.format.Style; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; @@ -40,11 +40,11 @@ final class TranslatableComponentImpl extends AbstractComponent implements Trans private final String key; private final List args; - TranslatableComponentImpl(final @NonNull List children, final @NonNull Style style, final @NonNull String key, final @NonNull ComponentLike@NonNull[] args) { + TranslatableComponentImpl(final @NotNull List children, final @NotNull Style style, final @NotNull String key, final @NotNull ComponentLike@NotNull[] args) { this(children, style, key, Arrays.asList(args)); } - TranslatableComponentImpl(final @NonNull List children, final @NonNull Style style, final @NonNull String key, final @NonNull List args) { + TranslatableComponentImpl(final @NotNull List children, final @NotNull Style style, final @NotNull String key, final @NotNull List args) { super(children, style); this.key = requireNonNull(key, "key"); // Since translation arguments can be indexed, empty components are also included. @@ -52,38 +52,38 @@ final class TranslatableComponentImpl extends AbstractComponent implements Trans } @Override - public @NonNull String key() { + public @NotNull String key() { return this.key; } @Override - public @NonNull TranslatableComponent key(final @NonNull String key) { + public @NotNull TranslatableComponent key(final @NotNull String key) { if (Objects.equals(this.key, key)) return this; return new TranslatableComponentImpl(this.children, this.style, requireNonNull(key, "key"), this.args); } @Override - public @NonNull List args() { + public @NotNull List args() { return this.args; } @Override - public @NonNull TranslatableComponent args(final @NonNull ComponentLike@NonNull... args) { + public @NotNull TranslatableComponent args(final @NotNull ComponentLike@NotNull... args) { return new TranslatableComponentImpl(this.children, this.style, this.key, args); } @Override - public @NonNull TranslatableComponent args(final @NonNull List args) { + public @NotNull TranslatableComponent args(final @NotNull List args) { return new TranslatableComponentImpl(this.children, this.style, this.key, args); } @Override - public @NonNull TranslatableComponent children(final @NonNull List children) { + public @NotNull TranslatableComponent children(final @NotNull List children) { return new TranslatableComponentImpl(children, this.style, this.key, this.args); } @Override - public @NonNull TranslatableComponent style(final @NonNull Style style) { + public @NotNull TranslatableComponent style(final @NotNull Style style) { return new TranslatableComponentImpl(this.children, style, this.key, this.args); } @@ -105,7 +105,7 @@ public int hashCode() { } @Override - protected @NonNull Stream examinablePropertiesWithoutChildren() { + protected @NotNull Stream examinablePropertiesWithoutChildren() { return Stream.concat( Stream.of( ExaminableProperty.of("key", this.key), @@ -116,7 +116,7 @@ public int hashCode() { } @Override - public @NonNull Builder toBuilder() { + public @NotNull Builder toBuilder() { return new BuilderImpl(this); } @@ -127,49 +127,49 @@ static final class BuilderImpl extends AbstractComponentBuilder arg) { + public @NotNull Builder args(final @NotNull ComponentBuilder arg) { return this.args(Collections.singletonList(arg.build())); } @Override @SuppressWarnings("checkstyle:GenericWhitespace") - public @NonNull Builder args(final @NonNull ComponentBuilder@NonNull... args) { + public @NotNull Builder args(final @NotNull ComponentBuilder@NotNull... args) { if (args.length == 0) return this.args(Collections.emptyList()); return this.args(Stream.of(args).map(ComponentBuilder::build).collect(Collectors.toList())); } @Override - public @NonNull Builder args(final @NonNull Component arg) { + public @NotNull Builder args(final @NotNull Component arg) { return this.args(Collections.singletonList(arg)); } @Override - public @NonNull Builder args(final @NonNull ComponentLike@NonNull... args) { + public @NotNull Builder args(final @NotNull ComponentLike@NotNull... args) { if (args.length == 0) return this.args(Collections.emptyList()); return this.args(Arrays.asList(args)); } @Override - public @NonNull Builder args(final @NonNull List args) { + public @NotNull Builder args(final @NotNull List args) { this.args = ComponentLike.asComponents(args); return this; } @Override - public @NonNull TranslatableComponentImpl build() { + public @NotNull TranslatableComponentImpl build() { if (this.key == null) throw new IllegalStateException("key must be set"); return new TranslatableComponentImpl(this.children, this.buildStyle(), this.key, this.args); } 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 dbd7856db..4aec2efa9 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 @@ -32,8 +32,8 @@ import net.kyori.examination.Examinable; import net.kyori.examination.ExaminableProperty; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; @@ -52,7 +52,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @return a click event * @since 4.0.0 */ - public static @NonNull ClickEvent openUrl(final @NonNull String url) { + public static @NotNull ClickEvent openUrl(final @NotNull String url) { return new ClickEvent(Action.OPEN_URL, url); } @@ -63,7 +63,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @return a click event * @since 4.0.0 */ - public static @NonNull ClickEvent openUrl(final @NonNull URL url) { + public static @NotNull ClickEvent openUrl(final @NotNull URL url) { return openUrl(url.toExternalForm()); } @@ -76,7 +76,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @return a click event * @since 4.0.0 */ - public static @NonNull ClickEvent openFile(final @NonNull String file) { + public static @NotNull ClickEvent openFile(final @NotNull String file) { return new ClickEvent(Action.OPEN_FILE, file); } @@ -87,7 +87,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @return a click event * @since 4.0.0 */ - public static @NonNull ClickEvent runCommand(final @NonNull String command) { + public static @NotNull ClickEvent runCommand(final @NotNull String command) { return new ClickEvent(Action.RUN_COMMAND, command); } @@ -98,7 +98,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @return a click event * @since 4.0.0 */ - public static @NonNull ClickEvent suggestCommand(final @NonNull String command) { + public static @NotNull ClickEvent suggestCommand(final @NotNull String command) { return new ClickEvent(Action.SUGGEST_COMMAND, command); } @@ -109,7 +109,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @return a click event * @since 4.0.0 */ - public static @NonNull ClickEvent changePage(final @NonNull String page) { + public static @NotNull ClickEvent changePage(final @NotNull String page) { return new ClickEvent(Action.CHANGE_PAGE, page); } @@ -120,7 +120,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @return a click event * @since 4.0.0 */ - public static @NonNull ClickEvent changePage(final int page) { + public static @NotNull ClickEvent changePage(final int page) { return changePage(String.valueOf(page)); } @@ -132,7 +132,7 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @since 4.0.0 * @sinceMinecraft 1.15 */ - public static @NonNull ClickEvent copyToClipboard(final @NonNull String text) { + public static @NotNull ClickEvent copyToClipboard(final @NotNull String text) { return new ClickEvent(Action.COPY_TO_CLIPBOARD, text); } @@ -144,14 +144,14 @@ public final class ClickEvent implements Examinable, StyleBuilderApplicable { * @return a click event * @since 4.0.0 */ - public static @NonNull ClickEvent clickEvent(final @NonNull Action action, final @NonNull String value) { + public static @NotNull ClickEvent clickEvent(final @NotNull Action action, final @NotNull String value) { return new ClickEvent(action, value); } private final Action action; private final String value; - private ClickEvent(final @NonNull Action action, final @NonNull String value) { + private ClickEvent(final @NotNull Action action, final @NotNull String value) { this.action = requireNonNull(action, "action"); this.value = requireNonNull(value, "value"); } @@ -162,7 +162,7 @@ private ClickEvent(final @NonNull Action action, final @NonNull String value) { * @return the click event action * @since 4.0.0 */ - public @NonNull Action action() { + public @NotNull Action action() { return this.action; } @@ -172,12 +172,12 @@ private ClickEvent(final @NonNull Action action, final @NonNull String value) { * @return the click event value * @since 4.0.0 */ - public @NonNull String value() { + public @NotNull String value() { return this.value; } @Override - public void styleApply(final Style.@NonNull Builder style) { + public void styleApply(final Style.@NotNull Builder style) { style.clickEvent(this); } @@ -197,7 +197,7 @@ public int hashCode() { } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("action", this.action), ExaminableProperty.of("value", this.value) @@ -269,7 +269,7 @@ public enum Action { */ private final boolean readable; - Action(final @NonNull String name, final boolean readable) { + Action(final @NotNull String name, final boolean readable) { this.name = name; this.readable = readable; } @@ -286,7 +286,7 @@ public boolean readable() { } @Override - public @NonNull String toString() { + public @NotNull 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 4db70037c..14e6be6f5 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 @@ -39,9 +39,9 @@ import net.kyori.examination.Examinable; import net.kyori.examination.ExaminableProperty; import net.kyori.examination.string.StringExaminer; -import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import static java.util.Objects.requireNonNull; @@ -62,7 +62,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a hover event * @since 4.2.0 */ - public static @NonNull HoverEvent showText(final @NonNull ComponentLike text) { + public static @NotNull HoverEvent showText(final @NotNull ComponentLike text) { return showText(text.asComponent()); } @@ -73,7 +73,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a hover event * @since 4.0.0 */ - public static @NonNull HoverEvent showText(final @NonNull Component text) { + public static @NotNull HoverEvent showText(final @NotNull Component text) { return new HoverEvent<>(Action.SHOW_TEXT, text); } @@ -85,7 +85,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a hover event * @since 4.0.0 */ - public static @NonNull HoverEvent showItem(final @NonNull Key item, final @NonNegative int count) { + public static @NotNull HoverEvent showItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) { return showItem(item, count, null); } @@ -97,7 +97,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a hover event * @since 4.6.0 */ - public static @NonNull HoverEvent showItem(final @NonNull Keyed item, final @NonNegative int count) { + public static @NotNull HoverEvent showItem(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) { return showItem(item, count, null); } @@ -110,7 +110,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a hover event * @since 4.0.0 */ - public static @NonNull HoverEvent showItem(final @NonNull Key item, final @NonNegative int count, final @Nullable BinaryTagHolder nbt) { + public static @NotNull HoverEvent showItem(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) { return showItem(ShowItem.of(item, count, nbt)); } @@ -123,7 +123,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a hover event * @since 4.6.0 */ - public static @NonNull HoverEvent showItem(final @NonNull Keyed item, final @NonNegative int count, final @Nullable BinaryTagHolder nbt) { + public static @NotNull HoverEvent showItem(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) { return showItem(ShowItem.of(item, count, nbt)); } @@ -134,7 +134,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a hover event * @since 4.0.0 */ - public static @NonNull HoverEvent showItem(final @NonNull ShowItem item) { + public static @NotNull HoverEvent showItem(final @NotNull ShowItem item) { return new HoverEvent<>(Action.SHOW_ITEM, item); } @@ -148,7 +148,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a {@code ShowEntity} * @since 4.0.0 */ - public static @NonNull HoverEvent showEntity(final @NonNull Key type, final @NonNull UUID id) { + public static @NotNull HoverEvent showEntity(final @NotNull Key type, final @NotNull UUID id) { return showEntity(type, id, null); } @@ -162,7 +162,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a {@code ShowEntity} * @since 4.6.0 */ - public static @NonNull HoverEvent showEntity(final @NonNull Keyed type, final @NonNull UUID id) { + public static @NotNull HoverEvent showEntity(final @NotNull Keyed type, final @NotNull UUID id) { return showEntity(type, id, null); } @@ -177,7 +177,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a {@code ShowEntity} * @since 4.0.0 */ - public static @NonNull HoverEvent showEntity(final @NonNull Key type, final @NonNull UUID id, final @Nullable Component name) { + public static @NotNull HoverEvent showEntity(final @NotNull Key type, final @NotNull UUID id, final @Nullable Component name) { return showEntity(ShowEntity.of(type, id, name)); } @@ -192,7 +192,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a {@code ShowEntity} * @since 4.6.0 */ - public static @NonNull HoverEvent showEntity(final @NonNull Keyed type, final @NonNull UUID id, final @Nullable Component name) { + public static @NotNull HoverEvent showEntity(final @NotNull Keyed type, final @NotNull UUID id, final @Nullable Component name) { return showEntity(ShowEntity.of(type, id, name)); } @@ -205,7 +205,7 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a hover event * @since 4.0.0 */ - public static @NonNull HoverEvent showEntity(final @NonNull ShowEntity entity) { + public static @NotNull HoverEvent showEntity(final @NotNull ShowEntity entity) { return new HoverEvent<>(Action.SHOW_ENTITY, entity); } @@ -218,14 +218,14 @@ public final class HoverEvent implements Examinable, HoverEventSource, Sty * @return a click event * @since 4.0.0 */ - public static @NonNull HoverEvent hoverEvent(final @NonNull Action action, final @NonNull V value) { + public static @NotNull HoverEvent hoverEvent(final @NotNull Action action, final @NotNull V value) { return new HoverEvent<>(action, value); } private final Action action; private final V value; - private HoverEvent(final @NonNull Action action, final @NonNull V value) { + private HoverEvent(final @NotNull Action action, final @NotNull V value) { this.action = requireNonNull(action, "action"); this.value = requireNonNull(value, "value"); } @@ -236,7 +236,7 @@ private HoverEvent(final @NonNull Action action, final @NonNull V value) { * @return the hover event action * @since 4.0.0 */ - public @NonNull Action action() { + public @NotNull Action action() { return this.action; } @@ -246,7 +246,7 @@ private HoverEvent(final @NonNull Action action, final @NonNull V value) { * @return the hover event value * @since 4.0.0 */ - public @NonNull V value() { + public @NotNull V value() { return this.value; } @@ -257,7 +257,7 @@ private HoverEvent(final @NonNull Action action, final @NonNull V value) { * @return a hover event * @since 4.0.0 */ - public @NonNull HoverEvent value(final @NonNull V value) { + public @NotNull HoverEvent value(final @NotNull V value) { return new HoverEvent<>(this.action, value); } @@ -270,7 +270,7 @@ private HoverEvent(final @NonNull Action action, final @NonNull V value) { * @return a hover event * @since 4.0.0 */ - public @NonNull HoverEvent withRenderedValue(final @NonNull ComponentRenderer renderer, final @NonNull C context) { + public @NotNull HoverEvent withRenderedValue(final @NotNull ComponentRenderer renderer, final @NotNull 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); @@ -278,18 +278,18 @@ private HoverEvent(final @NonNull Action action, final @NonNull V value) { } @Override - public @NonNull HoverEvent asHoverEvent() { + public @NotNull HoverEvent asHoverEvent() { return this; // i already am a hover event! hehehehe } @Override - public @NonNull HoverEvent asHoverEvent(final @NonNull UnaryOperator op) { + public @NotNull HoverEvent asHoverEvent(final @NotNull UnaryOperator op) { if (op == UnaryOperator.identity()) return this; // nothing to do, can return ourself return new HoverEvent<>(this.action, op.apply(this.value)); } @Override - public void styleApply(final Style.@NonNull Builder style) { + public void styleApply(final Style.@NotNull Builder style) { style.hoverEvent(this); } @@ -309,7 +309,7 @@ public int hashCode() { } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("action", this.action), ExaminableProperty.of("value", this.value) @@ -339,7 +339,7 @@ public static final class ShowItem implements Examinable { * @return a {@code ShowItem} * @since 4.0.0 */ - public static @NonNull ShowItem of(final @NonNull Key item, final @NonNegative int count) { + public static @NotNull ShowItem of(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) { return of(item, count, null); } @@ -351,7 +351,7 @@ public static final class ShowItem implements Examinable { * @return a {@code ShowItem} * @since 4.6.0 */ - public static @NonNull ShowItem of(final @NonNull Keyed item, final @NonNegative int count) { + public static @NotNull ShowItem of(final @NotNull Keyed item, final @Range(from = 0, to = Integer.MAX_VALUE) int count) { return of(item, count, null); } @@ -364,7 +364,7 @@ public static final class ShowItem implements Examinable { * @return a {@code ShowItem} * @since 4.0.0 */ - public static @NonNull ShowItem of(final @NonNull Key item, final @NonNegative int count, final @Nullable BinaryTagHolder nbt) { + public static @NotNull ShowItem of(final @NotNull Key item, final @Range(from = 0, to = Integer.MAX_VALUE) int count, final @Nullable BinaryTagHolder nbt) { return new ShowItem(requireNonNull(item, "item"), count, nbt); } @@ -377,11 +377,11 @@ public static final class ShowItem implements Examinable { * @return a {@code ShowItem} * @since 4.6.0 */ - public static @NonNull ShowItem of(final @NonNull Keyed item, final @NonNegative int count, final @Nullable BinaryTagHolder nbt) { + public static @NotNull ShowItem of(final @NotNull 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 @NonNull Key item, final @NonNegative int count, final @Nullable BinaryTagHolder nbt) { + private ShowItem(final @NotNull 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; @@ -393,7 +393,7 @@ private ShowItem(final @NonNull Key item, final @NonNegative int count, final @N * @return the item * @since 4.0.0 */ - public @NonNull Key item() { + public @NotNull Key item() { return this.item; } @@ -404,7 +404,7 @@ private ShowItem(final @NonNull Key item, final @NonNegative int count, final @N * @return a {@code ShowItem} * @since 4.0.0 */ - public @NonNull ShowItem item(final @NonNull Key item) { + public @NotNull ShowItem item(final @NotNull Key item) { if (requireNonNull(item, "item").equals(this.item)) return this; return new ShowItem(item, this.count, this.nbt); } @@ -415,7 +415,7 @@ private ShowItem(final @NonNull Key item, final @NonNegative int count, final @N * @return the count * @since 4.0.0 */ - public @NonNegative int count() { + public @Range(from = 0, to = Integer.MAX_VALUE) int count() { return this.count; } @@ -426,7 +426,7 @@ private ShowItem(final @NonNull Key item, final @NonNegative int count, final @N * @return a {@code ShowItem} * @since 4.0.0 */ - public @NonNull ShowItem count(final @NonNegative int count) { + public @NotNull 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); } @@ -448,7 +448,7 @@ private ShowItem(final @NonNull Key item, final @NonNegative int count, final @N * @return a {@code ShowItem} * @since 4.0.0 */ - public @NonNull ShowItem nbt(final @Nullable BinaryTagHolder nbt) { + public @NotNull ShowItem nbt(final @Nullable BinaryTagHolder nbt) { if (Objects.equals(nbt, this.nbt)) return this; return new ShowItem(this.item, this.count, nbt); } @@ -470,7 +470,7 @@ public int hashCode() { } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("item", this.item), ExaminableProperty.of("count", this.count), @@ -502,7 +502,7 @@ public static final class ShowEntity implements Examinable { * @return a {@code ShowEntity} * @since 4.0.0 */ - public static @NonNull ShowEntity of(final @NonNull Key type, final @NonNull UUID id) { + public static @NotNull ShowEntity of(final @NotNull Key type, final @NotNull UUID id) { return of(type, id, null); } @@ -514,7 +514,7 @@ public static final class ShowEntity implements Examinable { * @return a {@code ShowEntity} * @since 4.6.0 */ - public static @NonNull ShowEntity of(final @NonNull Keyed type, final @NonNull UUID id) { + public static @NotNull ShowEntity of(final @NotNull Keyed type, final @NotNull UUID id) { return of(type, id, null); } @@ -527,7 +527,7 @@ public static final class ShowEntity implements Examinable { * @return a {@code ShowEntity} * @since 4.0.0 */ - public static @NonNull ShowEntity of(final @NonNull Key type, final @NonNull UUID id, final @Nullable Component name) { + public static @NotNull ShowEntity of(final @NotNull Key type, final @NotNull UUID id, final @Nullable Component name) { return new ShowEntity(requireNonNull(type, "type"), requireNonNull(id, "id"), name); } @@ -540,11 +540,11 @@ public static final class ShowEntity implements Examinable { * @return a {@code ShowEntity} * @since 4.6.0 */ - public static @NonNull ShowEntity of(final @NonNull Keyed type, final @NonNull UUID id, final @Nullable Component name) { + public static @NotNull ShowEntity of(final @NotNull Keyed type, final @NotNull UUID id, final @Nullable Component name) { return new ShowEntity(requireNonNull(type, "type").key(), requireNonNull(id, "id"), name); } - private ShowEntity(final @NonNull Key type, final @NonNull UUID id, final @Nullable Component name) { + private ShowEntity(final @NotNull Key type, final @NotNull UUID id, final @Nullable Component name) { this.type = type; this.id = id; this.name = name; @@ -556,7 +556,7 @@ private ShowEntity(final @NonNull Key type, final @NonNull UUID id, final @Nulla * @return the type * @since 4.0.0 */ - public @NonNull Key type() { + public @NotNull Key type() { return this.type; } @@ -567,7 +567,7 @@ private ShowEntity(final @NonNull Key type, final @NonNull UUID id, final @Nulla * @return a {@code ShowEntity} * @since 4.0.0 */ - public @NonNull ShowEntity type(final @NonNull Key type) { + public @NotNull ShowEntity type(final @NotNull Key type) { if (requireNonNull(type, "type").equals(this.type)) return this; return new ShowEntity(type, this.id, this.name); } @@ -579,7 +579,7 @@ private ShowEntity(final @NonNull Key type, final @NonNull UUID id, final @Nulla * @return a {@code ShowEntity} * @since 4.6.0 */ - public @NonNull ShowEntity type(final @NonNull Keyed type) { + public @NotNull ShowEntity type(final @NotNull Keyed type) { return this.type(requireNonNull(type, "type").key()); } @@ -589,7 +589,7 @@ private ShowEntity(final @NonNull Key type, final @NonNull UUID id, final @Nulla * @return the id * @since 4.0.0 */ - public @NonNull UUID id() { + public @NotNull UUID id() { return this.id; } @@ -600,7 +600,7 @@ private ShowEntity(final @NonNull Key type, final @NonNull UUID id, final @Nulla * @return a {@code ShowEntity} * @since 4.0.0 */ - public @NonNull ShowEntity id(final @NonNull UUID id) { + public @NotNull ShowEntity id(final @NotNull UUID id) { if (requireNonNull(id).equals(this.id)) return this; return new ShowEntity(this.type, id, this.name); } @@ -622,7 +622,7 @@ private ShowEntity(final @NonNull Key type, final @NonNull UUID id, final @Nulla * @return a {@code ShowEntity} * @since 4.0.0 */ - public @NonNull ShowEntity name(final @Nullable Component name) { + public @NotNull ShowEntity name(final @Nullable Component name) { if (Objects.equals(name, this.name)) return this; return new ShowEntity(this.type, this.id, name); } @@ -644,7 +644,7 @@ public int hashCode() { } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream examinableProperties() { return Stream.of( ExaminableProperty.of("type", this.type), ExaminableProperty.of("id", this.id), @@ -671,7 +671,7 @@ public static final class Action { */ public static final Action SHOW_TEXT = new Action<>("show_text", Component.class, true, new Renderer() { @Override - public @NonNull Component render(final @NonNull ComponentRenderer renderer, final @NonNull C context, final @NonNull Component value) { + public @NotNull Component render(final @NotNull ComponentRenderer renderer, final @NotNull C context, final @NotNull Component value) { return renderer.render(value, context); } }); @@ -682,7 +682,7 @@ public static final class Action { */ public static final Action SHOW_ITEM = new Action<>("show_item", ShowItem.class, true, new Renderer() { @Override - public @NonNull ShowItem render(final @NonNull ComponentRenderer renderer, final @NonNull C context, final @NonNull ShowItem value) { + public @NotNull ShowItem render(final @NotNull ComponentRenderer renderer, final @NotNull C context, final @NotNull ShowItem value) { return value; } }); @@ -693,7 +693,7 @@ public static final class Action { */ public static final Action SHOW_ENTITY = new Action<>("show_entity", ShowEntity.class, true, new Renderer() { @Override - public @NonNull ShowEntity render(final @NonNull ComponentRenderer renderer, final @NonNull C context, final @NonNull ShowEntity value) { + public @NotNull ShowEntity render(final @NotNull ComponentRenderer renderer, final @NotNull C context, final @NotNull ShowEntity value) { if (value.name == null) return value; return value.name(renderer.render(value.name, context)); } @@ -728,7 +728,7 @@ public static final class Action { * @return the value type * @since 4.0.0 */ - public @NonNull Class type() { + public @NotNull Class type() { return this.type; } @@ -744,13 +744,13 @@ public boolean readable() { } @Override - public @NonNull String toString() { + public @NotNull String toString() { return this.name; } @FunctionalInterface interface Renderer { - @NonNull V render(final @NonNull ComponentRenderer renderer, final @NonNull C context, final @NonNull V value); + @NotNull V render(final @NotNull ComponentRenderer renderer, final @NotNull C context, final @NotNull 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 57bd24c44..b7b9e34df 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.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Something that can provide a {@link HoverEvent}. @@ -52,7 +52,7 @@ public interface HoverEventSource { * @return a hover event * @since 4.0.0 */ - default @NonNull HoverEvent asHoverEvent() { + default @NotNull HoverEvent asHoverEvent() { return this.asHoverEvent(UnaryOperator.identity()); } @@ -66,5 +66,5 @@ public interface HoverEventSource { * @return a hover event * @since 4.0.0 */ - @NonNull HoverEvent asHoverEvent(final @NonNull UnaryOperator op); + @NotNull HoverEvent asHoverEvent(final @NotNull UnaryOperator 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 f80c7f088..19affa4b8 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 @@ -28,8 +28,8 @@ import java.util.function.Function; import net.kyori.adventure.text.Component; import net.kyori.adventure.util.Buildable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A 'flattener' to convert a component tree to a linear string for display. @@ -43,7 +43,7 @@ public interface ComponentFlattener extends Buildable { * @see #complexMapper(Class, BiConsumer) for component types that are too complex to be directly rendered to a string * @since 4.7.0 */ - @NonNull Builder mapper(final @NonNull Class type, final @NonNull Function converter); + @NotNull Builder mapper(final @NotNull Class type, final @NotNull Function converter); /** * Register a type of component that needs to be flattened to an intermediate stage. @@ -110,7 +110,7 @@ interface Builder extends Buildable.Builder { * @return this builder * @since 4.7.0 */ - @NonNull Builder complexMapper(final @NonNull Class type, final @NonNull BiConsumer> converter); + @NotNull Builder complexMapper(final @NotNull Class type, final @NotNull BiConsumer> converter); /** * Register a handler for unknown component types. @@ -121,6 +121,6 @@ interface Builder extends Buildable.Builder { * @return this builder * @since 4.7.0 */ - @NonNull Builder unknownMapper(final @Nullable Function converter); + @NotNull Builder unknownMapper(final @Nullable Function 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 1c97ae809..805fc09ac 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,8 +38,8 @@ import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.format.Style; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; @@ -71,11 +71,11 @@ final class ComponentFlattenerImpl implements ComponentFlattener { } @Override - public void flatten(final @NonNull Component input, final @NonNull FlattenerListener listener) { + public void flatten(final @NotNull Component input, final @NotNull FlattenerListener listener) { this.flatten0(input, listener, 0); } - private void flatten0(final @NonNull Component input, final @NonNull FlattenerListener listener, final int depth) { + private void flatten0(final @NotNull Component input, final @NotNull FlattenerListener listener, final int depth) { requireNonNull(input, "input"); requireNonNull(listener, "listener"); if (input == Component.empty()) return; @@ -136,7 +136,7 @@ private void flatten0(final @NonNull Component input, final @NonNull FlattenerLi } @Override - public ComponentFlattener.@NonNull Builder toBuilder() { + public ComponentFlattener.@NotNull Builder toBuilder() { return new BuilderImpl(this.flatteners, this.complexFlatteners, this.unknownHandler); } @@ -165,12 +165,12 @@ static final class BuilderImpl implements Builder { } @Override - public @NonNull ComponentFlattener build() { + public @NotNull ComponentFlattener build() { return new ComponentFlattenerImpl(this.flatteners, this.complexFlatteners, this.unknownHandler); } @Override - public ComponentFlattener.@NonNull Builder mapper(final @NonNull Class type, final @NonNull Function converter) { + public ComponentFlattener.@NotNull Builder mapper(final @NotNull Class type, final @NotNull Function converter) { this.validateNoneInHierarchy(requireNonNull(type, "type")); this.flatteners.put( type, @@ -181,7 +181,7 @@ static final class BuilderImpl implements Builder { } @Override - public ComponentFlattener.@NonNull Builder complexMapper(final @NonNull Class type, final @NonNull BiConsumer> converter) { + public ComponentFlattener.@NotNull Builder complexMapper(final @NotNull Class type, final @NotNull BiConsumer> converter) { this.validateNoneInHierarchy(requireNonNull(type, "type")); this.complexFlatteners.put( type, @@ -209,7 +209,7 @@ private static void testHierarchy(final Class existing, final Class beingR } @Override - public ComponentFlattener.@NonNull Builder unknownMapper(final @Nullable Function converter) { + public ComponentFlattener.@NotNull Builder unknownMapper(final @Nullable Function 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 ce0f6e948..0287c1ccf 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.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.NotNull; /** * A listener accepting styled information from flattened components. @@ -39,7 +39,7 @@ public interface FlattenerListener { * @param style the style to push * @since 4.7.0 */ - default void pushStyle(final @NonNull Style style) { + default void pushStyle(final @NotNull Style style) { } /** @@ -48,7 +48,7 @@ default void pushStyle(final @NonNull Style style) { * @param text the component text * @since 4.7.0 */ - void component(final @NonNull String text); + void component(final @NotNull String text); /** * Pop a pushed style. @@ -58,6 +58,6 @@ default void pushStyle(final @NonNull Style style) { * @param style the style popped, as passed to {@link #pushStyle(Style)} * @since 4.7.0 */ - default void popStyle(final @NonNull Style style) { + default void popStyle(final @NotNull Style style) { } } diff --git a/api/src/main/java/net/kyori/adventure/text/format/AlwaysMerger.java b/api/src/main/java/net/kyori/adventure/text/format/AlwaysMerger.java index 5c654ff09..cbeca5652 100644 --- a/api/src/main/java/net/kyori/adventure/text/format/AlwaysMerger.java +++ b/api/src/main/java/net/kyori/adventure/text/format/AlwaysMerger.java @@ -26,8 +26,8 @@ import net.kyori.adventure.key.Key; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; final class AlwaysMerger implements Merger { static final AlwaysMerger INSTANCE = new AlwaysMerger(); @@ -41,7 +41,7 @@ public void mergeColor(final StyleImpl.BuilderImpl target, final @Nullable TextC } @Override - public void mergeDecoration(final StyleImpl.BuilderImpl target, final @NonNull TextDecoration decoration, final TextDecoration.@NonNull State state) { + public void mergeDecoration(final StyleImpl.BuilderImpl target, final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) { target.decoration(decoration, state); } diff --git a/api/src/main/java/net/kyori/adventure/text/format/IfAbsentOnTargetMerger.java b/api/src/main/java/net/kyori/adventure/text/format/IfAbsentOnTargetMerger.java index 60cf0e52a..4a8099793 100644 --- a/api/src/main/java/net/kyori/adventure/text/format/IfAbsentOnTargetMerger.java +++ b/api/src/main/java/net/kyori/adventure/text/format/IfAbsentOnTargetMerger.java @@ -26,8 +26,8 @@ import net.kyori.adventure.key.Key; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; final class IfAbsentOnTargetMerger implements Merger { static final IfAbsentOnTargetMerger INSTANCE = new IfAbsentOnTargetMerger(); @@ -43,7 +43,7 @@ public void mergeColor(final StyleImpl.BuilderImpl target, final @Nullable TextC } @Override - public void mergeDecoration(final StyleImpl.BuilderImpl target, final @NonNull TextDecoration decoration, final TextDecoration.@NonNull State state) { + public void mergeDecoration(final StyleImpl.BuilderImpl target, final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) { target.decorationIfAbsent(decoration, state); } diff --git a/api/src/main/java/net/kyori/adventure/text/format/Merger.java b/api/src/main/java/net/kyori/adventure/text/format/Merger.java index bfef0ece4..dc9bf1c63 100644 --- a/api/src/main/java/net/kyori/adventure/text/format/Merger.java +++ b/api/src/main/java/net/kyori/adventure/text/format/Merger.java @@ -27,13 +27,13 @@ import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.format.StyleImpl.BuilderImpl; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; interface Merger { void mergeColor(final BuilderImpl target, final @Nullable TextColor color); - void mergeDecoration(final BuilderImpl target, final @NonNull TextDecoration decoration, final TextDecoration.@NonNull State state); + void mergeDecoration(final BuilderImpl target, final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state); void mergeClickEvent(final BuilderImpl target, final @Nullable ClickEvent event); 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 98a467659..23964b195 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 @@ -30,8 +30,8 @@ import net.kyori.adventure.util.HSVLike; import net.kyori.adventure.util.Index; import net.kyori.examination.ExaminableProperty; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static java.util.Objects.requireNonNull; @@ -197,7 +197,7 @@ public final class NamedTextColor implements TextColor { * @return nearest named colour. will always return a value * @since 4.0.0 */ - public static @NonNull NamedTextColor nearestTo(final @NonNull TextColor any) { + public static @NotNull NamedTextColor nearestTo(final @NotNull TextColor any) { if (any instanceof NamedTextColor) { return (NamedTextColor) any; } @@ -228,7 +228,7 @@ public final class NamedTextColor implements TextColor { * @param other colour to compare to * @return distance metric */ - private static float distance(final @NonNull HSVLike self, final @NonNull HSVLike other) { + private static float distance(final @NotNull HSVLike self, final @NotNull 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(); @@ -252,17 +252,17 @@ public int value() { } @Override - public @NonNull HSVLike asHSV() { + public @NotNull HSVLike asHSV() { return this.hsv; } @Override - public @NonNull String toString() { + public @NotNull String toString() { return this.name; } @Override - public @NonNull Stream examinableProperties() { + public @NotNull Stream 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 4156143e4..56c488630 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 @@ -36,10 +36,10 @@ import net.kyori.adventure.util.Buildable; import net.kyori.adventure.util.MonkeyBars; import net.kyori.examination.Examinable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; 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; /** @@ -74,7 +74,7 @@ public interface Style extends Buildable, Examinable { * @return empty style * @since 4.0.0 */ - static @NonNull Style empty() { + static @NotNull Style empty() { return StyleImpl.EMPTY; } @@ -84,7 +84,7 @@ public interface Style extends Buildable, Examinable { * @return a builder * @since 4.0.0 */ - static @NonNull Builder style() { + static @NotNull Builder style() { return new StyleImpl.BuilderImpl(); } @@ -95,7 +95,7 @@ public interface Style extends Buildable, Examinable { * @return a style * @since 4.0.0 */ - static @NonNull Style style(final @NonNull Consumer consumer) { + static @NotNull Style style(final @NotNull Consumer consumer) { return Buildable.configureAndBuild(style(), consumer); } @@ -106,7 +106,7 @@ public interface Style extends Buildable, Examinable { * @return a style * @since 4.0.0 */ - static @NonNull Style style(final @Nullable TextColor color) { + static @NotNull Style style(final @Nullable TextColor color) { if (color == null) return empty(); return new StyleImpl(null, color, TextDecoration.State.NOT_SET, TextDecoration.State.NOT_SET, TextDecoration.State.NOT_SET, TextDecoration.State.NOT_SET, TextDecoration.State.NOT_SET, null, null, null); } @@ -118,7 +118,7 @@ public interface Style extends Buildable, Examinable { * @return a style * @since 4.0.0 */ - static @NonNull Style style(final @NonNull TextDecoration decoration) { + static @NotNull Style style(final @NotNull TextDecoration decoration) { return style().decoration(decoration, true).build(); } @@ -130,7 +130,7 @@ public interface Style extends Buildable, Examinable { * @return a style * @since 4.0.0 */ - static @NonNull Style style(final @Nullable TextColor color, final TextDecoration@NonNull... decorations) { + static @NotNull Style style(final @Nullable TextColor color, final TextDecoration@NotNull... decorations) { final Builder builder = style(); builder.color(color); StyleImpl.decorate(builder, decorations); @@ -145,7 +145,7 @@ public interface Style extends Buildable, Examinable { * @return a style * @since 4.0.0 */ - static @NonNull Style style(final @Nullable TextColor color, final Set decorations) { + static @NotNull Style style(final @Nullable TextColor color, final Set decorations) { final Builder builder = style(); builder.color(color); if (!decorations.isEmpty()) { @@ -163,7 +163,7 @@ public interface Style extends Buildable, Examinable { * @return a style * @since 4.0.0 */ - static @NonNull Style style(final StyleBuilderApplicable@NonNull... applicables) { + static @NotNull Style style(final StyleBuilderApplicable@NotNull... applicables) { if (applicables.length == 0) return empty(); final Builder builder = style(); for (int i = 0, length = applicables.length; i < length; i++) { @@ -179,7 +179,7 @@ public interface Style extends Buildable, Examinable { * @return a style * @since 4.0.0 */ - static @NonNull Style style(final @NonNull Iterable applicables) { + static @NotNull Style style(final @NotNull Iterable applicables) { final Builder builder = style(); for (final StyleBuilderApplicable applicable : applicables) { applicable.styleApply(builder); @@ -196,7 +196,7 @@ public interface Style extends Buildable, Examinable { * @return a new style * @since 4.0.0 */ - default @NonNull Style edit(final @NonNull Consumer consumer) { + default @NotNull Style edit(final @NotNull Consumer consumer) { return this.edit(consumer, Merge.Strategy.ALWAYS); } @@ -208,7 +208,7 @@ public interface Style extends Buildable, Examinable { * @return a new style * @since 4.0.0 */ - default @NonNull Style edit(final @NonNull Consumer consumer, final Merge.@NonNull Strategy strategy) { + default @NotNull Style edit(final @NotNull Consumer consumer, final Merge.@NotNull Strategy strategy) { return style(style -> { if (strategy == Merge.Strategy.ALWAYS) { style.merge(this, strategy); @@ -238,7 +238,7 @@ public interface Style extends Buildable, Examinable { * @since 4.0.0 * @sinceMinecraft 1.16 */ - @NonNull Style font(final @Nullable Key font); + @NotNull Style font(final @Nullable Key font); /** * Gets the color. @@ -255,7 +255,7 @@ public interface Style extends Buildable, Examinable { * @return a style * @since 4.0.0 */ - @NonNull Style color(final @Nullable TextColor color); + @NotNull Style color(final @Nullable TextColor color); /** * Sets the color if there isn't one set already. @@ -264,7 +264,7 @@ public interface Style extends Buildable, Examinable { * @return this builder * @since 4.0.0 */ - @NonNull Style colorIfAbsent(final @Nullable TextColor color); + @NotNull Style colorIfAbsent(final @Nullable TextColor color); /** * Tests if this style has a decoration. @@ -274,7 +274,7 @@ public interface Style extends Buildable, Examinable { * style does not have the decoration * @since 4.0.0 */ - default boolean hasDecoration(final @NonNull TextDecoration decoration) { + default boolean hasDecoration(final @NotNull TextDecoration decoration) { return this.decoration(decoration) == TextDecoration.State.TRUE; } @@ -287,7 +287,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * and {@link TextDecoration.State#NOT_SET} if not set * @since 4.0.0 */ - TextDecoration.@NonNull State decoration(final @NonNull TextDecoration decoration); + TextDecoration.@NotNull State decoration(final @NotNull TextDecoration decoration); /** * Sets the state of {@code decoration} to {@link TextDecoration.State#TRUE} on this style. @@ -296,7 +296,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style decorate(final @NonNull TextDecoration decoration) { + default @NotNull Style decorate(final @NotNull TextDecoration decoration) { return this.decoration(decoration, TextDecoration.State.TRUE); } @@ -309,7 +309,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style decoration(final @NonNull TextDecoration decoration, final boolean flag) { + default @NotNull Style decoration(final @NotNull TextDecoration decoration, final boolean flag) { return this.decoration(decoration, TextDecoration.State.byBoolean(flag)); } @@ -324,7 +324,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - @NonNull Style decoration(final @NonNull TextDecoration decoration, final TextDecoration.@NonNull State state); + @NotNull Style decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state); /** * Gets a map of decorations this style has. @@ -332,7 +332,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a set of decorations this style has * @since 4.0.0 */ - @Unmodifiable @NonNull Map decorations(); + @Unmodifiable @NotNull Map decorations(); /** * Sets decorations for this style using the specified {@code decorations} map. @@ -343,7 +343,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - @NonNull Style decorations(final @NonNull Map decorations); + @NotNull Style decorations(final @NotNull Map decorations); /** * Gets the click event. @@ -360,7 +360,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - @NonNull Style clickEvent(final @Nullable ClickEvent event); + @NotNull Style clickEvent(final @Nullable ClickEvent event); /** * Gets the hover event. @@ -377,7 +377,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - @NonNull Style hoverEvent(final @Nullable HoverEventSource source); + @NotNull Style hoverEvent(final @Nullable HoverEventSource source); /** * Gets the string to be inserted when this style is shift-clicked. @@ -394,7 +394,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - @NonNull Style insertion(final @Nullable String insertion); + @NotNull Style insertion(final @Nullable String insertion); /** * Merges from another style into this style. @@ -403,7 +403,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style merge(final @NonNull Style that) { + default @NotNull Style merge(final @NotNull Style that) { return this.merge(that, Merge.all()); } @@ -415,7 +415,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style merge(final @NonNull Style that, final Merge.@NonNull Strategy strategy) { + default @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy) { return this.merge(that, strategy, Merge.all()); } @@ -427,7 +427,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style merge(final @NonNull Style that, final @NonNull Merge merge) { + default @NotNull Style merge(final @NotNull Style that, final @NotNull Merge merge) { return this.merge(that, Collections.singleton(merge)); } @@ -440,7 +440,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style merge(final @NonNull Style that, final Merge.@NonNull Strategy strategy, final @NonNull Merge merge) { + default @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Merge merge) { return this.merge(that, strategy, Collections.singleton(merge)); } @@ -452,7 +452,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style merge(final @NonNull Style that, final @NonNull Merge@NonNull... merges) { + default @NotNull Style merge(final @NotNull Style that, final @NotNull Merge@NotNull... merges) { return this.merge(that, Merge.of(merges)); } @@ -465,7 +465,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style merge(final @NonNull Style that, final Merge.@NonNull Strategy strategy, final @NonNull Merge@NonNull... merges) { + default @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Merge@NotNull... merges) { return this.merge(that, strategy, Merge.of(merges)); } @@ -477,7 +477,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - default @NonNull Style merge(final @NonNull Style that, final @NonNull Set merges) { + default @NotNull Style merge(final @NotNull Style that, final @NotNull Set merges) { return this.merge(that, Merge.Strategy.ALWAYS, merges); } @@ -490,7 +490,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a style * @since 4.0.0 */ - @NonNull Style merge(final @NonNull Style that, final Merge.@NonNull Strategy strategy, final @NonNull Set merges); + @NotNull Style merge(final @NotNull Style that, final Merge.@NotNull Strategy strategy, final @NotNull Set merges); /** * Tests if this style is empty. @@ -507,7 +507,7 @@ default boolean hasDecoration(final @NonNull TextDecoration decoration) { * @return a builder */ @Override - @NonNull Builder toBuilder(); + @NotNull Builder toBuilder(); /** * A merge choice. @@ -555,7 +555,7 @@ enum Merge { * @return a merge set * @since 4.0.0 */ - public static @Unmodifiable @NonNull Set all() { + public static @Unmodifiable @NotNull Set all() { return ALL; } @@ -565,7 +565,7 @@ enum Merge { * @return a merge set * @since 4.0.0 */ - public static @Unmodifiable @NonNull Set colorAndDecorations() { + public static @Unmodifiable @NotNull Set colorAndDecorations() { return COLOR_AND_DECORATIONS; } @@ -576,11 +576,11 @@ enum Merge { * @return a merge set * @since 4.0.0 */ - public static @Unmodifiable @NonNull Set of(final Merge@NonNull... merges) { + public static @Unmodifiable @NotNull Set of(final Merge@NotNull... merges) { return MonkeyBars.enumSet(Merge.class, merges); } - static boolean hasAll(final @NonNull Set merges) { + static boolean hasAll(final @NotNull Set merges) { return merges.size() == ALL.size(); } @@ -626,7 +626,7 @@ interface Builder extends Buildable.Builder