Update upstream (#4)

* Add version information for 1.20.1 (PaperMC#1021)

* bump adventure to 4.14.0 (PaperMC#1034)

* check if a plugin has a executor service (PaperMC#1038)

* check if a plugin has an executor service

* checkstyle

* feat: add TabList#addEntries (PaperMC#987)

* [ci skip] Replaced weired i with i in javadocs (PaperMC#1057)

In this little patch I replaced an i which caused my build process to crash with an i

* Do not track plugin channels registered per-player on the proxy (PaperMC#591)

We don't need to track this information since Velocity uses the JoinGame packet, which is about as good of a server rejoin mechanism we're likely to get in vanilla Minecraft.

* fix PaperMC#1062

* 1.20.2 Support (PaperMC#1088)

Co-authored-by: RednedEpic <redned235@gmail.com>
Co-authored-by: Gero <gecam59@gmail.com>

* Actually send plugin message registration to backend servers

I don't see where this was ever done, and don't see how plugin messaging
could of ever worked, at least within the confines of CB and co, given
the fact that we never seemed to be sending this to the backend?

* appease checkstyle, move back to older fix placement

* Change packet decode logging prompt

* Catch throwables when loading plugins (PaperMC#1098)

* Several improvements and fixes for 1.20.2 (PaperMC#1097)

* Send LoginAcknowledged immediately

* Resend player list header/footer after backend server switched to config state

* Fix clearHeaderAndFooter not clearing fields in ConnectedPlayer

* Clear boss bars, header/footer, tab list when switching client to config state

* Send client settings in config state

* Fix unsigned commands detected as signed (PaperMC#1082)

* fix: commands flagged as signed without signed arguments

* feat: improve error message for illegal protocol state.

* acknowledge seen messages to server when running proxy commands (PaperMC#1100)

* Implement ComponentLogger (PaperMC#1022)

* Log the protocol phase in case of trying to obtain a packet id not existing in the phase (PaperMC#1107)

* Bump netty to 4.1.100.Final (PaperMC#1067)

---------

Co-authored-by: Pantera (Mad_Daniel) <89838384+Pantera07@users.noreply.github.com>
Co-authored-by: chris <reichel32574@gmail.com>
Co-authored-by: Aaron <71191102+RealBauHD@users.noreply.github.com>
Co-authored-by: powercas_gamer <cas@deltapvp.net>
Co-authored-by: Groldi <53694440+Plugrol@users.noreply.github.com>
Co-authored-by: Andrew Steinborn <git@steinborn.me>
Co-authored-by: Emmanuel Lampe <rexlmanude@gmail.com>
Co-authored-by: Paul <Paul19988@users.noreply.github.com>
Co-authored-by: RednedEpic <redned235@gmail.com>
Co-authored-by: Gero <gecam59@gmail.com>
Co-authored-by: Shane Freeder <theboyetronic@gmail.com>
Co-authored-by: Joo200 <github@joo200.de>
Co-authored-by: Adrian <68704415+4drian3d@users.noreply.github.com>

.gitignore

@@ -83,6 +83,8 @@ gradle-app.setting
 logs/
 /velocity.toml
 /forwarding.secret
+forwarding.secret
+velocity.toml
 server-icon.png
 /bin/
 run/

api/build.gradle.kts

@@ -29,6 +29,8 @@ dependencies {
     api("net.kyori:adventure-text-serializer-legacy")
     api("net.kyori:adventure-text-serializer-plain")
     api("net.kyori:adventure-text-minimessage")
+    api("net.kyori:adventure-text-logger-slf4j")
+    api("net.kyori:adventure-text-serializer-ansi")
 
     api(libs.slf4j)
     api(libs.guice)

api/src/main/java/com/velocitypowered/api/event/player/ServerPreConnectEvent.java

@@ -47,7 +47,7 @@ public ServerPreConnectEvent(Player player, RegisteredServer originalServer) {
    *
    * @param player the player who is connecting to a server
    * @param originalServer the server the player was trying to connect to
-   * @param previousServer the server the player ís connected to
+   * @param previousServer the server the player is connected to
    */
   public ServerPreConnectEvent(Player player, RegisteredServer originalServer,
       @Nullable RegisteredServer previousServer) {

api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java

@@ -62,7 +62,8 @@ public enum ProtocolVersion {
   MINECRAFT_1_19_1(760, "1.19.1", "1.19.2"),
   MINECRAFT_1_19_3(761, "1.19.3"),
   MINECRAFT_1_19_4(762, "1.19.4"),
-  MINECRAFT_1_20(763, "1.20");
+  MINECRAFT_1_20(763, "1.20", "1.20.1"),
+  MINECRAFT_1_20_2(764, "1.20.2");
 
   private static final int SNAPSHOT_BIT = 30;
 

api/src/main/java/com/velocitypowered/api/proxy/Player.java

@@ -31,7 +31,6 @@
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -148,10 +147,17 @@ public interface Player extends
   /**
    * Clears the tab list header and footer for the player.
    *
-   * @deprecated Use {@link TabList#clearHeaderAndFooter()}.
+   * @deprecated Use {@link Player#clearPlayerListHeaderAndFooter()}.
    */
   @Deprecated
-  void clearHeaderAndFooter();
+  default void clearHeaderAndFooter() {
+    clearPlayerListHeaderAndFooter();
+  }
+
+  /**
+   * Clears the player list header and footer.
+   */
+  void clearPlayerListHeaderAndFooter();
 
   /**
    * Returns the player's player list header.

api/src/main/java/com/velocitypowered/api/proxy/player/TabList.java

@@ -43,6 +43,28 @@ public interface TabList {
    */
   void addEntry(TabListEntry entry);
 
+  /**
+   * Adds a {@link Iterable} of {@link TabListEntry}'s to the {@link Player}'s tab list.
+   *
+   * @param entries to add to the tab list
+   */
+  default void addEntries(Iterable<TabListEntry> entries) {
+    for (TabListEntry entry : entries) {
+      addEntry(entry);
+    }
+  }
+
+  /**
+   * Adds an array of {@link TabListEntry}'s to the {@link Player}'s tab list.
+   *
+   * @param entries to add to the tab list
+   */
+  default void addEntries(TabListEntry... entries) {
+    for (TabListEntry entry : entries) {
+      addEntry(entry);
+    }
+  }
+
   /**
    * Removes the {@link TabListEntry} from the tab list with the {@link GameProfile} identified with
    * the specified {@link UUID}.

gradle/libs.versions.toml

@@ -2,15 +2,15 @@
 configurate = "3.7.3"
 flare = "2.0.1"
 log4j = "2.20.0"
-netty = "4.1.90.Final"
+netty = "4.1.100.Final"
 
 [plugins]
 indra-publishing = "net.kyori.indra.publishing:2.0.6"
 shadow = "com.github.johnrengelman.shadow:8.1.0"
 spotless = "com.diffplug.spotless:6.12.0"
 
 [libraries]
-adventure-bom = "net.kyori:adventure-bom:4.13.1"
+adventure-bom = "net.kyori:adventure-bom:4.14.0"
 adventure-facet = "net.kyori:adventure-platform-facet:4.3.0"
 asm = "org.ow2.asm:asm:9.5"
 asynchttpclient = "org.asynchttpclient:async-http-client:2.12.3"
@@ -29,13 +29,14 @@ flare-fastutil = { module = "space.vectrix.flare:flare-fastutil", version.ref =
 jline = "org.jline:jline-terminal-jansi:3.23.0"
 jopt = "net.sf.jopt-simple:jopt-simple:5.0.4"
 junit = "org.junit.jupiter:junit-jupiter:5.9.0"
+kyori-ansi = "net.kyori:ansi:1.0.3"
 guava = "com.google.guava:guava:25.1-jre"
 gson = "com.google.code.gson:gson:2.10.1"
 guice = "com.google.inject:guice:6.0.0"
 lmbda = "org.lanternpowered:lmbda:2.0.0"
 log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
-log4j-slf4j-impl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" }
+log4j-slf4j-impl = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version.ref = "log4j" }
 log4j-iostreams = { module = "org.apache.logging.log4j:log4j-iostreams", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 mockito = "org.mockito:mockito-core:5.2.0"
@@ -45,7 +46,7 @@ netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty"
 netty-handler = { module = "io.netty:netty-handler", version.ref = "netty" }
 netty-transport-native-epoll = { module = "io.netty:netty-transport-native-epoll", version.ref = "netty" }
 nightconfig = "com.electronwill.night-config:toml:3.6.6"
-slf4j = "org.slf4j:slf4j-api:1.7.30"
+slf4j = "org.slf4j:slf4j-api:2.0.7"
 spotbugs-annotations = "com.github.spotbugs:spotbugs-annotations:4.7.3"
 terminalconsoleappender = "net.minecrell:terminalconsoleappender:1.3.0"
 

proxy/build.gradle.kts

@@ -93,6 +93,7 @@ dependencies {
     implementation(project(":velocity-native"))
 
     implementation(libs.bundles.log4j)
+    implementation(libs.kyori.ansi)
     implementation(libs.netty.codec)
     implementation(libs.netty.codec.haproxy)
     implementation(libs.netty.codec.http)