Skip to content

Commit cc2e6ce

Browse files
renamed CommandLink.Require to Requirement
1 parent b992e28 commit cc2e6ce

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/main/java/com/datasiqn/commandcore/command/builder/BuilderCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class BuilderCommand implements Command {
2929

3030
private final Set<CommandNode<?>> nodes;
3131
private final Consumer<CommandContext> executor;
32-
private final List<CommandLink.Require> requires;
32+
private final List<CommandLink.Requirement> requires;
3333

3434
public BuilderCommand(@NotNull CommandBuilder commandBuilder, List<String> usages) {
3535
this.name = commandBuilder.name;
@@ -86,7 +86,7 @@ public BuilderCommand(@NotNull CommandBuilder commandBuilder, List<String> usage
8686
}
8787

8888
if (executor == null) return Result.error(Collections.singletonList("Expected parameters, but got no parameters instead"));
89-
Result<None, String> requireResult = requires.stream().map(require -> require.apply(context)).reduce(Result.ok(), Result::and);
89+
Result<None, String> requireResult = requires.stream().map(requirement -> requirement.apply(context)).reduce(Result.ok(), Result::and);
9090
if (requireResult.isError()) {
9191
context.getSource().getSender().sendMessage(ChatColor.RED + requireResult.unwrapError());
9292
return Result.ok();

src/main/java/com/datasiqn/commandcore/command/builder/CommandLink.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
*/
1818
public abstract class CommandLink<T> {
1919
protected final Set<CommandNode<?>> children = new HashSet<>();
20-
protected final List<Require> requires = new ArrayList<>();
20+
protected final List<Requirement> requires = new ArrayList<>();
2121

2222
protected Consumer<CommandContext> executor;
2323

2424
/**
2525
* Requires the context in which the command is executed in to pass the {@code requires} check
26-
* @param require A function that determines if a {@code CommandContext} can run the command
26+
* @param requirement A function that determines if a {@code CommandContext} can run the command
2727
* @return Itself, for chaining
2828
*/
29-
public T requires(@NotNull Require require) {
30-
this.requires.add(require);
29+
public T requires(@NotNull Requirement requirement) {
30+
this.requires.add(requirement);
3131
return getThis();
3232
}
3333

3434
/**
3535
* Requires the sender to be a {@code Player}
36-
* @see #requires(Require)
36+
* @see #requires(Requirement)
3737
* @return Itself, for chaining
3838
*/
3939
public T requiresPlayer() {
@@ -42,7 +42,7 @@ public T requiresPlayer() {
4242

4343
/**
4444
* Requires the sender to be an {@code Entity}
45-
* @see #requires(Require)
45+
* @see #requires(Requirement)
4646
* @return Itself, for chaining
4747
*/
4848
public T requiresEntity() {
@@ -92,5 +92,5 @@ public Consumer<CommandContext> getExecutor() {
9292
* A function that defines a command requirement.
9393
* This interface is basically a shorthand for {@code Function<CommandContext, Result<None, String>>}
9494
*/
95-
public interface Require extends Function<CommandContext, Result<None, String>> { }
95+
public interface Requirement extends Function<CommandContext, Result<None, String>> { }
9696
}

0 commit comments

Comments
 (0)