Merge pull request #6 from DavidArchive/Migration-to-MiniMessages

Migration to mini messages

Author: MioArchive

src/main/java/me/david/EventCore.java

@@ -43,7 +43,6 @@ public void onLoad() {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public void onEnable() {
         saveDefaultConfig();
         instance = this;
@@ -96,15 +95,15 @@ public void onEnable() {
         if (getConfig().getBoolean("Messages.Actionbar.Enabled")) {
             Scheduler.timerAsync(() -> {
                 for (Player player : Bukkit.getOnlinePlayers()) {
-                    String message = MessageUtil.get("Messages.Actionbar.Message");
-                    message = PlaceholderAPI.setPlaceholders(player, message);
-                    player.sendActionBar(message);
+                    String raw = getConfig().getString("Messages.Actionbar.Message", "&aYou are playing the best Event!");
+                    String parsed = PlaceholderAPI.setPlaceholders(player, raw);
+
+                    player.sendActionBar(MessageUtil.translateColorCodes(parsed));
                 }
             }, 0, 20);
         }
 
-        int id = 28277;
-        new Metrics(this, id);
+        new Metrics(this, 28277);
     }
 
     @Override

src/main/java/me/david/command/AnnouncementCommand.java

@@ -5,10 +5,13 @@
 import dev.jorel.commandapi.executors.CommandArguments;
 import me.david.EventCore;
 import me.david.util.MessageUtil;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.title.Title;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.Map;
 import java.util.Objects;
 
 public class AnnouncementCommand {
@@ -27,24 +30,23 @@ public CommandAPICommand init() {
                 .executes(this::onCommand);
     }
 
-    @SuppressWarnings("deprecation")
     private void onCommand(CommandSender sender, CommandArguments args) {
         String message = Objects.requireNonNull(args.get("message")).toString();
 
+        var replacements = Map.of(
+                "%prefix%", MessageUtil.getPrefix(),
+                "%message%", MessageUtil.translateColorCodes(message)
+        );
+
         for (Player player : Bukkit.getOnlinePlayers()) {
-            player.sendMessage(MessageUtil.get("Messages.AnnoucementCommand.MessageFormat")
-                    .replace("%prefix%", MessageUtil.getPrefix())
-                    .replace("%message%", message));
+            player.sendMessage(MessageUtil.format("Messages.AnnoucementCommand.MessageFormat", replacements));
 
             if (plugin.getConfig().getBoolean("Messages.AnnoucementCommand.Title.Enabled")) {
-                player.sendTitle(
-                        MessageUtil.get("Messages.AnnoucementCommand.Title.Title")
-                                .replace("%prefix%", MessageUtil.getPrefix())
-                                .replace("%message%", message),
-                        MessageUtil.get("Messages.AnnoucementCommand.Title.SubTitle")
-                                .replace("%prefix%", MessageUtil.getPrefix())
-                                .replace("%message%", message)
-                );
+                Component titleComponent = MessageUtil.format("Messages.AnnoucementCommand.Title.Title", replacements);
+                Component subTitleComponent = MessageUtil.format("Messages.AnnoucementCommand.Title.SubTitle", replacements);
+
+                Title title = Title.title(titleComponent, subTitleComponent);
+                player.showTitle(title);
             }
         }
     }

src/main/java/me/david/command/EventCoreCommand.java

@@ -5,6 +5,7 @@
 import me.david.command.impl.core.*;
 import me.david.util.MessageUtil;
 import me.david.util.Scheduler;
+import net.kyori.adventure.text.Component;
 
 public class EventCoreCommand {
 
@@ -15,7 +16,6 @@ public EventCoreCommand(EventCore plugin) {
         init();
     }
 
-    @SuppressWarnings("deprecation")
     private void init() {
         new CommandAPICommand("event")
                 .withAliases("eventcore", "e")
@@ -32,10 +32,10 @@ private void init() {
                         new AutoBorderCommand(plugin).init()
                 )
                 .executesPlayer((player, args) -> {
-                    player.sendMessage(" ");
+                    player.sendMessage(Component.empty());
                     player.sendMessage(MessageUtil.getPrefix() + "§7Running §aEventCore §7v" + EventCore.getInstance().getDescription().getVersion() + " §7on §a" + getSoftware());
                     player.sendMessage(MessageUtil.getPrefix() + "§7Download at §ahttps://github.com/VertrauterDavid");
-                    player.sendMessage(" ");
+                    player.sendMessage(Component.empty());
                     player.sendMessage(MessageUtil.getPrefix() + "Usage: §c/event start");
                     player.sendMessage(MessageUtil.getPrefix() + "Usage: §c/event stop <winner>");
                     player.sendMessage(MessageUtil.getPrefix() + "Usage: §c/event drop");
@@ -46,7 +46,7 @@ private void init() {
                     player.sendMessage(MessageUtil.getPrefix() + "Usage: §c/event kickspec");
                     player.sendMessage(MessageUtil.getPrefix() + "Usage: §c/event kickall");
                     player.sendMessage(MessageUtil.getPrefix() + "Usage: §c/event clearall");
-                    player.sendMessage(" ");
+                    player.sendMessage(Component.empty());
                 })
                 .register();
     }

src/main/java/me/david/command/KitCommand.java

@@ -2,7 +2,10 @@
 
 import dev.jorel.commandapi.CommandAPICommand;
 import me.david.EventCore;
-import me.david.command.impl.kit.*;
+import me.david.command.impl.kit.KitDeleteCommand;
+import me.david.command.impl.kit.KitEnableCommand;
+import me.david.command.impl.kit.KitGiveCommand;
+import me.david.command.impl.kit.KitSaveCommand;
 import me.david.util.MessageUtil;
 
 public class KitCommand {

src/main/java/me/david/command/ReviveCommand.java

@@ -1,9 +1,9 @@
 package me.david.command;
 
+import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.arguments.ArgumentSuggestions;
 import dev.jorel.commandapi.arguments.StringArgument;
 import dev.jorel.commandapi.executors.CommandArguments;
-import dev.jorel.commandapi.CommandAPICommand;
 import me.david.EventCore;
 import me.david.util.MessageUtil;
 import me.david.util.PlayerUtil;

src/main/java/me/david/command/impl/core/AutoBorderCommand.java

@@ -29,10 +29,10 @@ private void onCommand(Player player, CommandArguments args) {
 
         if (!state) {
             BorderUtil.lastOptimal = BorderUtil.borderDefault;
-            player.sendMessage(MessageUtil.getPrefix() + "AutoBorder has been §cdeactivated!");
+            player.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("AutoBorder has been §cdeactivated!")));
         } else {
-            player.sendMessage(MessageUtil.getPrefix() + "AutoBorder has been §aactivated!");
+            player.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("AutoBorder has been §aactivated!")));
         }
     }
 
-}
+}

