From 59e67c0d827dcb9c4fa411454b9d22652f9bfb67 Mon Sep 17 00:00:00 2001
From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
Date: Sun, 4 Apr 2021 14:05:02 +0100
Subject: [PATCH] Undeprecate CommandSender#sendMessage(String), see #212

---
 .../net/minestom/server/command/CommandSender.java   | 12 ++++--------
 .../net/minestom/server/command/ConsoleSender.java   | 11 ++++++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/minestom/server/command/CommandSender.java b/src/main/java/net/minestom/server/command/CommandSender.java
index bd0e44727..487c9b72e 100644
--- a/src/main/java/net/minestom/server/command/CommandSender.java
+++ b/src/main/java/net/minestom/server/command/CommandSender.java
@@ -18,21 +18,17 @@ public interface CommandSender extends PermissionHandler, Audience {
      * Sends a raw string message.
      *
      * @param message the message to send
-     *
-     * @deprecated Use {@link #sendMessage(Component)}
      */
-    @Deprecated
-    default void sendMessage(@NotNull String message) { this.sendMessage(Component.text(message)); }
+    default void sendMessage(@NotNull String message) {
+        this.sendMessage(Component.text(message));
+    }
 
     /**
      * Sends multiple raw string messages.
      *
      * @param messages the messages to send
-     *
-     * @deprecated Use {@link #sendMessage(Component)}
      */
-    @Deprecated
-    default void sendMessage(@NotNull String[] messages) {
+    default void sendMessage(@NotNull String @NotNull[] messages) {
         for (String message : messages) {
             sendMessage(message);
         }
diff --git a/src/main/java/net/minestom/server/command/ConsoleSender.java b/src/main/java/net/minestom/server/command/ConsoleSender.java
index 62c6c9994..f26e518e1 100644
--- a/src/main/java/net/minestom/server/command/ConsoleSender.java
+++ b/src/main/java/net/minestom/server/command/ConsoleSender.java
@@ -16,15 +16,20 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * Represents the console when sending a command to the server.
  */
 public class ConsoleSender implements CommandSender {
-
-    private final static Logger LOGGER = LoggerFactory.getLogger(ConsoleSender.class);
+    private static final PlainComponentSerializer PLAIN_SERIALIZER = PlainComponentSerializer.plain();
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleSender.class);
 
     private final Set<Permission> permissions = new CopyOnWriteArraySet<>();
 
+    @Override
+    public void sendMessage(@NotNull String message) {
+        LOGGER.info(message);
+    }
+
     @Override
     public void sendMessage(@NotNull  Identity source, @NotNull Component message, @NotNull MessageType type) {
         // we don't use the serializer here as we just need the plain text of the message
-        LOGGER.info(PlainComponentSerializer.plain().serialize(message));
+        this.sendMessage(PLAIN_SERIALIZER.serialize(message));
     }
 
     @NotNull