Skip to content

Commit fd2ee94

Browse files
Merge pull request #856 from GemstoneGG/dev
Merge `dev` into `libdeflate`
2 parents c185904 + 3faff2a commit fd2ee94

427 files changed

Lines changed: 3988 additions & 3957 deletions

File tree

Some content is hidden

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ consider utilizing JProfiler to enhance your experience and report any ongoing i
153153

154154
## Building
155155

156-
Velocity is built with [Gradle](https://gradle.org). We recommend using the
156+
Velocity-CTD is built with [Gradle](https://gradle.org). We recommend using the
157157
wrapper script (`./gradlew`) as our CI builds using it.
158158

159159
It is sufficient to run `./gradlew build` to run the full build cycle.
@@ -164,7 +164,7 @@ where our latest updates will be compiled and ready for use.
164164
## Running
165165

166166
Once you've built Velocity, you can copy and run the `-all` JAR from
167-
`proxy/build/libs`. Velocity will generate a default configuration file,
167+
`proxy/build/libs`. Velocity-CTD will generate a default configuration file,
168168
and you can configure it from there.
169169

170170
## Localisation

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public PluginAnnotationProcessor() {
7171
* @param processingEnv the annotation processing environment
7272
*/
7373
@Override
74-
public synchronized void init(final ProcessingEnvironment processingEnv) {
74+
public synchronized void init(ProcessingEnvironment processingEnv) {
7575
this.environment = processingEnv;
7676
}
7777

@@ -95,8 +95,8 @@ public SourceVersion getSupportedSourceVersion() {
9595
* @return {@code true} if the annotations are claimed by this processor, {@code false} otherwise
9696
*/
9797
@Override
98-
public synchronized boolean process(final Set<? extends TypeElement> annotations,
99-
final RoundEnvironment roundEnv) {
98+
public synchronized boolean process(Set<? extends TypeElement> annotations,
99+
RoundEnvironment roundEnv) {
100100
if (roundEnv.processingOver()) {
101101
return false;
102102
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ public final class SerializedPluginDescription {
9797
*/
9898
private final String main;
9999

100-
private SerializedPluginDescription(final String id, final String name, final String version, final String description,
101-
final String url, final List<String> authors, final List<Dependency> dependencies, final String main) {
100+
private SerializedPluginDescription(String id, String name, String version, String description,
101+
String url, List<String> authors, List<Dependency> dependencies, String main) {
102102
Preconditions.checkNotNull(id, "id");
103103
Preconditions.checkArgument(ID_PATTERN.matcher(id).matches(), "id is not valid");
104104
this.id = id;
@@ -112,7 +112,7 @@ private SerializedPluginDescription(final String id, final String name, final St
112112
this.main = Preconditions.checkNotNull(main, "main");
113113
}
114114

115-
static SerializedPluginDescription from(final Plugin plugin, final String qualifiedName) {
115+
static SerializedPluginDescription from(Plugin plugin, String qualifiedName) {
116116
List<Dependency> dependencies = new ArrayList<>();
117117
for (com.velocitypowered.api.plugin.Dependency dependency : plugin.dependencies()) {
118118
dependencies.add(new Dependency(dependency.id(), dependency.optional()));
@@ -203,7 +203,7 @@ public String getMain() {
203203
}
204204

205205
@Override
206-
public boolean equals(final Object o) {
206+
public boolean equals(Object o) {
207207
if (this == o) {
208208
return true;
209209
}
@@ -269,7 +269,7 @@ public static final class Dependency {
269269
* @param id the ID of the dependent plugin
270270
* @param optional whether the dependency is optional
271271
*/
272-
public Dependency(final String id, final boolean optional) {
272+
public Dependency(String id, boolean optional) {
273273
this.id = id;
274274
this.optional = optional;
275275
}
@@ -295,7 +295,7 @@ public boolean isOptional() {
295295
}
296296

297297
@Override
298-
public boolean equals(final Object o) {
298+
public boolean equals(Object o) {
299299
if (this == o) {
300300
return true;
301301
}

api/src/main/java/com/velocityctd/api/event/connection/ConnectionEstablishEvent.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public class ConnectionEstablishEvent implements ResultedEvent<ResultedEvent.Gen
5858
* @param intention the handshake intention of the client, or {@code null} if not yet determined
5959
* @throws NullPointerException if {@code connection} is null
6060
*/
61-
public ConnectionEstablishEvent(final @NonNull InboundConnection connection,
62-
final @Nullable HandshakeIntent intention) {
61+
public ConnectionEstablishEvent(@NonNull InboundConnection connection,
62+
@Nullable HandshakeIntent intention) {
6363
this.connection = Preconditions.checkNotNull(connection, "connection");
6464
this.intention = intention;
6565
}
@@ -102,7 +102,7 @@ public GenericResult getResult() {
102102
* @throws NullPointerException if {@code result} is null
103103
*/
104104
@Override
105-
public void setResult(final @NonNull GenericResult result) {
105+
public void setResult(@NonNull GenericResult result) {
106106
this.result = Preconditions.checkNotNull(result, "result");
107107
}
108108
}

api/src/main/java/com/velocityctd/api/event/player/TabCompleteRequestEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class TabCompleteRequestEvent {
3838
* @param player the player who initiated the tab completion request
3939
* @param partialMessage the message being partially completed
4040
*/
41-
public TabCompleteRequestEvent(final Player player, final String partialMessage) {
41+
public TabCompleteRequestEvent(Player player, String partialMessage) {
4242
this.player = checkNotNull(player, "player");
4343
this.partialMessage = checkNotNull(partialMessage, "partialMessage");
4444
}
@@ -66,7 +66,7 @@ public String getPartialMessage() {
6666
*
6767
* @param partialMessage the new partial message string
6868
*/
69-
public void setPartialMessage(final String partialMessage) {
69+
public void setPartialMessage(String partialMessage) {
7070
this.partialMessage = partialMessage;
7171
}
7272

api/src/main/java/com/velocityctd/api/queue/Queue.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public interface Queue {
6565
*
6666
* @param player the player to remove
6767
*/
68-
default void dequeue(final @NotNull Player player) {
68+
default void dequeue(@NotNull Player player) {
6969
dequeue(player.getUniqueId());
7070
}
7171

@@ -83,7 +83,7 @@ default void dequeue(final @NotNull Player player) {
8383
* @param player the player to check
8484
* @return {@code true} if the player is queued
8585
*/
86-
default boolean contains(final @NotNull Player player) {
86+
default boolean contains(@NotNull Player player) {
8787
return contains(player.getUniqueId());
8888
}
8989

@@ -121,7 +121,7 @@ default boolean contains(final @NotNull Player player) {
121121
* @param player the player
122122
* @return the 1-based position, or {@link Optional#empty()}
123123
*/
124-
default Optional<Integer> getPosition(final @NotNull Player player) {
124+
default Optional<Integer> getPosition(@NotNull Player player) {
125125
return getPosition(player.getUniqueId());
126126
}
127127

api/src/main/java/com/velocitypowered/api/command/BrigadierCommand.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public final class BrigadierCommand implements Command {
4040
*
4141
* @param builder the {@link LiteralCommandNode} builder
4242
*/
43-
public BrigadierCommand(final @NotNull LiteralArgumentBuilder<CommandSource> builder) {
43+
public BrigadierCommand(@NotNull LiteralArgumentBuilder<CommandSource> builder) {
4444
this(Preconditions.checkNotNull(builder, "builder").build());
4545
}
4646

@@ -49,7 +49,7 @@ public BrigadierCommand(final @NotNull LiteralArgumentBuilder<CommandSource> bui
4949
*
5050
* @param node the command node
5151
*/
52-
public BrigadierCommand(final @NotNull LiteralCommandNode<CommandSource> node) {
52+
public BrigadierCommand(@NotNull LiteralCommandNode<CommandSource> node) {
5353
this.node = Preconditions.checkNotNull(node, "node");
5454
}
5555

@@ -69,7 +69,7 @@ public LiteralCommandNode<CommandSource> getNode() {
6969
* @return a new LiteralArgumentBuilder.
7070
*/
7171
public static LiteralArgumentBuilder<CommandSource> literalArgumentBuilder(
72-
final @NotNull String name) {
72+
@NotNull String name) {
7373
Preconditions.checkNotNull(name, "name");
7474
// Validation to avoid beginner's errors in case someone includes a space in the argument name
7575
Preconditions.checkArgument(name.indexOf(' ') == -1, "the argument name cannot contain spaces");
@@ -85,7 +85,7 @@ public static LiteralArgumentBuilder<CommandSource> literalArgumentBuilder(
8585
* @return a new RequiredArgumentBuilder
8686
*/
8787
public static <T> RequiredArgumentBuilder<CommandSource, T> requiredArgumentBuilder(
88-
final @NotNull String name, final @NotNull ArgumentType<T> argumentType) {
88+
@NotNull String name, @NotNull ArgumentType<T> argumentType) {
8989
Preconditions.checkNotNull(name, "name");
9090
Preconditions.checkNotNull(argumentType, "argument type");
9191

api/src/main/java/com/velocitypowered/api/command/CommandSource.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public interface CommandSource extends Audience, PermissionSubject {
2626
* @see <a href="https://docs.papermc.io/adventure/minimessage/format/">MiniMessage docs</a>
2727
* for more information on the format.
2828
*/
29-
default void sendRichMessage(final @NotNull String message) {
29+
default void sendRichMessage(@NotNull String message) {
3030
this.sendMessage(MiniMessage.miniMessage().deserialize(message, this));
3131
}
3232

@@ -39,8 +39,8 @@ default void sendRichMessage(final @NotNull String message) {
3939
* and <a href="https://docs.papermc.io/adventure/minimessage/dynamic-replacements">MiniMessage Placeholders docs</a>
4040
* for more information on the format.
4141
*/
42-
default void sendRichMessage(final @NotNull String message,
43-
final @NotNull TagResolver @NotNull... resolvers) {
42+
default void sendRichMessage(@NotNull String message,
43+
@NotNull TagResolver @NotNull... resolvers) {
4444
this.sendMessage(MiniMessage.miniMessage().deserialize(message, this, resolvers));
4545
}
4646

@@ -52,7 +52,7 @@ default void sendRichMessage(final @NotNull String message,
5252
* however, it is recommended not to use legacy color codes as this is a deprecated format
5353
* and not recommended.
5454
*/
55-
default void sendPlainMessage(final @NotNull String message) {
55+
default void sendPlainMessage(@NotNull String message) {
5656
this.sendMessage(Component.text(message));
5757
}
5858
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public sealed interface InvocableCommand<I extends CommandInvocation<?>> extends
3636
* @param invocation the invocation context
3737
* @return the tab complete suggestions
3838
*/
39-
default List<String> suggest(final I invocation) {
39+
default List<String> suggest(I invocation) {
4040
return ImmutableList.of();
4141
}
4242

@@ -47,7 +47,7 @@ default List<String> suggest(final I invocation) {
4747
* @return the tab complete suggestions
4848
* @implSpec defaults to wrapping the value returned by {@link #suggest(CommandInvocation)}
4949
*/
50-
default CompletableFuture<List<String>> suggestAsync(final I invocation) {
50+
default CompletableFuture<List<String>> suggestAsync(I invocation) {
5151
return CompletableFuture.completedFuture(suggest(invocation));
5252
}
5353

@@ -60,7 +60,7 @@ default CompletableFuture<List<String>> suggestAsync(final I invocation) {
6060
* @param invocation the invocation context
6161
* @return {@code true} if the source has permission
6262
*/
63-
default boolean hasPermission(final I invocation) {
63+
default boolean hasPermission(I invocation) {
6464
return true;
6565
}
6666
}

api/src/main/java/com/velocitypowered/api/command/VelocityBrigadierMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public final class VelocityBrigadierMessage implements Message, ComponentLike {
2626
* @param message the component to use as the tooltip message
2727
* @return a new instance of {@link VelocityBrigadierMessage}
2828
*/
29-
public static VelocityBrigadierMessage tooltip(final Component message) {
29+
public static VelocityBrigadierMessage tooltip(Component message) {
3030
return new VelocityBrigadierMessage(message);
3131
}
3232

@@ -38,7 +38,7 @@ public static VelocityBrigadierMessage tooltip(final Component message) {
3838
*/
3939
private final Component message;
4040

41-
private VelocityBrigadierMessage(final Component message) {
41+
private VelocityBrigadierMessage(Component message) {
4242
this.message = Preconditions.checkNotNull(message, "message");
4343
}
4444

0 commit comments

Comments
 (0)