Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Commit e58b3db

Browse files
Prince527GitHubPrince527GitHub
authored
Merge pull request #12 from SkyboundLab/upstream
2 parents 96ae6b9 + d492a47 commit e58b3db

File tree

249 files changed

+1492
-1196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+1492
-1196
lines changed

‎api/src/ap/java/com/velocitypowered/api/plugin/ap/PluginAnnotationProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public SourceVersion getSupportedSourceVersion() {
5353

5454
@Override
5555
public synchronized boolean process(final Set<? extends TypeElement> annotations,
56-
final RoundEnvironment roundEnv) {
56+
final RoundEnvironment roundEnv) {
5757
if (roundEnv.processingOver()) {
5858
return false;
5959
}

‎api/src/ap/java/com/velocitypowered/api/plugin/ap/SerializedPluginDescription.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public final class SerializedPluginDescription {
3737
private final String main;
3838

3939
private SerializedPluginDescription(final String id, final String name, final String version, final String description,
40-
final String url, final List<String> authors, final List<Dependency> dependencies, final String main) {
40+
final String url, final List<String> authors, final List<Dependency> dependencies, final String main) {
4141
Preconditions.checkNotNull(id, "id");
4242
Preconditions.checkArgument(ID_PATTERN.matcher(id).matches(), "id is not valid");
4343
this.id = id;

‎api/src/main/java/com/velocitypowered/api/command/Command.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* <li>{@link BrigadierCommand}, which supports parameterized arguments and
2121
* specialized execution, tab complete suggestions and permission-checking logic.
2222
*
23-
* <li>{@link SimpleCommand}, modelled after the convention popularized by
23+
* <li>{@link SimpleCommand}, modeled after the convention popularized by
2424
* Bukkit and BungeeCord. Older classes directly implementing {@link Command}
2525
* are suggested to migrate to this interface.
2626
*

‎api/src/main/java/com/velocitypowered/api/command/CommandMeta.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ interface Builder {
6060
*
6161
* @param node the command node
6262
* @return this builder, for chaining
63-
* @throws IllegalArgumentException if the node is executable, i.e. has a non-null
63+
* @throws IllegalArgumentException if the node is executable, i.e., has a non-null
6464
* {@link com.mojang.brigadier.Command}, or has a redirect.
6565
*/
6666
Builder hint(CommandNode<CommandSource> node);

‎api/src/main/java/com/velocitypowered/api/command/CommandResult.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
public enum CommandResult {
1414
/**
15-
* The command was successfully executed by the proxy.
15+
* The proxy successfully executed the command.
1616
*/
1717
EXECUTED,
1818
/**

‎api/src/main/java/com/velocitypowered/api/command/InvocableCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* A command that can be executed with arbitrary arguments.
1616
*
17-
* <p>Modifying the command tree (e.g. registering a command via
17+
* <p>Modifying the command tree (e.g., registering a command via
1818
* {@link CommandManager#register(CommandMeta, Command)}) during
1919
* permission checking and suggestions provision results in
2020
* undefined behavior, which may include deadlocks.
@@ -56,7 +56,7 @@ default CompletableFuture<List<String>> suggestAsync(final I invocation) {
5656
* Tests to check if the source has permission to perform the specified invocation.
5757
*
5858
* <p>If the method returns {@code false}, the handling is forwarded onto
59-
* the players current server.
59+
* the player's current server.
6060
*
6161
* @param invocation the invocation context
6262
* @return {@code true} if the source has permission

‎api/src/main/java/com/velocitypowered/api/command/SimpleCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.checkerframework.checker.nullness.qual.NonNull;
1111

1212
/**
13-
* A simple command, modelled after the convention popularized by
13+
* A simple command, modeled after the convention popularized by
1414
* Bukkit and BungeeCord.
1515
*
1616
* <p>Prefer using {@link BrigadierCommand}, which is also

‎api/src/main/java/com/velocitypowered/api/command/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
/**
99
* Provides a command framework.
1010
*/
11-
package com.velocitypowered.api.command;
11+
package com.velocitypowered.api.command;

‎api/src/main/java/com/velocitypowered/api/event/Continuation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ public interface Continuation {
2222
* Resumes the continuation after the executed task failed.
2323
*/
2424
void resumeWithException(Throwable exception);
25-
}
25+
}

‎api/src/main/java/com/velocitypowered/api/event/EventTask.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public interface EventTask {
3636
boolean requiresAsync();
3737

3838
/**
39-
* Runs this event task with the given {@link Continuation}. The continuation must be notified
39+
* Runs this event task with given {@link Continuation}. The continuation must be notified
4040
* when the task is completed, either with {@link Continuation#resume()} if the task was
4141
* successful or {@link Continuation#resumeWithException(Throwable)} if an exception occurred.
4242
*
@@ -118,4 +118,4 @@ static EventTask resumeWhenComplete(final CompletableFuture<?> future) {
118118
}
119119
}));
120120
}
121-
}
121+
}

0 commit comments

Comments
 (0)