Remove a bunch more experimental annotations (#12712)

Author: Machine-Maker

paper-api/src/main/java/com/destroystokyo/paper/event/brigadier/CommandRegisteredEvent.java

@@ -9,7 +9,6 @@
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.server.ServerEvent;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -19,10 +18,8 @@
  * This is done at Plugin Enable time after commands have been registered, but may also
  * run at a later point in the server lifetime due to plugins, a server reload, etc.</p>
  *
- * <p>This is a draft/experimental API and is subject to change.</p>
  * @deprecated For removal, use the new brigadier api.
  */
-@ApiStatus.Experimental
 @Deprecated(since = "1.20.6")
 @Warning(reason = "This event has been superseded by the Commands API and will be removed in a future release. Listen to LifecycleEvents.COMMANDS instead.", value = true)
 public class CommandRegisteredEvent<S extends com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource> extends ServerEvent implements Cancellable {

paper-api/src/main/java/io/papermc/paper/command/brigadier/BasicCommand.java

@@ -4,15 +4,12 @@
 import java.util.Collections;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Implementing this interface allows for easily creating "Bukkit-style" {@code String[] args} commands.
  * The implementation handles converting the command to a representation compatible with Brigadier on registration, usually in the form of {@literal /commandlabel <greedy_string>}.
  */
-@ApiStatus.Experimental
-@NullMarked
 @FunctionalInterface
 public interface BasicCommand {
 

paper-api/src/main/java/io/papermc/paper/command/brigadier/CommandSourceStack.java

@@ -6,7 +6,6 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -21,8 +20,6 @@
  * exist yet, or no specific sender is available. Methods on such a {@link CommandSender}
  * will either have no effect or throw an {@link UnsupportedOperationException}.</p>
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface CommandSourceStack {
 

paper-api/src/main/java/io/papermc/paper/command/brigadier/Commands.java

@@ -17,7 +17,6 @@
 import java.util.function.Predicate;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -60,8 +59,6 @@
  *
  * @see io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents#COMMANDS
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface Commands extends Registrar {
 

paper-api/src/main/java/io/papermc/paper/command/brigadier/MessageComponentSerializer.java

@@ -1,16 +1,15 @@
 package io.papermc.paper.command.brigadier;
 
 import com.mojang.brigadier.Message;
+import java.util.Optional;
+import java.util.ServiceLoader;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * A component serializer for converting between {@link Message} and {@link Component}.
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface MessageComponentSerializer extends ComponentSerializer<Component, Component, Message> {
 
@@ -20,6 +19,10 @@ public interface MessageComponentSerializer extends ComponentSerializer<Componen
      * @return serializer instance
      */
     static MessageComponentSerializer message() {
-        return MessageComponentSerializerHolder.PROVIDER.orElseThrow();
+        final class Holder {
+            static final Optional<MessageComponentSerializer> PROVIDER = ServiceLoader.load(MessageComponentSerializer.class)
+                .findFirst();
+        }
+        return Holder.PROVIDER.orElseThrow();
     }
 }

paper-api/src/main/java/io/papermc/paper/command/brigadier/MessageComponentSerializerHolder.java

@@ -28,8 +28,6 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scoreboard.Criteria;
 import org.bukkit.scoreboard.DisplaySlot;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 import static io.papermc.paper.command.brigadier.argument.VanillaArgumentProvider.provider;
 
@@ -41,8 +39,6 @@
  *
  * <p>{@link CustomArgumentType} is provided for customizing parsing or result types server-side, while sending the vanilla argument type to the client.</p>
  */
-@ApiStatus.Experimental
-@NullMarked
 public final class ArgumentTypes {
 
     /**

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java

@@ -9,7 +9,6 @@
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * An argument type that wraps around a native-to-vanilla argument type.
@@ -23,8 +22,6 @@
  * @param <T> custom type
  * @param <N> type with an argument native to vanilla Minecraft (from {@link ArgumentTypes})
  */
-@ApiStatus.Experimental
-@NullMarked
 public interface CustomArgumentType<T, N> extends ArgumentType<T> {
 
     /**
@@ -107,7 +104,6 @@ default <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<
      * @param <T> custom type
      * @param <N> type with an argument native to vanilla Minecraft (from {@link ArgumentTypes})
      */
-    @ApiStatus.Experimental
     interface Converted<T, N> extends CustomArgumentType<T, N> {
 
         @ApiStatus.NonExtendable

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/CustomArgumentType.java

@@ -3,12 +3,10 @@
 import com.mojang.brigadier.context.CommandContext;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Utilities for extracting registry-related arguments from a {@link CommandContext}.
  */
-@NullMarked
 public final class RegistryArgumentExtractor {
 
     /**

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/RegistryArgumentExtractor.java

@@ -6,15 +6,12 @@
 import java.util.concurrent.CompletableFuture;
 import net.kyori.adventure.chat.SignedMessage;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * A resolver for a {@link SignedMessage}
  *
  * @see ArgumentTypes#signedMessage()
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface SignedMessageResolver {
 
@@ -38,5 +35,4 @@ public interface SignedMessageResolver {
      * @throws CommandSyntaxException syntax exception
      */
     CompletableFuture<SignedMessage> resolveSignedMessage(String argumentName, CommandContext<CommandSourceStack> context) throws CommandSyntaxException;
-
 }