Fix Chat class initialization on Paper 1.16.5 - 1.18.1

Check for class actually needed by MiniMessageParser
LMBishop · Aug 28, 2024 · 1e0aa2a · 1e0aa2a
1 parent 84eae15
commit 1e0aa2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/chat/Chat.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/chat/Chat.java
@@ -44,7 +44,7 @@ public final class Chat {
         Objects.requireNonNull(plugin);
 
         try {
-            Class.forName("net.kyori.adventure.Adventure", false, Bukkit.class.getClassLoader());
+            Class.forName("net.kyori.adventure.text.minimessage.MiniMessage", false, Bukkit.class.getClassLoader());
 
             miniMessageParser = new MiniMessageParser();
             plugin.getQuestsLogger().debug("Modern chat is available.");

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/chat/MiniMessageParser.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/chat/MiniMessageParser.java
@@ -3,6 +3,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
 
 public final class MiniMessageParser {
 
@@ -12,8 +13,8 @@ public MiniMessageParser() {
         this.miniMessage = MiniMessage.miniMessage();
     }
 
-    public void send(CommandSender who, String message) {
-        Component component = miniMessage.deserialize(message);
+    public void send(final @NotNull CommandSender who, final @NotNull String message) {
+        final Component component = this.miniMessage.deserialize(message);
         who.sendMessage(component);
     }
 }