From 2b5d964ab014dac0bed6ae6ff7b741b43731bdfd Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 11 Jul 2026 01:36:17 +0100 Subject: [PATCH] Reapply "Adventure 5 (#1774)" This reverts commit 06eb052ab507dab1ee96787f7363fc34d8adfce3. --- api/build.gradle.kts | 4 +--- gradle/libs.versions.toml | 4 ++-- .../connection/client/ConnectedPlayer.java | 23 ++++--------------- .../proxy/console/VelocityConsole.java | 4 +--- .../proxy/protocol/ProtocolUtils.java | 1 - 5 files changed, 8 insertions(+), 28 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 268a8197..0e3304f6 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -67,9 +67,7 @@ tasks { "https://guava.dev/releases/${libs.guava.get().version}/api/docs/", "https://google.github.io/guice/api-docs/${libs.guice.get().version}/javadoc/", "https://docs.oracle.com/en/java/javase/17/docs/api/", - "https://jd.advntr.dev/api/${libs.adventure.bom.get().version}/", - "https://jd.advntr.dev/text-minimessage/${libs.adventure.bom.get().version}/", - "https://jd.advntr.dev/key/${libs.adventure.bom.get().version}/", + "https://jd.papermc.io/adventure/${libs.adventure.bom.get().version}/", "https://www.javadocs.dev/com.github.ben-manes.caffeine/caffeine/${libs.caffeine.get().version}/", ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e00cea72..479b30ce 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,8 +11,8 @@ shadow = "com.gradleup.shadow:9.3.1" spotless = "com.diffplug.spotless:8.2.0" [libraries] -adventure-bom = "net.kyori:adventure-bom:4.26.1" -adventure-text-serializer-json-legacy-impl = "net.kyori:adventure-text-serializer-json-legacy-impl:4.26.1" +adventure-bom = "net.kyori:adventure-bom:5.2.0" +adventure-text-serializer-json-legacy-impl = "net.kyori:adventure-text-serializer-json-legacy-impl:5.2.0" adventure-facet = "net.kyori:adventure-platform-facet:4.4.1" asm = "org.ow2.asm:asm:9.9.1" auto-service = "com.google.auto.service:auto-service:1.1.1" diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java index 8d39fcf9..3bf23d5d 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java @@ -84,7 +84,6 @@ import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket; import com.velocitypowered.proxy.protocol.packet.RemoveResourcePackPacket; import com.velocitypowered.proxy.protocol.packet.TransferPacket; import com.velocitypowered.proxy.protocol.packet.chat.ChatQueue; -import com.velocitypowered.proxy.protocol.packet.chat.ChatType; import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder; import com.velocitypowered.proxy.protocol.packet.chat.PlayerChatCompletionPacket; import com.velocitypowered.proxy.protocol.packet.chat.builder.ChatBuilderFactory; @@ -119,7 +118,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import net.kyori.adventure.audience.MessageType; import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.key.Key; @@ -425,29 +423,16 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player, } @Override - public void sendMessage(@NonNull Identity identity, @NonNull Component message) { + public void sendMessage(final @NonNull Component message) { + Preconditions.checkNotNull(message, "message"); final Component translated = translateMessage(message); connection.write(getChatBuilderFactory().builder() - .component(translated).forIdentity(identity).toClient()); + .component(translated).toClient()); } @Override - public void sendMessage(@NonNull Identity identity, @NonNull Component message, - @NonNull MessageType type) { - Preconditions.checkNotNull(message, "message"); - Preconditions.checkNotNull(type, "type"); - - Component translated = translateMessage(message); - - connection.write(getChatBuilderFactory().builder() - .component(translated).forIdentity(identity) - .setType(type == MessageType.CHAT ? ChatType.CHAT : ChatType.SYSTEM) - .toClient()); - } - - @Override - public void sendActionBar(net.kyori.adventure.text.@NonNull Component message) { + public void sendActionBar(@NonNull Component message) { Component translated = translateMessage(message); ProtocolVersion playerVersion = getProtocolVersion(); diff --git a/proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java b/proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java index e6e78eb3..9bb6635f 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java @@ -28,7 +28,6 @@ import com.velocitypowered.proxy.util.ClosestLocaleMatcher; import java.nio.file.Path; import java.util.List; import java.util.Locale; -import net.kyori.adventure.audience.MessageType; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.permission.PermissionChecker; import net.kyori.adventure.platform.facet.FacetPointers; @@ -73,8 +72,7 @@ public final class VelocityConsole extends SimpleTerminalConsole implements Cons } @Override - public void sendMessage(@NonNull Identity identity, @NonNull Component message, - @NonNull MessageType messageType) { + public void sendMessage(@NonNull Component message) { componentLogger.info(message); } diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java index 826df5b3..3cb64382 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java @@ -60,7 +60,6 @@ public enum ProtocolUtils { private static final GsonComponentSerializer PRE_1_16_SERIALIZER = GsonComponentSerializer.builder() - .downsampleColors() .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get()) .options( OptionSchema.globalSchema().stateBuilder()