From 89d2f1b54cf117fa50b47a20f756584d5f67ebd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noel=20N=C3=A9meth?= Date: Fri, 8 Jul 2022 23:24:37 +0200 Subject: [PATCH] Update commands --- .../demo/commands/EntitySelectorCommand.java | 2 +- .../minestom/demo/commands/GamemodeCommand.java | 2 +- .../net/minestom/demo/commands/HealthCommand.java | 12 ++++++------ .../net/minestom/demo/commands/HorseCommand.java | 14 +++++++------- .../demo/commands/LoadExtensionCommand.java | 6 +++--- .../net/minestom/demo/commands/ShootCommand.java | 8 ++++---- .../net/minestom/demo/commands/TestCommand.java | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/demo/src/main/java/net/minestom/demo/commands/EntitySelectorCommand.java b/demo/src/main/java/net/minestom/demo/commands/EntitySelectorCommand.java index 9b617efab..379c21488 100644 --- a/demo/src/main/java/net/minestom/demo/commands/EntitySelectorCommand.java +++ b/demo/src/main/java/net/minestom/demo/commands/EntitySelectorCommand.java @@ -19,7 +19,7 @@ public class EntitySelectorCommand extends Command { ArgumentEntity argumentEntity = ArgumentType.Entity("entities").onlyPlayers(true); - setArgumentCallback((sender, exception) -> exception.printStackTrace(), argumentEntity); + setArgumentCallback((sender, exception) -> System.err.println(exception.message()), argumentEntity); addSyntax(this::executor, argumentEntity); diff --git a/demo/src/main/java/net/minestom/demo/commands/GamemodeCommand.java b/demo/src/main/java/net/minestom/demo/commands/GamemodeCommand.java index 28419e32d..1f7cfabc5 100644 --- a/demo/src/main/java/net/minestom/demo/commands/GamemodeCommand.java +++ b/demo/src/main/java/net/minestom/demo/commands/GamemodeCommand.java @@ -32,7 +32,7 @@ public class GamemodeCommand extends Command { gamemode.setCallback((sender, exception) -> { sender.sendMessage( Component.text("Invalid gamemode ", NamedTextColor.RED) - .append(Component.text(exception.getInput(), NamedTextColor.WHITE)) + .append(Component.text(exception.input(), NamedTextColor.WHITE)) .append(Component.text("!")), MessageType.SYSTEM); }); diff --git a/demo/src/main/java/net/minestom/demo/commands/HealthCommand.java b/demo/src/main/java/net/minestom/demo/commands/HealthCommand.java index d1830f42d..2d5e1b491 100644 --- a/demo/src/main/java/net/minestom/demo/commands/HealthCommand.java +++ b/demo/src/main/java/net/minestom/demo/commands/HealthCommand.java @@ -4,10 +4,10 @@ import net.kyori.adventure.text.Component; import net.minestom.server.command.CommandSender; import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.CommandContext; +import net.minestom.server.command.builder.arguments.Argument.Result.SyntaxError; import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.arguments.number.ArgumentNumber; import net.minestom.server.command.builder.condition.Conditions; -import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.entity.Player; public class HealthCommand extends Command { @@ -34,13 +34,13 @@ public class HealthCommand extends Command { sender.sendMessage(Component.text("Correct usage: health set|add ")); } - private void onModeError(CommandSender sender, ArgumentSyntaxException exception) { - sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.getInput() + "' should be replaced by 'set' or 'add'")); + private void onModeError(CommandSender sender, SyntaxError exception) { + sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.input() + "' should be replaced by 'set' or 'add'")); } - private void onValueError(CommandSender sender, ArgumentSyntaxException exception) { - final int error = exception.getErrorCode(); - final String input = exception.getInput(); + private void onValueError(CommandSender sender, SyntaxError exception) { + final int error = exception.code(); + final String input = exception.input(); switch (error) { case ArgumentNumber.NOT_NUMBER_ERROR: sender.sendMessage(Component.text("SYNTAX ERROR: '" + input + "' isn't a number!")); diff --git a/demo/src/main/java/net/minestom/demo/commands/HorseCommand.java b/demo/src/main/java/net/minestom/demo/commands/HorseCommand.java index 2a50173d1..e9ff07e2d 100644 --- a/demo/src/main/java/net/minestom/demo/commands/HorseCommand.java +++ b/demo/src/main/java/net/minestom/demo/commands/HorseCommand.java @@ -4,9 +4,9 @@ import net.kyori.adventure.text.Component; import net.minestom.server.command.CommandSender; import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.CommandContext; +import net.minestom.server.command.builder.arguments.Argument; import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.condition.Conditions; -import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.entity.EntityCreature; import net.minestom.server.entity.EntityType; import net.minestom.server.entity.Player; @@ -35,22 +35,22 @@ public class HorseCommand extends Command { sender.sendMessage(Component.text("Correct usage: /horse ")); } - private void onBabyError(CommandSender sender, ArgumentSyntaxException exception) { - sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.getInput() + "' should be replaced by 'true' or 'false'")); + private void onBabyError(CommandSender sender, Argument.Result.SyntaxError exception) { + sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.input() + "' should be replaced by 'true' or 'false'")); } - private void onMarkingError(CommandSender sender, ArgumentSyntaxException exception) { + private void onMarkingError(CommandSender sender, Argument.Result.SyntaxError exception) { String values = Stream.of(HorseMeta.Marking.values()) .map(value -> "'" + value.name().toLowerCase(Locale.ROOT) + "'") .collect(Collectors.joining(", ")); - sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.getInput() + "' should be replaced by " + values + ".")); + sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.input() + "' should be replaced by " + values + ".")); } - private void onColorError(CommandSender sender, ArgumentSyntaxException exception) { + private void onColorError(CommandSender sender, Argument.Result.SyntaxError exception) { String values = Stream.of(HorseMeta.Color.values()) .map(value -> "'" + value.name().toLowerCase(Locale.ROOT) + "'") .collect(Collectors.joining(", ")); - sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.getInput() + "' should be replaced by " + values + ".")); + sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.input() + "' should be replaced by " + values + ".")); } private void onHorseCommand(CommandSender sender, CommandContext context) { diff --git a/demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java b/demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java index f617c818d..18d48625b 100644 --- a/demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java +++ b/demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java @@ -5,9 +5,9 @@ import net.minestom.server.MinecraftServer; import net.minestom.server.command.CommandSender; import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.CommandContext; +import net.minestom.server.command.builder.arguments.Argument; import net.minestom.server.command.builder.arguments.ArgumentString; import net.minestom.server.command.builder.arguments.ArgumentType; -import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.extensions.ExtensionManager; import java.io.IOException; @@ -63,7 +63,7 @@ public class LoadExtensionCommand extends Command { } } - private void extensionCallback(CommandSender sender, ArgumentSyntaxException exception) { - sender.sendMessage(Component.text("'" + exception.getInput() + "' is not a valid extension name!")); + private void extensionCallback(CommandSender sender, Argument.Result.SyntaxError exception) { + sender.sendMessage(Component.text("'" + exception.input() + "' is not a valid extension name!")); } } diff --git a/demo/src/main/java/net/minestom/demo/commands/ShootCommand.java b/demo/src/main/java/net/minestom/demo/commands/ShootCommand.java index e4b379989..121e19f52 100644 --- a/demo/src/main/java/net/minestom/demo/commands/ShootCommand.java +++ b/demo/src/main/java/net/minestom/demo/commands/ShootCommand.java @@ -4,13 +4,13 @@ import net.kyori.adventure.text.Component; import net.minestom.server.command.CommandSender; import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.CommandContext; +import net.minestom.server.command.builder.arguments.Argument; import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.condition.Conditions; -import net.minestom.server.command.builder.exception.ArgumentSyntaxException; +import net.minestom.server.entity.EntityProjectile; import net.minestom.server.entity.EntityType; import net.minestom.server.entity.Player; import net.minestom.server.entity.metadata.arrow.ArrowMeta; -import net.minestom.server.entity.EntityProjectile; import java.util.concurrent.ThreadLocalRandom; @@ -29,8 +29,8 @@ public class ShootCommand extends Command { sender.sendMessage(Component.text("Correct usage: shoot [default/spectral/colored]")); } - private void onTypeError(CommandSender sender, ArgumentSyntaxException exception) { - sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.getInput() + "' should be replaced by 'default', 'spectral' or 'colored'")); + private void onTypeError(CommandSender sender, Argument.Result.SyntaxError exception) { + sender.sendMessage(Component.text("SYNTAX ERROR: '" + exception.input() + "' should be replaced by 'default', 'spectral' or 'colored'")); } private void onShootCommand(CommandSender sender, CommandContext context) { diff --git a/demo/src/main/java/net/minestom/demo/commands/TestCommand.java b/demo/src/main/java/net/minestom/demo/commands/TestCommand.java index c2294cb9b..94707ff38 100644 --- a/demo/src/main/java/net/minestom/demo/commands/TestCommand.java +++ b/demo/src/main/java/net/minestom/demo/commands/TestCommand.java @@ -13,7 +13,7 @@ public class TestCommand extends Command { setDefaultExecutor(this::usage); var block = ArgumentType.BlockState("block"); - block.setCallback((sender, exception) -> exception.printStackTrace()); + block.setCallback((sender, exception) -> System.err.println(exception.message())); addSyntax((sender, context) -> System.out.println("executed"), block); }