From 63aaee698ece15c109146597f5c02bb3706544d6 Mon Sep 17 00:00:00 2001
From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
Date: Mon, 15 Mar 2021 14:56:37 +0000
Subject: [PATCH] Rebase to master and fix complication issues

---
 .../builder/suggestion/SuggestionEntry.java   | 28 ++++++++++++++++---
 .../net/minestom/server/entity/Player.java    |  2 --
 .../java/demo/commands/HealthCommand.java     |  2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/minestom/server/command/builder/suggestion/SuggestionEntry.java b/src/main/java/net/minestom/server/command/builder/suggestion/SuggestionEntry.java
index 9e8a2b96c..d05e4dd64 100644
--- a/src/main/java/net/minestom/server/command/builder/suggestion/SuggestionEntry.java
+++ b/src/main/java/net/minestom/server/command/builder/suggestion/SuggestionEntry.java
@@ -1,5 +1,6 @@
 package net.minestom.server.command.builder.suggestion;
 
+import net.kyori.adventure.text.Component;
 import net.minestom.server.chat.JsonMessage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -7,15 +8,25 @@ import org.jetbrains.annotations.Nullable;
 public class SuggestionEntry {
 
     private final String entry;
-    private final JsonMessage tooltip;
+    private final Component tooltip;
 
+    /**
+     * @deprecated Use {{@link #SuggestionEntry(String, JsonMessage)}}
+     */
+    @Deprecated
     public SuggestionEntry(@NotNull String entry, @Nullable JsonMessage tooltip) {
         this.entry = entry;
-        this.tooltip = tooltip;
+        this.tooltip = tooltip.asComponent();
+    }
+
+    public SuggestionEntry(@NotNull String entry, @Nullable Component tooltip) {
+        this.entry = entry;
+        this.tooltip = tooltip.asComponent();
     }
 
     public SuggestionEntry(@NotNull String entry) {
-        this(entry, null);
+        this.entry = entry;
+        this.tooltip = null;
     }
 
     @NotNull
@@ -24,7 +35,16 @@ public class SuggestionEntry {
     }
 
     @Nullable
-    public JsonMessage getTooltip() {
+    public Component getTooltip() {
         return tooltip;
     }
+
+    /**
+     * @deprecated Use {@link #getTooltip()}
+     */
+    @Deprecated
+    @Nullable
+    public JsonMessage getTooltipJson() {
+        return JsonMessage.fromComponent(tooltip);
+    }
 }
diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java
index 8220fa46f..29483c0a7 100644
--- a/src/main/java/net/minestom/server/entity/Player.java
+++ b/src/main/java/net/minestom/server/entity/Player.java
@@ -17,8 +17,6 @@ import net.minestom.server.advancements.AdvancementTab;
 import net.minestom.server.adventure.AdventurePacketConvertor;
 import net.minestom.server.adventure.Localizable;
 import net.minestom.server.attribute.Attribute;
-import net.minestom.server.attribute.AttributeInstance;
-import net.minestom.server.bossbar.BossBar;
 import net.minestom.server.chat.ChatParser;
 import net.minestom.server.chat.ColoredText;
 import net.minestom.server.chat.JsonMessage;
diff --git a/src/test/java/demo/commands/HealthCommand.java b/src/test/java/demo/commands/HealthCommand.java
index d8279bb82..171e5dac6 100644
--- a/src/test/java/demo/commands/HealthCommand.java
+++ b/src/test/java/demo/commands/HealthCommand.java
@@ -59,7 +59,7 @@ public class HealthCommand extends Command {
     }
 
     private void sendSuggestionMessage(CommandSender sender, CommandContext context) {
-        sender.sendMessage(Component.text("/health " + args.get("mode") + " [Integer]"));
+        sender.sendMessage(Component.text("/health " + context.get("mode") + " [Integer]"));
     }
 
     private void onHealthCommand(CommandSender sender, CommandContext context) {