Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update commands

This commit is contained in:
Noel Németh 2022-07-08 23:24:37 +02:00
parent 4452356af1
commit 89d2f1b54c
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/src/main/java/net/minestom/demo/commands/EntitySelectorCommand.java
View File

@ -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);

2
demo/src/main/java/net/minestom/demo/commands/GamemodeCommand.java
View File

@ -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);
});

12
demo/src/main/java/net/minestom/demo/commands/HealthCommand.java
View File

@ -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 <number>"));
}
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!"));

14
demo/src/main/java/net/minestom/demo/commands/HorseCommand.java
View File

@ -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 <baby> <marking> <color>"));
}
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) {

6
demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java
View File

@ -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!"));
}
}

8
demo/src/main/java/net/minestom/demo/commands/ShootCommand.java
View File

@ -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) {

2
demo/src/main/java/net/minestom/demo/commands/TestCommand.java
View File

@ -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);
}