SteamWar/Velocity
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support all component-like and literal tooltips and errors (#1600)

Browse Source
This commit is contained in:
Gero
2025-08-13 22:12:15 +02:00
committed by GitHub
parent a509a878e9
commit 5d450ab3c7
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java
View File

@@ -35,7 +35,6 @@ import com.velocitypowered.api.command.CommandManager;
import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.command.CommandMeta;
import com.velocitypowered.api.command.CommandResult; import com.velocitypowered.api.command.CommandResult;
import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.command.VelocityBrigadierMessage;
import com.velocitypowered.api.event.command.CommandExecuteEvent; import com.velocitypowered.api.event.command.CommandExecuteEvent;
import com.velocitypowered.api.event.command.PostCommandInvocationEvent; import com.velocitypowered.api.event.command.PostCommandInvocationEvent;
import com.velocitypowered.api.plugin.PluginManager; import com.velocitypowered.api.plugin.PluginManager;
@@ -59,6 +58,7 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import org.checkerframework.checker.lock.qual.GuardedBy; import org.checkerframework.checker.lock.qual.GuardedBy;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
@@ -242,8 +242,8 @@ public class VelocityCommandManager implements CommandManager {
CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand()); CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand());
if (isSyntaxError) { if (isSyntaxError) {
final Message message = e.getRawMessage(); final Message message = e.getRawMessage();
if (message instanceof VelocityBrigadierMessage velocityMessage) { if (message instanceof ComponentLike componentLike) {
source.sendMessage(velocityMessage.asComponent().applyFallbackStyle(NamedTextColor.RED)); source.sendMessage(componentLike.asComponent().applyFallbackStyle(NamedTextColor.RED));
} else { } else {
source.sendMessage(Component.text(e.getMessage(), NamedTextColor.RED)); source.sendMessage(Component.text(e.getMessage(), NamedTextColor.RED));
} }

18
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
View File

@@ -21,7 +21,6 @@ import static com.velocitypowered.proxy.protocol.util.PluginMessageUtil.construc
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.mojang.brigadier.suggestion.Suggestion; import com.mojang.brigadier.suggestion.Suggestion;
import com.velocitypowered.api.command.VelocityBrigadierMessage;
import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.event.connection.PluginMessageEvent;
import com.velocitypowered.api.event.player.CookieReceiveEvent; import com.velocitypowered.api.event.player.CookieReceiveEvent;
import com.velocitypowered.api.event.player.PlayerChannelRegisterEvent; import com.velocitypowered.api.event.player.PlayerChannelRegisterEvent;
@@ -87,6 +86,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import net.kyori.adventure.key.Key; import net.kyori.adventure.key.Key;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@@ -698,10 +698,10 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
for (Suggestion suggestion : suggestions.getList()) { for (Suggestion suggestion : suggestions.getList()) {
String offer = suggestion.getText(); String offer = suggestion.getText();
ComponentHolder tooltip = null; ComponentHolder tooltip = null;
if (suggestion.getTooltip() != null if (suggestion.getTooltip() instanceof ComponentLike componentLike) {
&& suggestion.getTooltip() instanceof VelocityBrigadierMessage) { tooltip = new ComponentHolder(player.getProtocolVersion(), componentLike.asComponent());
tooltip = new ComponentHolder(player.getProtocolVersion(), } else if (suggestion.getTooltip() != null) {
((VelocityBrigadierMessage) suggestion.getTooltip()).asComponent()); tooltip = new ComponentHolder(player.getProtocolVersion(), Component.text(suggestion.getTooltip().getString()));
} }
offers.add(new Offer(offer, tooltip)); offers.add(new Offer(offer, tooltip));
} }
@@ -765,10 +765,10 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
offer = offer.substring(command.length()); offer = offer.substring(command.length());
} }
ComponentHolder tooltip = null; ComponentHolder tooltip = null;
if (suggestion.getTooltip() != null if (suggestion.getTooltip() instanceof ComponentLike componentLike) {
&& suggestion.getTooltip() instanceof VelocityBrigadierMessage) { tooltip = new ComponentHolder(player.getProtocolVersion(), componentLike.asComponent());
tooltip = new ComponentHolder(player.getProtocolVersion(), } else if (suggestion.getTooltip() != null) {
((VelocityBrigadierMessage) suggestion.getTooltip()).asComponent()); tooltip = new ComponentHolder(player.getProtocolVersion(), Component.text(suggestion.getTooltip().getString()));
} }
response.getOffers().add(new Offer(offer, tooltip)); response.getOffers().add(new Offer(offer, tooltip));
} }