Skip to content

Commit 79807e4

Browse files
added the CommandResult#message() method
1 parent 1db834c commit 79807e4

3 files changed

Lines changed: 16 additions & 10 deletions

File tree

commands/src/main/java/com/wizardlybump17/wlib/command/result/CommandResult.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ public interface CommandResult<T> {
2424

2525
@NotNull String id();
2626

27+
default @Nullable String message() {
28+
return null;
29+
}
30+
2731
//without context
2832

2933
static <T> @NotNull SuccessResult<T> successful(int lastInputIndex, @NotNull CommandNode<?> lastNode, @Nullable T data) {
@@ -94,12 +98,12 @@ public interface CommandResult<T> {
9498
return new UnprocessableContentResult<>(lastInputIndex, lastNode);
9599
}
96100

97-
static <T> @NotNull UnauthorizedResult<T> unauthorized(int lastInputIndex, @NotNull CommandNode<?> lastNode) {
98-
return new UnauthorizedResult<>(lastInputIndex, lastNode);
101+
static <T> @NotNull UnauthorizedResult<T> unauthorized(int lastInputIndex, @NotNull CommandNode<?> lastNode, @Nullable String message) {
102+
return new UnauthorizedResult<>(lastInputIndex, lastNode, message);
99103
}
100104

101-
static <T> @NotNull ForbiddenResult<T> forbidden(int lastInputIndex, @NotNull CommandNode<?> lastNode) {
102-
return new ForbiddenResult<>(lastInputIndex, lastNode);
105+
static <T> @NotNull ForbiddenResult<T> forbidden(int lastInputIndex, @NotNull CommandNode<?> lastNode, @Nullable String message) {
106+
return new ForbiddenResult<>(lastInputIndex, lastNode, message);
103107
}
104108

105109
//with context
@@ -148,11 +152,11 @@ public interface CommandResult<T> {
148152
return unprocessableContent(context.lastInputIndex(), context.lastNode());
149153
}
150154

151-
static <T> @NotNull UnauthorizedResult<T> unauthorized(@NotNull CommandContext context) {
152-
return unauthorized(context.lastInputIndex(), context.lastNode());
155+
static <T> @NotNull UnauthorizedResult<T> unauthorized(@NotNull CommandContext context, @Nullable String message) {
156+
return unauthorized(context.lastInputIndex(), context.lastNode(), message);
153157
}
154158

155-
static <T> @NotNull ForbiddenResult<T> forbidden(@NotNull CommandContext context) {
156-
return forbidden(context.lastInputIndex(), context.lastNode());
159+
static <T> @NotNull ForbiddenResult<T> forbidden(@NotNull CommandContext context, @Nullable String message) {
160+
return forbidden(context.lastInputIndex(), context.lastNode(), message);
157161
}
158162
}

commands/src/main/java/com/wizardlybump17/wlib/command/result/error/ForbiddenResult.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
import com.wizardlybump17.wlib.command.node.CommandNode;
44
import org.jetbrains.annotations.NotNull;
5+
import org.jetbrains.annotations.Nullable;
56

6-
public record ForbiddenResult<T>(int lastInputIndex, @NotNull CommandNode<?> lastNode) implements UnsuccessResult<T> {
7+
public record ForbiddenResult<T>(int lastInputIndex, @NotNull CommandNode<?> lastNode, @Nullable String message) implements UnsuccessResult<T> {
78

89
public static final @NotNull String ID = "WLib:Error/Forbidden";
910

commands/src/main/java/com/wizardlybump17/wlib/command/result/error/UnauthorizedResult.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
import com.wizardlybump17.wlib.command.node.CommandNode;
44
import org.jetbrains.annotations.NotNull;
5+
import org.jetbrains.annotations.Nullable;
56

6-
public record UnauthorizedResult<T>(int lastInputIndex, @NotNull CommandNode<?> lastNode) implements UnsuccessResult<T> {
7+
public record UnauthorizedResult<T>(int lastInputIndex, @NotNull CommandNode<?> lastNode, @Nullable String message) implements UnsuccessResult<T> {
78

89
public static final @NotNull String ID = "WLib:Error/Unauthorized";
910

0 commit comments

Comments
 (0)