diff --git a/cloud-core/src/main/java/cloud/commandframework/Command.java b/cloud-core/src/main/java/cloud/commandframework/Command.java index ed4758db..26b341e6 100644 --- a/cloud-core/src/main/java/cloud/commandframework/Command.java +++ b/cloud-core/src/main/java/cloud/commandframework/Command.java @@ -145,7 +145,7 @@ public class Command { @NonNull final Description description, @NonNull final String... aliases) { final Map<@NonNull CommandArgument, @NonNull Description> map = new LinkedHashMap<>(); - map.put(StaticArgument.required(commandName, aliases), description); + map.put(StaticArgument.of(commandName, aliases), description); return new Builder<>(null, commandMeta, null, map, new CommandExecutionHandler.NullCommandExecutionHandler<>(), Permission.empty()); } @@ -164,7 +164,7 @@ public class Command { @NonNull final CommandMeta commandMeta, @NonNull final String... aliases) { final Map, Description> map = new LinkedHashMap<>(); - map.put(StaticArgument.required(commandName, aliases), Description.empty()); + map.put(StaticArgument.of(commandName, aliases), Description.empty()); return new Builder<>(null, commandMeta, null, map, new CommandExecutionHandler.NullCommandExecutionHandler<>(), Permission.empty()); } @@ -308,7 +308,7 @@ public class Command { */ public @NonNull Builder literal(@NonNull final String main, @NonNull final String... aliases) { - return this.argument(StaticArgument.required(main, aliases)); + return this.argument(StaticArgument.of(main, aliases)); } /** @@ -322,7 +322,7 @@ public class Command { public @NonNull Builder literal(@NonNull final String main, @NonNull final Description description, @NonNull final String... aliases) { - return this.argument(StaticArgument.required(main, aliases), description); + return this.argument(StaticArgument.of(main, aliases), description); } /** @@ -398,7 +398,7 @@ public class Command { if (this.commandManager == null) { throw new IllegalStateException("This cannot be called from a command that has no command manager attached"); } - return this.argument(ArgumentPair.required(this.commandManager, name, names, parserPair).simple(), description); + return this.argument(ArgumentPair.of(this.commandManager, name, names, parserPair).simple(), description); } /** @@ -431,7 +431,7 @@ public class Command { throw new IllegalStateException("This cannot be called from a command that has no command manager attached"); } return this.argument( - ArgumentPair.required(this.commandManager, name, names, parserPair).withMapper(outputType, mapper), + ArgumentPair.of(this.commandManager, name, names, parserPair).withMapper(outputType, mapper), description); } @@ -460,7 +460,7 @@ public class Command { if (this.commandManager == null) { throw new IllegalStateException("This cannot be called from a command that has no command manager attached"); } - return this.argument(ArgumentTriplet.required(this.commandManager, name, names, parserTriplet).simple(), description); + return this.argument(ArgumentTriplet.of(this.commandManager, name, names, parserTriplet).simple(), description); } /** @@ -495,7 +495,7 @@ public class Command { throw new IllegalStateException("This cannot be called from a command that has no command manager attached"); } return this.argument( - ArgumentTriplet.required(this.commandManager, name, names, parserTriplet).withMapper(outputType, mapper), + ArgumentTriplet.of(this.commandManager, name, names, parserTriplet).withMapper(outputType, mapper), description); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java index 55bf3aff..829bb567 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java @@ -56,8 +56,8 @@ public final class StaticArgument extends CommandArgument { * @param Command sender type * @return Constructed argument */ - public static @NonNull StaticArgument required(@NonNull final String name, - @NonNull final String... aliases) { + public static @NonNull StaticArgument of(@NonNull final String name, + @NonNull final String... aliases) { return new StaticArgument<>(true, name, aliases); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java index 1efc24c8..6bb9d042 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java @@ -78,11 +78,11 @@ public class ArgumentPair extends CompoundArgument, C, O> * @param Second parsed type * @return Intermediary builder */ - public static @NonNull ArgumentPairIntermediaryBuilder required(@NonNull final CommandManager manager, - @NonNull final String name, - @NonNull final Pair<@NonNull String, + public static @NonNull ArgumentPairIntermediaryBuilder of(@NonNull final CommandManager manager, + @NonNull final String name, + @NonNull final Pair<@NonNull String, @NonNull String> names, - @NonNull final Pair<@NonNull Class, + @NonNull final Pair<@NonNull Class, @NonNull Class> types) { final ParserRegistry parserRegistry = manager.getParserRegistry(); final ArgumentParser firstParser = parserRegistry.createParser(TypeToken.get(types.getFirst()), diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java index 1f00e72b..ea4e83b2 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java @@ -82,10 +82,10 @@ public class ArgumentTriplet extends CompoundArgument @NonNull ArgumentTripletIntermediaryBuilder<@NonNull C, @NonNull U, @NonNull V, @NonNull W> - required(@NonNull final CommandManager manager, - @NonNull final String name, - @NonNull final Triplet<@NonNull String, @NonNull String, @NonNull String> names, - @NonNull final Triplet<@NonNull Class, @NonNull Class, @NonNull Class> types) { + of(@NonNull final CommandManager manager, + @NonNull final String name, + @NonNull final Triplet<@NonNull String, @NonNull String, @NonNull String> names, + @NonNull final Triplet<@NonNull Class, @NonNull Class, @NonNull Class> types) { final ParserRegistry parserRegistry = manager.getParserRegistry(); final ArgumentParser firstParser = parserRegistry.createParser(TypeToken.get(types.getFirst()), ParserParameters.empty()).orElseThrow(() -> diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java index 810f89e8..2cf978cd 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java @@ -67,7 +67,7 @@ public final class BooleanArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return BooleanArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java index ae1c38ae..864611e5 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java @@ -71,7 +71,7 @@ public final class ByteArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return ByteArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java index 171b7727..b81b3bee 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java @@ -63,7 +63,7 @@ public final class CharArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return CharArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java index 475643db..e2bb10e8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java @@ -71,7 +71,7 @@ public final class DoubleArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return DoubleArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java index a7de0390..e738bbc7 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java @@ -78,7 +78,7 @@ public class EnumArgument> extends CommandArgument { * @param Enum type * @return Created argument */ - public static > @NonNull CommandArgument required( + public static > @NonNull CommandArgument of( @NonNull final Class enumClass, @NonNull final String name) { return EnumArgument.newBuilder(enumClass, name).asRequired().build(); diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java index 07869273..f1a85911 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java @@ -71,7 +71,7 @@ public final class FloatArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return FloatArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java index 4baa1b84..2ab74697 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java @@ -78,7 +78,7 @@ public final class IntegerArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return IntegerArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java index 870d12cd..84777736 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java @@ -71,7 +71,7 @@ public final class LongArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return LongArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java index 0ef0073f..4b6ab105 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java @@ -71,7 +71,7 @@ public final class ShortArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return ShortArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java index 1793231b..b4c85b0c 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java @@ -69,7 +69,7 @@ public final class StringArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return StringArgument.newBuilder(name).single().asRequired().build(); } @@ -81,8 +81,8 @@ public final class StringArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name, - @NonNull final StringMode stringMode) { + public static @NonNull CommandArgument of(@NonNull final String name, + @NonNull final StringMode stringMode) { return StringArgument.newBuilder(name).withMode(stringMode).asRequired().build(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java index 3a068e76..b92a8087 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java @@ -64,7 +64,7 @@ public final class UUIDArgument extends CommandArgument { * @param Command sender type * @return Created component */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return UUIDArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java index fd49e616..14923258 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java @@ -47,7 +47,7 @@ class CommandHelpHandlerTest { manager.command(manager.commandBuilder("test", meta1).literal("this").literal("thing").build()); final SimpleCommandMeta meta2 = SimpleCommandMeta.builder().with("description", "Command with variables").build(); manager.command(manager.commandBuilder("test", meta2).literal("int"). - argument(IntegerArgument.required("int"), Description.of("A number")).build()); + argument(IntegerArgument.of("int"), Description.of("A number")).build()); manager.command(manager.commandBuilder("vec") .meta("description", "Takes in a vector") diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java index d39ac14e..2d2b39be 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java @@ -40,7 +40,7 @@ public class CommandPreProcessorTest { static void newTree() { manager = new TestCommandManager(); manager.command(manager.commandBuilder("test", SimpleCommandMeta.empty()) - .argument(EnumArgument.required(SampleEnum.class, "enum")) + .argument(EnumArgument.of(SampleEnum.class, "enum")) .handler( commandContext -> System.out.printf("enum = %s | integer = %d\n", commandContext.get( diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java index 7f0150cc..7dbde601 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java @@ -49,7 +49,7 @@ public class CommandSuggestionsTest { .argument(StringArgument.newBuilder("str") .withSuggestionsProvider((c, s) -> Arrays.asList("one", "two")) .build()) - .argument(EnumArgument.required(TestEnum.class, "enum")) + .argument(EnumArgument.of(TestEnum.class, "enum")) .build()); manager.command(manager.commandBuilder("test") .literal("comb") @@ -68,7 +68,7 @@ public class CommandSuggestionsTest { manager.command(manager.commandBuilder("com") .argumentPair("com", Pair.of("x", "y"), Pair.of(Integer.class, TestEnum.class), Description.empty()) - .argument(IntegerArgument.required("int")) + .argument(IntegerArgument.of("int")) .build()); manager.command(manager.commandBuilder("com2") diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandTest.java index 1b6cdea5..6ed6318c 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandTest.java @@ -39,7 +39,7 @@ class CommandTest { void ensureOrdering() { Assertions.assertThrows(IllegalArgumentException.class, () -> Command.newBuilder("test", SimpleCommandMeta.empty()).argument(StaticArgument.optional("something")) - .argument(StaticArgument.required("somethingelse")).build()); + .argument(StaticArgument.of("somethingelse")).build()); } } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java index 52b9a75e..9a50dfb9 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java @@ -65,8 +65,8 @@ class CommandTreeTest { /* Build command to test command proxying */ final Command toProxy = manager.commandBuilder("test") .literal("unproxied") - .argument(StringArgument.required("string")) - .argument(IntegerArgument.required("int")) + .argument(StringArgument.of("string")) + .argument(IntegerArgument.of("int")) .literal("anotherliteral") .handler(c -> {}) .build(); @@ -86,7 +86,7 @@ class CommandTreeTest { /* Build command for testing compound types */ manager.command(manager.commandBuilder("pos") - .argument(ArgumentPair.required(manager, "pos", Pair.of("x", "y"), + .argument(ArgumentPair.of(manager, "pos", Pair.of("x", "y"), Pair.of(Integer.class, Integer.class)) .simple()) .handler(c -> { @@ -95,7 +95,7 @@ class CommandTreeTest { }) .build()); manager.command(manager.commandBuilder("vec") - .argument(ArgumentPair.required(manager, "vec", Pair.of("x", "y"), + .argument(ArgumentPair.of(manager, "vec", Pair.of("x", "y"), Pair.of(Double.class, Double.class)) .withMapper(Vector2.class, pair -> new Vector2(pair.getFirst(), pair.getSecond())) diff --git a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java index fe6e0e54..284fe02f 100644 --- a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java @@ -39,8 +39,8 @@ class StringArgumentTest { static void setup() { manager = new TestCommandManager(); manager.command(manager.commandBuilder("quoted") - .argument(StringArgument.required("message1", StringArgument.StringMode.QUOTED)) - .argument(StringArgument.required("message2")) + .argument(StringArgument.of("message1", StringArgument.StringMode.QUOTED)) + .argument(StringArgument.of("message2")) .handler(c -> { final String message1 = c.getRequired("message1"); final String message2 = c.getRequired("message2"); @@ -49,14 +49,14 @@ class StringArgumentTest { }) .build()); manager.command(manager.commandBuilder("single") - .argument(StringArgument.required("message")) + .argument(StringArgument.of("message")) .handler(c -> { final String message = c.getRequired("message"); storage[0] = message; }) .build()); manager.command(manager.commandBuilder("greedy") - .argument(StringArgument.required("message", StringArgument.StringMode.GREEDY)) + .argument(StringArgument.of("message", StringArgument.StringMode.GREEDY)) .handler(c -> { final String message = c.getRequired("message"); storage[0] = message; diff --git a/cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java b/cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java index b2c15b96..441e6430 100644 --- a/cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java +++ b/cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java @@ -100,11 +100,11 @@ public class JLineCommandManager extends CommandManager impl System.out::println)) .build()) .command(jLineCommandManager.commandBuilder("test", SimpleCommandMeta.empty()) - .argument(StaticArgument.required("one")) + .argument(StaticArgument.of("one")) .handler(commandContext -> System.out.println("Test (1)")) .build()) .command(jLineCommandManager.commandBuilder("test", SimpleCommandMeta.empty()) - .argument(StaticArgument.required("two")) + .argument(StaticArgument.of("two")) .handler(commandContext -> System.out.println("Test (2)")) .build()); System.out.println("Ready..."); diff --git a/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java b/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java index 5247e33e..c6100fde 100644 --- a/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java +++ b/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java @@ -122,7 +122,7 @@ public final class BukkitTest extends JavaPlugin { annotationParser.parse(this); mgr.command(mgr.commandBuilder("gamemode", this.metaWithDescription("Your ugli"), "gajmöde") - .argument(EnumArgument.required(GameMode.class, "gamemode")) + .argument(EnumArgument.of(GameMode.class, "gamemode")) .argument(StringArgument.newBuilder("player") .withSuggestionsProvider((v1, v2) -> { final List suggestions = @@ -172,8 +172,8 @@ public final class BukkitTest extends JavaPlugin { .build()) .command(mgr.commandBuilder("give") .withSenderType(Player.class) - .argument(EnumArgument.required(Material.class, "material")) - .argument(IntegerArgument.required("amount")) + .argument(EnumArgument.of(Material.class, "material")) + .argument(IntegerArgument.of("amount")) .handler(c -> { final Material material = c.getRequired("material"); final int amount = c.getRequired("amount"); @@ -185,7 +185,7 @@ public final class BukkitTest extends JavaPlugin { .command(mgr.commandBuilder("worldtp", BukkitCommandMetaBuilder.builder() .withDescription("Teleport to a world") .build()) - .argument(WorldArgument.required("world")) + .argument(WorldArgument.of("world")) .handler(c -> { final World world = c.getRequired("world"); ((Player) c.getSender()).teleport(world.getSpawnLocation()); @@ -193,11 +193,11 @@ public final class BukkitTest extends JavaPlugin { }) .build()) .command(mgr.commandBuilder("brigadier") - .argument(FloatArgument.required("float")) - .argument(DoubleArgument.required("double")) - .argument(IntegerArgument.required("int")) - .argument(BooleanArgument.required("bool")) - .argument(StringArgument.required("string")) + .argument(FloatArgument.of("float")) + .argument(DoubleArgument.of("double")) + .argument(IntegerArgument.of("int")) + .argument(BooleanArgument.of("bool")) + .argument(StringArgument.of("string")) .handler(c -> c.getSender().sendMessage("Executed the command")) .build()) .command(mgr.commandBuilder("annotationass") @@ -226,7 +226,7 @@ public final class BukkitTest extends JavaPlugin { manager.command(mgr.commandBuilder("teleport") .meta("description", "Takes in a location and teleports the player there") .withSenderType(Player.class) - .argument(WorldArgument.required("world"), Description.of("World name")) + .argument(WorldArgument.of("world"), Description.of("World name")) .argumentTriplet("coords", TypeToken.get(Vector.class), Triplet.of("x", "y", "z"), diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java index f0c94032..22a4ba68 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java @@ -70,7 +70,7 @@ public class MaterialArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return MaterialArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java index 6befed74..ba608ca1 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java @@ -75,7 +75,7 @@ public final class OfflinePlayerArgument extends CommandArgument Command sender type * @return Created component */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return OfflinePlayerArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java index 34c5cf68..279c7079 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java @@ -71,7 +71,7 @@ public final class PlayerArgument extends CommandArgument { * @param Command sender type * @return Created component */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return PlayerArgument.newBuilder(name).asRequired().build(); } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java index 57d07650..6a98df7c 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java @@ -69,7 +69,7 @@ public class WorldArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument required(@NonNull final String name) { + public static @NonNull CommandArgument of(@NonNull final String name) { return WorldArgument.newBuilder(name).asRequired().build(); }