Skip to content

Commit 014ddcf

Browse files
committed
refactor custom command syntax exceptions
1 parent 113e353 commit 014ddcf

File tree

6 files changed

+10
-30
lines changed

6 files changed

+10
-30
lines changed

src/main/java/com/uravgcode/modernessentials/argument/OtherPlayerArgument.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import com.mojang.brigadier.arguments.ArgumentType;
55
import com.mojang.brigadier.context.CommandContext;
66
import com.mojang.brigadier.exceptions.CommandSyntaxException;
7+
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
78
import com.mojang.brigadier.suggestion.Suggestions;
89
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
910
import com.uravgcode.modernessentials.exception.BadSourceException;
10-
import com.uravgcode.modernessentials.exception.CannotTargetSelfException;
1111
import io.papermc.paper.command.brigadier.CommandSourceStack;
1212
import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
1313
import io.papermc.paper.command.brigadier.argument.CustomArgumentType;
@@ -19,6 +19,7 @@
1919

2020
@NullMarked
2121
public class OtherPlayerArgument implements CustomArgumentType<Player, PlayerSelectorArgumentResolver> {
22+
private static final SimpleCommandExceptionType INVALID_TARGET = new SimpleCommandExceptionType(() -> "You cannot target yourself");
2223

2324
@Override
2425
public Player parse(StringReader reader) {
@@ -31,7 +32,7 @@ public <S> Player parse(StringReader reader, S source) throws CommandSyntaxExcep
3132

3233
final var sender = stack.getSender();
3334
final var player = getNativeType().parse(reader).resolve(stack).getFirst();
34-
if (player.equals(sender)) throw new CannotTargetSelfException();
35+
if (player.equals(sender)) throw INVALID_TARGET.create();
3536

3637
return player;
3738
}

src/main/java/com/uravgcode/modernessentials/argument/TpaPlayerArgument.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
@NullMarked
1616
public final class TpaPlayerArgument extends OtherPlayerArgument {
17-
private final SimpleCommandExceptionType invalidTargetExceptionType = new SimpleCommandExceptionType(() -> "Target cannot accept teleport requests");
17+
private static final SimpleCommandExceptionType INVALID_TARGET = new SimpleCommandExceptionType(() -> "Target cannot accept teleport requests");
1818

1919
@Override
2020
public <S> Player parse(StringReader reader, S source) throws CommandSyntaxException {
2121
final var target = super.parse(reader, source);
22-
if (!target.hasPermission("essentials.tpa.accept")) throw invalidTargetExceptionType.create();
22+
if (!target.hasPermission("essentials.tpa.accept")) throw INVALID_TARGET.create();
2323
return target;
2424
}
2525

src/main/java/com/uravgcode/modernessentials/exception/BadSourceException.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import com.mojang.brigadier.exceptions.CommandExceptionType;
55
import com.mojang.brigadier.exceptions.CommandSyntaxException;
66
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
7-
import io.papermc.paper.command.brigadier.MessageComponentSerializer;
8-
import net.kyori.adventure.text.Component;
97

108
public final class BadSourceException extends CommandSyntaxException {
11-
private static final Message message = MessageComponentSerializer.message().serialize(Component.text("The source needs to be a command source stack"));
9+
private static final Message message = () -> "The source needs to be a command source stack";
1210
private static final CommandExceptionType type = new SimpleCommandExceptionType(message);
1311

1412
public BadSourceException() {

src/main/java/com/uravgcode/modernessentials/exception/CannotTargetSelfException.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/main/java/com/uravgcode/modernessentials/exception/NoPlayerFoundException.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import com.mojang.brigadier.exceptions.CommandExceptionType;
55
import com.mojang.brigadier.exceptions.CommandSyntaxException;
66
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
7-
import io.papermc.paper.command.brigadier.MessageComponentSerializer;
8-
import net.kyori.adventure.text.Component;
7+
import net.minecraft.network.chat.Component;
98

109
public final class NoPlayerFoundException extends CommandSyntaxException {
11-
private static final Message message = MessageComponentSerializer.message().serialize(Component.translatable("argument.entity.notfound.player"));
10+
private static final Message message = Component.translatable("argument.entity.notfound.player");
1211
private static final CommandExceptionType type = new SimpleCommandExceptionType(message);
1312

1413
public NoPlayerFoundException() {

src/main/java/com/uravgcode/modernessentials/exception/RequiresPlayerException.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import com.mojang.brigadier.exceptions.CommandExceptionType;
55
import com.mojang.brigadier.exceptions.CommandSyntaxException;
66
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
7-
import io.papermc.paper.command.brigadier.MessageComponentSerializer;
8-
import net.kyori.adventure.text.Component;
7+
import net.minecraft.network.chat.Component;
98

109
public final class RequiresPlayerException extends CommandSyntaxException {
11-
private static final Message message = MessageComponentSerializer.message().serialize(Component.translatable("permissions.requires.player"));
10+
private static final Message message = Component.translatable("permissions.requires.player");
1211
private static final CommandExceptionType type = new SimpleCommandExceptionType(message);
1312

1413
public RequiresPlayerException() {

0 commit comments

Comments
 (0)