zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

🎨 @Annotation final -> final @Annotation

Browse source
This commit is contained in:
Alexander Söderberg 2020-10-03 21:40:07 +02:00
parent a6b98ca278
commit 7f013124b2
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
113 changed files with 844 additions and 842 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java
View file

@ -51,11 +51,11 @@ final class BukkitCommand<C> extends org.bukkit.command.Command implements Plugi
private final Command<C> cloudCommand;
@SuppressWarnings("unchecked")
BukkitCommand(@NonNull final String label,
@NonNull final List<@NonNull String> aliases,
@NonNull final Command<C> cloudCommand,
@NonNull final CommandArgument<C, ?> command,
@NonNull final BukkitCommandManager<C> manager) {
BukkitCommand(final @NonNull String label,
final @NonNull List<@NonNull String> aliases,
final @NonNull Command<C> cloudCommand,
final @NonNull CommandArgument<C, ?> command,
final @NonNull BukkitCommandManager<C> manager) {
super(label,
cloudCommand.getCommandMeta().getOrDefault("description", ""),
"",

16
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java
View file

@ -83,11 +83,11 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
* @param backwardsCommandSenderMapper Function that maps the command sender type to {@link CommandSender}
* @throws Exception If the construction of the manager fails
*/
public BukkitCommandManager(@NonNull final Plugin owningPlugin,
@NonNull final Function<@NonNull CommandTree<C>,
public BukkitCommandManager(final @NonNull Plugin owningPlugin,
final @NonNull Function<@NonNull CommandTree<C>,
@NonNull CommandExecutionCoordinator<C>> commandExecutionCoordinator,
@NonNull final Function<@NonNull CommandSender, @NonNull C> commandSenderMapper,
@NonNull final Function<@NonNull C, @NonNull CommandSender> backwardsCommandSenderMapper)
final @NonNull Function<@NonNull CommandSender, @NonNull C> commandSenderMapper,
final @NonNull Function<@NonNull C, @NonNull CommandSender> backwardsCommandSenderMapper)
throws Exception {
super(commandExecutionCoordinator, new BukkitPluginRegistrationHandler<>());
((BukkitPluginRegistrationHandler<C>) this.getCommandRegistrationHandler()).initialize(this);
@ -170,7 +170,7 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
}
@Override
public final boolean hasPermission(@NonNull final C sender, @NonNull final String permission) {
public final boolean hasPermission(final @NonNull C sender, final @NonNull String permission) {
if (permission.isEmpty()) {
return true;
}
@ -198,7 +198,7 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
* @param capability Capability
* @return {@code true} if the manager has the given capability, else {@code false}
*/
public final boolean queryCapability(@NonNull final CloudBukkitCapabilities capability) {
public final boolean queryCapability(final @NonNull CloudBukkitCapabilities capability) {
return this.queryCapabilities().contains(capability);
}
@ -273,7 +273,7 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
*
* @param reason Reason
*/
public BrigadierFailureException(@NonNull final BrigadierFailureReason reason) {
public BrigadierFailureException(final @NonNull BrigadierFailureReason reason) {
this.reason = reason;
}
@ -283,7 +283,7 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
* @param reason Reason
* @param cause Cause
*/
public BrigadierFailureException(@NonNull final BrigadierFailureReason reason, @NonNull final Throwable cause) {
public BrigadierFailureException(final @NonNull BrigadierFailureReason reason, final @NonNull Throwable cause) {
super(cause);
this.reason = reason;
}

2
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java
View file

@ -33,7 +33,7 @@ public class BukkitCommandMeta extends SimpleCommandMeta {
*
* @param simpleCommandMeta Simple command meta data instance that gets mirrored
*/
public BukkitCommandMeta(@NonNull final SimpleCommandMeta simpleCommandMeta) {
public BukkitCommandMeta(final @NonNull SimpleCommandMeta simpleCommandMeta) {
super(simpleCommandMeta.getAll());
}

4
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java
View file

@ -52,7 +52,7 @@ public final class BukkitCommandMetaBuilder {
* @param description Command description
* @return Builder instance
*/
public @NonNull BuilderStage2 withDescription(@NonNull final String description) {
public @NonNull BuilderStage2 withDescription(final @NonNull String description) {
return new BuilderStage2(description);
}
@ -63,7 +63,7 @@ public final class BukkitCommandMetaBuilder {
private final String description;
private BuilderStage2(@NonNull final String description) {
private BuilderStage2(final @NonNull String description) {
this.description = description;
}

2
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java
View file

@ -51,7 +51,7 @@ final class BukkitCommandPreprocessor<C> implements CommandPreprocessor<C> {
* and a {@link java.util.Set} of {@link CloudBukkitCapabilities} with the key "CloudBukkitCapabilities"
*/
@Override
public void accept(@NonNull final CommandPreprocessingContext<C> context) {
public void accept(final @NonNull CommandPreprocessingContext<C> context) {
context.getCommandContext().store("BukkitCommandSender", mgr.getBackwardsCommandSenderMapper().apply(
context.getCommandContext().getSender()));
context.getCommandContext().store("CloudBukkitCapabilities", mgr.queryCapabilities());

4
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java
View file

@ -50,7 +50,7 @@ public abstract class BukkitCommandSender {
* @param player Player instance
* @return Constructed command sender
*/
public static @NonNull BukkitCommandSender player(@NonNull final Player player) {
public static @NonNull BukkitCommandSender player(final @NonNull Player player) {
return new BukkitPlayerSender(player);
}
@ -122,7 +122,7 @@ public abstract class BukkitCommandSender {
*
* @param message Message to send
*/
public void sendMessage(@NonNull final String message) {
public void sendMessage(final @NonNull String message) {
this.internalSender.sendMessage(message);
}

2
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java
View file

@ -28,7 +28,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
final class BukkitPlayerSender extends BukkitCommandSender {
BukkitPlayerSender(@NonNull final Player player) {
BukkitPlayerSender(final @NonNull Player player) {
super(player);
}

10
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java
View file

@ -51,7 +51,7 @@ class BukkitPluginRegistrationHandler<C> implements CommandRegistrationHandler {
BukkitPluginRegistrationHandler() {
}
void initialize(@NonNull final BukkitCommandManager<C> bukkitCommandManager) throws Exception {
void initialize(final @NonNull BukkitCommandManager<C> bukkitCommandManager) throws Exception {
final Method getCommandMap = Bukkit.getServer().getClass().getDeclaredMethod("getCommandMap");
getCommandMap.setAccessible(true);
this.commandMap = (CommandMap) getCommandMap.invoke(Bukkit.getServer());
@ -65,7 +65,7 @@ class BukkitPluginRegistrationHandler<C> implements CommandRegistrationHandler {
}
@Override
public boolean registerCommand(@NonNull final Command<?> command) {
public boolean registerCommand(final @NonNull Command<?> command) {
/* We only care about the root command argument */
final CommandArgument<?, ?> commandArgument = command.getArguments().get(0);
if (this.registeredCommands.containsKey(commandArgument)) {
@ -111,9 +111,9 @@ class BukkitPluginRegistrationHandler<C> implements CommandRegistrationHandler {
return true;
}
protected void registerExternal(@NonNull final String label,
@NonNull final Command<?> command,
@NonNull final BukkitCommand<C> bukkitCommand) {
protected void registerExternal(final @NonNull String label,
final @NonNull Command<?> command,
final @NonNull BukkitCommand<C> bukkitCommand) {
}
}

8
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java
View file

@ -39,7 +39,7 @@ class CloudCommodoreManager<C> extends BukkitPluginRegistrationHandler<C> {
private final CloudBrigadierManager brigadierManager;
private final Commodore commodore;
CloudCommodoreManager(@NonNull final BukkitCommandManager<C> commandManager)
CloudCommodoreManager(final @NonNull BukkitCommandManager<C> commandManager)
throws BukkitCommandManager.BrigadierFailureException {
if (!CommodoreProvider.isSupported()) {
throw new BukkitCommandManager.BrigadierFailureException(BukkitCommandManager
@ -52,9 +52,9 @@ class CloudCommodoreManager<C> extends BukkitPluginRegistrationHandler<C> {
}
@Override
protected void registerExternal(@NonNull final String label,
@NonNull final Command<?> command,
@NonNull final BukkitCommand<C> bukkitCommand) {
protected void registerExternal(final @NonNull String label,
final @NonNull Command<?> command,
final @NonNull BukkitCommand<C> bukkitCommand) {
final com.mojang.brigadier.Command<?> cmd = o -> 1;
final LiteralCommandNode<?> literalCommandNode = this.brigadierManager
.createLiteralCommandNode(label, command, (o, p) -> true, cmd);

24
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java
View file

@ -45,9 +45,9 @@ import java.util.stream.Collectors;
public class MaterialArgument<C> extends CommandArgument<C, Material> {
protected MaterialArgument(final boolean required,
@NonNull final String name,
@NonNull final String defaultValue,
@Nullable final BiFunction<@NonNull CommandContext<C>, @NonNull String,
final @NonNull String name,
final @NonNull String defaultValue,
final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
@NonNull List<@NonNull String>> suggestionsProvider) {
super(required, name, new MaterialParser<>(), defaultValue, Material.class, suggestionsProvider);
}
@ -59,7 +59,7 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
* @param <C> Command sender type
* @return Created builder
*/
public static <C> MaterialArgument.@NonNull Builder<C> newBuilder(@NonNull final String name) {
public static <C> MaterialArgument.@NonNull Builder<C> newBuilder(final @NonNull String name) {
return new MaterialArgument.Builder<>(name);
}
@ -70,7 +70,7 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Material> of(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Material> of(final @NonNull String name) {
return MaterialArgument.<C>newBuilder(name).asRequired().build();
}
@ -81,7 +81,7 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Material> optional(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Material> optional(final @NonNull String name) {
return MaterialArgument.<C>newBuilder(name).asOptional().build();
}
@ -93,14 +93,14 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Material> optional(@NonNull final String name,
@NonNull final Material material) {
public static <C> @NonNull CommandArgument<C, Material> optional(final @NonNull String name,
final @NonNull Material material) {
return MaterialArgument.<C>newBuilder(name).asOptionalWithDefault(material.name().toLowerCase()).build();
}
public static final class Builder<C> extends CommandArgument.Builder<C, Material> {
protected Builder(@NonNull final String name) {
protected Builder(final @NonNull String name) {
super(Material.class, name);
}
@ -110,8 +110,8 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
public static final class MaterialParser<C> implements ArgumentParser<C, Material> {
@Override
public @NonNull ArgumentParseResult<Material> parse(@NonNull final CommandContext<C> commandContext,
@NonNull final Queue<@NonNull String> inputQueue) {
public @NonNull ArgumentParseResult<Material> parse(final @NonNull CommandContext<C> commandContext,
final @NonNull Queue<@NonNull String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return ArgumentParseResult.failure(new NullPointerException("No input was provided"));
@ -138,7 +138,7 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
*
* @param input Input
*/
public MaterialParseException(@NonNull final String input) {
public MaterialParseException(final @NonNull String input) {
this.input = input;
}

28
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java
View file

@ -50,9 +50,9 @@ import java.util.function.BiFunction;
public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePlayer> {
private OfflinePlayerArgument(final boolean required,
@NonNull final String name,
@NonNull final String defaultValue,
@Nullable final BiFunction<@NonNull CommandContext<C>, @NonNull String,
final @NonNull String name,
final @NonNull String defaultValue,
final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
@NonNull List<@NonNull String>> suggestionsProvider) {
super(required, name, new OfflinePlayerParser<>(), defaultValue, OfflinePlayer.class, suggestionsProvider);
}
@ -64,7 +64,7 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
* @param <C> Command sender type
* @return Created builder
*/
public static <C> @NonNull Builder<C> newBuilder(@NonNull final String name) {
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
}
@ -75,7 +75,7 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, OfflinePlayer> of(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, OfflinePlayer> of(final @NonNull String name) {
return OfflinePlayerArgument.<C>newBuilder(name).asRequired().build();
}
@ -86,7 +86,7 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, OfflinePlayer> optional(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, OfflinePlayer> optional(final @NonNull String name) {
return OfflinePlayerArgument.<C>newBuilder(name).asOptional().build();
}
@ -98,15 +98,15 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, OfflinePlayer> optional(@NonNull final String name,
@NonNull final String defaultPlayer) {
public static <C> @NonNull CommandArgument<C, OfflinePlayer> optional(final @NonNull String name,
final @NonNull String defaultPlayer) {
return OfflinePlayerArgument.<C>newBuilder(name).asOptionalWithDefault(defaultPlayer).build();
}
public static final class Builder<C> extends CommandArgument.Builder<C, OfflinePlayer> {
protected Builder(@NonNull final String name) {
protected Builder(final @NonNull String name) {
super(OfflinePlayer.class, name);
}
@ -127,8 +127,8 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
public static final class OfflinePlayerParser<C> implements ArgumentParser<C, OfflinePlayer> {
@Override
public @NonNull ArgumentParseResult<OfflinePlayer> parse(@NonNull final CommandContext<C> commandContext,
@NonNull final Queue<String> inputQueue) {
public @NonNull ArgumentParseResult<OfflinePlayer> parse(final @NonNull CommandContext<C> commandContext,
final @NonNull Queue<String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return ArgumentParseResult.failure(new NullPointerException("No input was provided"));
@ -146,8 +146,8 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
}
@Override
public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext<C> commandContext,
@NonNull final String input) {
public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext<C> commandContext,
final @NonNull String input) {
List<String> output = new ArrayList<>();
for (Player player : Bukkit.getOnlinePlayers()) {
@ -171,7 +171,7 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
*
* @param input String input
*/
public OfflinePlayerParseException(@NonNull final String input) {
public OfflinePlayerParseException(final @NonNull String input) {
this.input = input;
}

28
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java
View file

@ -46,9 +46,9 @@ import java.util.function.BiFunction;
public final class PlayerArgument<C> extends CommandArgument<C, Player> {
private PlayerArgument(final boolean required,
@NonNull final String name,
@NonNull final String defaultValue,
@Nullable final BiFunction<@NonNull CommandContext<C>, @NonNull String,
final @NonNull String name,
final @NonNull String defaultValue,
final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
@NonNull List<@NonNull String>> suggestionsProvider) {
super(required, name, new PlayerParser<>(), defaultValue, Player.class, suggestionsProvider);
}
@ -60,7 +60,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
* @param <C> Command sender type
* @return Created builder
*/
public static <C> @NonNull Builder<C> newBuilder(@NonNull final String name) {
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
}
@ -71,7 +71,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, Player> of(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Player> of(final @NonNull String name) {
return PlayerArgument.<C>newBuilder(name).asRequired().build();
}
@ -82,7 +82,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, Player> optional(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Player> optional(final @NonNull String name) {
return PlayerArgument.<C>newBuilder(name).asOptional().build();
}
@ -94,15 +94,15 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, Player> optional(@NonNull final String name,
@NonNull final String defaultPlayer) {
public static <C> @NonNull CommandArgument<C, Player> optional(final @NonNull String name,
final @NonNull String defaultPlayer) {
return PlayerArgument.<C>newBuilder(name).asOptionalWithDefault(defaultPlayer).build();
}
public static final class Builder<C> extends CommandArgument.Builder<C, Player> {
protected Builder(@NonNull final String name) {
protected Builder(final @NonNull String name) {
super(Player.class, name);
}
@ -122,8 +122,8 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
public static final class PlayerParser<C> implements ArgumentParser<C, Player> {
@Override
public @NonNull ArgumentParseResult<Player> parse(@NonNull final CommandContext<C> commandContext,
@NonNull final Queue<@NonNull String> inputQueue) {
public @NonNull ArgumentParseResult<Player> parse(final @NonNull CommandContext<C> commandContext,
final @NonNull Queue<@NonNull String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return ArgumentParseResult.failure(new NullPointerException("No input was provided"));
@ -141,8 +141,8 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
}
@Override
public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext<C> commandContext,
@NonNull final String input) {
public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext<C> commandContext,
final @NonNull String input) {
List<String> output = new ArrayList<>();
for (Player player : Bukkit.getOnlinePlayers()) {
@ -166,7 +166,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
*
* @param input String input
*/
public PlayerParseException(@NonNull final String input) {
public PlayerParseException(final @NonNull String input) {
this.input = input;
}

26
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java
View file

@ -45,9 +45,9 @@ import java.util.stream.Collectors;
public class WorldArgument<C> extends CommandArgument<C, World> {
protected WorldArgument(final boolean required,
@NonNull final String name,
@NonNull final String defaultValue,
@Nullable final BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider) {
final @NonNull String name,
final @NonNull String defaultValue,
final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider) {
super(required, name, new WorldParser<>(), defaultValue, World.class, suggestionsProvider);
}
@ -58,7 +58,7 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
* @param <C> Command sender type
* @return Created builder
*/
public static <C> CommandArgument.@NonNull Builder<C, World> newBuilder(@NonNull final String name) {
public static <C> CommandArgument.@NonNull Builder<C, World> newBuilder(final @NonNull String name) {
return new WorldArgument.Builder<>(name);
}
@ -69,7 +69,7 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, World> of(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, World> of(final @NonNull String name) {
return WorldArgument.<C>newBuilder(name).asRequired().build();
}
@ -80,7 +80,7 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, World> optional(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, World> optional(final @NonNull String name) {
return WorldArgument.<C>newBuilder(name).asOptional().build();
}
@ -92,15 +92,15 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, World> optional(@NonNull final String name,
@NonNull final String defaultValue) {
public static <C> @NonNull CommandArgument<C, World> optional(final @NonNull String name,
final @NonNull String defaultValue) {
return WorldArgument.<C>newBuilder(name).asOptionalWithDefault(defaultValue).build();
}
public static final class Builder<C> extends CommandArgument.Builder<C, World> {
protected Builder(@NonNull final String name) {
protected Builder(final @NonNull String name) {
super(World.class, name);
}
@ -114,8 +114,8 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
public static final class WorldParser<C> implements ArgumentParser<C, World> {
@Override
public @NonNull ArgumentParseResult<World> parse(@NonNull final CommandContext<C> commandContext,
@NonNull final Queue<String> inputQueue) {
public @NonNull ArgumentParseResult<World> parse(final @NonNull CommandContext<C> commandContext,
final @NonNull Queue<String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return ArgumentParseResult.failure(new NullPointerException("No input was provided"));
@ -131,7 +131,7 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
}
@Override
public @NonNull List<String> suggestions(@NonNull final CommandContext<C> commandContext, @NonNull final String input) {
public @NonNull List<String> suggestions(final @NonNull CommandContext<C> commandContext, final @NonNull String input) {
return Bukkit.getWorlds().stream().map(World::getName).collect(Collectors.toList());
}
@ -147,7 +147,7 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
*
* @param input Input
*/
public WorldParseException(@NonNull final String input) {
public WorldParseException(final @NonNull String input) {
this.input = input;
}

22
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java
View file

@ -42,9 +42,9 @@ import java.util.function.BiFunction;
public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C, MultipleEntitySelector> {
private MultipleEntitySelectorArgument(final boolean required,
@NonNull final String name,
@NonNull final String defaultValue,
@Nullable final BiFunction<@NonNull CommandContext<C>, @NonNull String,
final @NonNull String name,
final @NonNull String defaultValue,
final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
@NonNull List<@NonNull String>> suggestionsProvider) {
super(required, name, new MultipleEntitySelectorParser<>(), defaultValue, MultipleEntitySelector.class,
suggestionsProvider);
@ -57,7 +57,7 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
* @param <C> Command sender type
* @return Created builder
*/
public static <C> MultipleEntitySelectorArgument.@NonNull Builder<C> newBuilder(@NonNull final String name) {
public static <C> MultipleEntitySelectorArgument.@NonNull Builder<C> newBuilder(final @NonNull String name) {
return new MultipleEntitySelectorArgument.Builder<>(name);
}
@ -68,7 +68,7 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, MultipleEntitySelector> of(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, MultipleEntitySelector> of(final @NonNull String name) {
return MultipleEntitySelectorArgument.<C>newBuilder(name).asRequired().build();
}
@ -79,7 +79,7 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, MultipleEntitySelector> optional(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, MultipleEntitySelector> optional(final @NonNull String name) {
return MultipleEntitySelectorArgument.<C>newBuilder(name).asOptional().build();
}
@ -91,15 +91,15 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, MultipleEntitySelector> optional(@NonNull final String name,
@NonNull final String defaultEntitySelector) {
public static <C> @NonNull CommandArgument<C, MultipleEntitySelector> optional(final @NonNull String name,
final @NonNull String defaultEntitySelector) {
return MultipleEntitySelectorArgument.<C>newBuilder(name).asOptionalWithDefault(defaultEntitySelector).build();
}
public static final class Builder<C> extends CommandArgument.Builder<C, MultipleEntitySelector> {
protected Builder(@NonNull final String name) {
protected Builder(final @NonNull String name) {
super(MultipleEntitySelector.class, name);
}
@ -120,8 +120,8 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
public static final class MultipleEntitySelectorParser<C> implements ArgumentParser<C, MultipleEntitySelector> {
@Override
public @NonNull ArgumentParseResult<MultipleEntitySelector> parse(@NonNull final CommandContext<C> commandContext,
@NonNull final Queue<@NonNull String> inputQueue) {
public @NonNull ArgumentParseResult<MultipleEntitySelector> parse(final @NonNull CommandContext<C> commandContext,
final @NonNull Queue<@NonNull String> inputQueue) {
if (!commandContext.<Set<CloudBukkitCapabilities>>get("CloudBukkitCapabilities").contains(
CloudBukkitCapabilities.BRIGADIER)) {
return ArgumentParseResult.failure(

26
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java
View file

@ -46,9 +46,9 @@ import java.util.function.BiFunction;
public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C, MultiplePlayerSelector> {
private MultiplePlayerSelectorArgument(final boolean required,
@NonNull final String name,
@NonNull final String defaultValue,
@Nullable final BiFunction<@NonNull CommandContext<C>, @NonNull String,
final @NonNull String name,
final @NonNull String defaultValue,
final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
@NonNull List<@NonNull String>> suggestionsProvider) {
super(required, name, new MultiplePlayerSelectorParser<>(), defaultValue, MultiplePlayerSelector.class,
suggestionsProvider);
@ -61,7 +61,7 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
* @param <C> Command sender type
* @return Created builder
*/
public static <C> MultiplePlayerSelectorArgument.Builder<C> newBuilder(@NonNull final String name) {
public static <C> MultiplePlayerSelectorArgument.Builder<C> newBuilder(final @NonNull String name) {
return new MultiplePlayerSelectorArgument.Builder<>(name);
}
@ -72,7 +72,7 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, MultiplePlayerSelector> of(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, MultiplePlayerSelector> of(final @NonNull String name) {
return MultiplePlayerSelectorArgument.<C>newBuilder(name).asRequired().build();
}
@ -83,7 +83,7 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, MultiplePlayerSelector> optional(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, MultiplePlayerSelector> optional(final @NonNull String name) {
return MultiplePlayerSelectorArgument.<C>newBuilder(name).asOptional().build();
}
@ -95,15 +95,15 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, MultiplePlayerSelector> optional(@NonNull final String name,
@NonNull final String defaultEntitySelector) {
public static <C> @NonNull CommandArgument<C, MultiplePlayerSelector> optional(final @NonNull String name,
final @NonNull String defaultEntitySelector) {
return MultiplePlayerSelectorArgument.<C>newBuilder(name).asOptionalWithDefault(defaultEntitySelector).build();
}
public static final class Builder<C> extends CommandArgument.Builder<C, MultiplePlayerSelector> {
protected Builder(@NonNull final String name) {
protected Builder(final @NonNull String name) {
super(MultiplePlayerSelector.class, name);
}
@ -124,8 +124,8 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
public static final class MultiplePlayerSelectorParser<C> implements ArgumentParser<C, MultiplePlayerSelector> {
@Override
public @NonNull ArgumentParseResult<MultiplePlayerSelector> parse(@NonNull final CommandContext<C> commandContext,
@NonNull final Queue<@NonNull String> inputQueue) {
public @NonNull ArgumentParseResult<MultiplePlayerSelector> parse(final @NonNull CommandContext<C> commandContext,
final @NonNull Queue<@NonNull String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return ArgumentParseResult.failure(new NullPointerException("No input was provided"));
@ -159,8 +159,8 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
}
@Override
public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext<C> commandContext,
@NonNull final String input) {
public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext<C> commandContext,
final @NonNull String input) {
List<String> output = new ArrayList<>();
for (Player player : Bukkit.getOnlinePlayers()) {

2
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java
View file

@ -37,7 +37,7 @@ public final class SelectorParseException extends IllegalArgumentException {
*
* @param input String input
*/
public SelectorParseException(@NonNull final String input) {
public SelectorParseException(final @NonNull String input) {
this.input = input;
}

22
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java
View file

@ -42,9 +42,9 @@ import java.util.function.BiFunction;
public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, SingleEntitySelector> {
private SingleEntitySelectorArgument(final boolean required,
@NonNull final String name,
@NonNull final String defaultValue,
@Nullable final BiFunction<@NonNull CommandContext<C>, @NonNull String,
final @NonNull String name,
final @NonNull String defaultValue,
final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
@NonNull List<@NonNull String>> suggestionsProvider) {
super(required, name, new SingleEntitySelectorParser<>(), defaultValue, SingleEntitySelector.class, suggestionsProvider);
}
@ -56,7 +56,7 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
* @param <C> Command sender type
* @return Created builder
*/
public static <C> SingleEntitySelectorArgument.@NonNull Builder<C> newBuilder(@NonNull final String name) {
public static <C> SingleEntitySelectorArgument.@NonNull Builder<C> newBuilder(final @NonNull String name) {
return new SingleEntitySelectorArgument.Builder<>(name);
}
@ -67,7 +67,7 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, SingleEntitySelector> of(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, SingleEntitySelector> of(final @NonNull String name) {
return SingleEntitySelectorArgument.<C>newBuilder(name).asRequired().build();
}
@ -78,7 +78,7 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, SingleEntitySelector> optional(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, SingleEntitySelector> optional(final @NonNull String name) {
return SingleEntitySelectorArgument.<C>newBuilder(name).asOptional().build();
}
@ -90,15 +90,15 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, SingleEntitySelector> optional(@NonNull final String name,
@NonNull final String defaultEntitySelector) {
public static <C> @NonNull CommandArgument<C, SingleEntitySelector> optional(final @NonNull String name,
final @NonNull String defaultEntitySelector) {
return SingleEntitySelectorArgument.<C>newBuilder(name).asOptionalWithDefault(defaultEntitySelector).build();
}
public static final class Builder<C> extends CommandArgument.Builder<C, SingleEntitySelector> {
protected Builder(@NonNull final String name) {
protected Builder(final @NonNull String name) {
super(SingleEntitySelector.class, name);
}
@ -119,8 +119,8 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
public static final class SingleEntitySelectorParser<C> implements ArgumentParser<C, SingleEntitySelector> {
@Override
public @NonNull ArgumentParseResult<SingleEntitySelector> parse(@NonNull final CommandContext<C> commandContext,
@NonNull final Queue<@NonNull String> inputQueue) {
public @NonNull ArgumentParseResult<SingleEntitySelector> parse(final @NonNull CommandContext<C> commandContext,
final @NonNull Queue<@NonNull String> inputQueue) {
if (!((Set<CloudBukkitCapabilities>) commandContext.get("CloudBukkitCapabilities")).contains(
CloudBukkitCapabilities.BRIGADIER)) {
return ArgumentParseResult.failure(

26
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java
View file

@ -46,9 +46,9 @@ import java.util.function.BiFunction;
public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, SinglePlayerSelector> {
private SinglePlayerSelectorArgument(final boolean required,
@NonNull final String name,
@NonNull final String defaultValue,
@Nullable final BiFunction<@NonNull CommandContext<C>, @NonNull String,
final @NonNull String name,
final @NonNull String defaultValue,
final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
@NonNull List<@NonNull String>> suggestionsProvider) {
super(required, name, new SinglePlayerSelectorParser<>(), defaultValue, SinglePlayerSelector.class, suggestionsProvider);
}
@ -60,7 +60,7 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
* @param <C> Command sender type
* @return Created builder
*/
public static <C> SinglePlayerSelectorArgument.@NonNull Builder<C> newBuilder(@NonNull final String name) {
public static <C> SinglePlayerSelectorArgument.@NonNull Builder<C> newBuilder(final @NonNull String name) {
return new SinglePlayerSelectorArgument.Builder<>(name);
}
@ -71,7 +71,7 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, SinglePlayerSelector> of(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, SinglePlayerSelector> of(final @NonNull String name) {
return SinglePlayerSelectorArgument.<C>newBuilder(name).asRequired().build();
}
@ -82,7 +82,7 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, SinglePlayerSelector> optional(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, SinglePlayerSelector> optional(final @NonNull String name) {
return SinglePlayerSelectorArgument.<C>newBuilder(name).asOptional().build();
}
@ -94,15 +94,15 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, SinglePlayerSelector> optional(@NonNull final String name,
@NonNull final String defaultEntitySelector) {
public static <C> @NonNull CommandArgument<C, SinglePlayerSelector> optional(final @NonNull String name,
final @NonNull String defaultEntitySelector) {
return SinglePlayerSelectorArgument.<C>newBuilder(name).asOptionalWithDefault(defaultEntitySelector).build();
}
public static final class Builder<C> extends CommandArgument.Builder<C, SinglePlayerSelector> {
protected Builder(@NonNull final String name) {
protected Builder(final @NonNull String name) {
super(SinglePlayerSelector.class, name);
}
@ -123,8 +123,8 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
public static final class SinglePlayerSelectorParser<C> implements ArgumentParser<C, SinglePlayerSelector> {
@Override
public @NonNull ArgumentParseResult<SinglePlayerSelector> parse(@NonNull final CommandContext<C> commandContext,
@NonNull final Queue<@NonNull String> inputQueue) {
public @NonNull ArgumentParseResult<SinglePlayerSelector> parse(final @NonNull CommandContext<C> commandContext,
final @NonNull Queue<@NonNull String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return ArgumentParseResult.failure(new NullPointerException("No input was provided"));
@ -163,8 +163,8 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
}
@Override
public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext<C> commandContext,
@NonNull final String input) {
public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext<C> commandContext,
final @NonNull String input) {
List<String> output = new ArrayList<>();
for (Player player : Bukkit.getOnlinePlayers()) {