src/main/java/me/david/command/impl/core/ClearAllCommand.java

@@ -5,6 +5,7 @@
 import me.david.EventCore;
 import me.david.util.MessageUtil;
 import me.david.util.PlayerUtil;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -30,6 +31,8 @@ private void onCommand(CommandSender sender, CommandArguments args) {
             amount++;
         }
 
-        sender.sendMessage(MessageUtil.getPrefix() + "You successfully cleared %amount% players!".replaceAll("%amount%", String.valueOf(amount)));
+        int result = amount;
+
+        sender.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("You successfully cleared %amount% players!").replaceText(b -> b.matchLiteral("%amount%").replacement(Component.text(String.valueOf(result))))));
     }
 }

src/main/java/me/david/command/impl/core/KickAllCommand.java

@@ -32,6 +32,7 @@ private void onCommand(CommandSender sender, CommandArguments args) {
             }
         }
 
-        sender.sendMessage(MessageUtil.getPrefix() + "You successfully kicked %amount% players!".replaceAll("%amount%", String.valueOf(amount)));
+        int result = amount;
+        sender.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("You successfully kicked %amount% players!").replaceText(b -> b.matchLiteral("%amount%").replacement(Component.text(String.valueOf(result))))));
     }
 }

src/main/java/me/david/command/impl/core/KickSpecCommand.java

@@ -33,6 +33,7 @@ private void onCommand(CommandSender sender, CommandArguments args) {
             }
         }
 
-        sender.sendMessage(MessageUtil.getPrefix() + "You successfully kicked %amount% players!".replaceAll("%amount%", String.valueOf(amount)));
+        int result = amount;
+        sender.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("You successfully kicked %amount% players!").replaceText(b -> b.matchLiteral("%amount%").replacement(Component.text(String.valueOf(result))))));
     }
 }

src/main/java/me/david/command/impl/core/ReloadCommand.java

@@ -4,6 +4,7 @@
 import dev.jorel.commandapi.executors.CommandArguments;
 import me.david.EventCore;
 import me.david.util.MessageUtil;
+import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 
 public class ReloadCommand {
@@ -24,7 +25,6 @@ private void onCommand(CommandSender sender, CommandArguments args) {
         EventCore.getInstance().reloadConfig();
         final double reloadMS = System.currentTimeMillis() - currentMS;
 
-        sender.sendMessage(MessageUtil.getPrefix() + "§aYou successfully reloaded the config within " + reloadMS + "ms!");
-
+        sender.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("§aYou successfully reloaded the config within %ms%ms!").replaceText(b -> b.matchLiteral("%ms%").replacement(Component.text(String.valueOf(reloadMS))))));
     }
 }