Pre-implement component-like and literal tooltips and errors fixes

Author: R00tB33rMan

proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java

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

proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java

@@ -21,7 +21,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.brigadier.suggestion.Suggestion;
-import com.velocitypowered.api.command.VelocityBrigadierMessage;
 import com.velocitypowered.api.event.connection.PluginMessageEvent;
 import com.velocitypowered.api.event.player.CookieReceiveEvent;
 import com.velocitypowered.api.event.player.PlayerChannelRegisterEvent;
@@ -87,6 +86,7 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -701,10 +701,10 @@ private boolean handleCommandTabComplete(final TabCompleteRequestPacket packet)
           for (Suggestion suggestion : suggestions.getList()) {
             String offer = suggestion.getText();
             ComponentHolder tooltip = null;
-            if (suggestion.getTooltip() != null
-                && suggestion.getTooltip() instanceof VelocityBrigadierMessage) {
-              tooltip = new ComponentHolder(player.getProtocolVersion(),
-                  ((VelocityBrigadierMessage) suggestion.getTooltip()).asComponent());
+            if (suggestion.getTooltip() instanceof ComponentLike componentLike) {
+              tooltip = new ComponentHolder(player.getProtocolVersion(), componentLike.asComponent());
+            } else if (suggestion.getTooltip() != null) {
+              tooltip = new ComponentHolder(player.getProtocolVersion(), Component.text(suggestion.getTooltip().getString()));
             }
             offers.add(new Offer(offer, tooltip));
           }
@@ -768,10 +768,10 @@ private void finishCommandTabComplete(final TabCompleteRequestPacket request,
                 offer = offer.substring(command.length());
               }
               ComponentHolder tooltip = null;
-              if (suggestion.getTooltip() != null
-                  && suggestion.getTooltip() instanceof VelocityBrigadierMessage) {
-                tooltip = new ComponentHolder(player.getProtocolVersion(),
-                    ((VelocityBrigadierMessage) suggestion.getTooltip()).asComponent());
+              if (suggestion.getTooltip() instanceof ComponentLike componentLike) {
+                tooltip = new ComponentHolder(player.getProtocolVersion(), componentLike.asComponent());
+              } else if (suggestion.getTooltip() != null) {
+                tooltip = new ComponentHolder(player.getProtocolVersion(), Component.text(suggestion.getTooltip().getString()));
               }
               response.getOffers().add(new Offer(offer, tooltip));
             }