Added MiniMessage support

build.gradle.kts

@@ -14,6 +14,7 @@ version = "$majorVersion-$minorVersion"
 
 repositories {
     mavenCentral()
+    maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
     maven("https://repo.glaremasters.me/repository/public/")
@@ -25,7 +26,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly(libs.spigot)
+    compileOnly(libs.paper)
 
     compileOnly(libs.vault)
     compileOnly(libs.authlib)
@@ -44,18 +45,17 @@ dependencies {
     compileOnly(libs.papi)
 
     implementation(libs.nashorn)
-    implementation(libs.adventure.platform)
-    implementation(libs.adventure.minimessage)
+    compileOnly(libs.adventure.platform)
+    compileOnly(libs.adventure.minimessage)
     implementation(libs.bstats)
 
-    compileOnly("org.jetbrains:annotations:23.0.0")
+    compileOnly(libs.annotations)
 }
 
 tasks {
     shadowJar {
         relocate("org.objectweb.asm", "com.extendedclip.deluxemenus.libs.asm")
         relocate("org.openjdk.nashorn", "com.extendedclip.deluxemenus.libs.nashorn")
-        relocate("net.kyori", "com.extendedclip.deluxemenus.libs.adventure")
         relocate("org.bstats", "com.extendedclip.deluxemenus.libs.bstats")
         archiveFileName.set("DeluxeMenus-${rootProject.version}.jar")
     }
@@ -67,7 +67,11 @@ tasks {
 
     processResources {
         filesMatching("plugin.yml") {
-            expand("version" to rootProject.version)
+            expand(
+                "version" to rootProject.version,
+                "adventurePlatform" to libs.adventure.platform.get().let { "${it.group}:${it.name}:${it.version}" },
+                "adventureMiniMessage" to libs.adventure.minimessage.get().let { "${it.group}:${it.name}:${it.version}" }
+            )
         }
     }
 }

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # Compile only
-spigot = "1.21.5-R0.1-SNAPSHOT"
+paper = "1.21.6-R0.1-SNAPSHOT"
 vault = "1.7.1"
 authlib = "1.5.25"
 headdb = "1.3.2"
@@ -14,6 +14,7 @@ papi = "2.11.6"
 score = "5.25.3.9"
 sig = "1.5.0"
 bstats = "3.1.0"
+annotations = "23.0.0"
 
 # Implementation
 nashorn = "15.6"
@@ -22,7 +23,7 @@ adventure-minimessage = "4.24.0"
 
 [libraries]
 # Compile only
-spigot = { module = "org.spigotmc:spigot-api", version.ref = "spigot" }
+paper = { module = "io.papermc.paper:paper-api", version.ref = "paper" }
 vault = { module = "com.github.milkbowl:VaultAPI", version.ref = "vault" }
 authlib = { module = "com.mojang:authlib", version.ref = "authlib" }
 headdb = { module = "com.arcaniax:HeadDatabase-API", version.ref = "headdb" }
@@ -36,6 +37,7 @@ mmoitems = { module = "net.Indyuce:MMOItems-API", version.ref = "mmoitems" }
 papi = { module = "me.clip:placeholderapi", version.ref = "papi" }
 score = { module = "com.github.Ssomar-Developement:SCore", version.ref = "score" }
 sig = { module = "io.github.valerashimchuck:simpleitemgenerator-api", version.ref = "sig" }
+annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
 
 # Implementation
 nashorn = { module = "org.openjdk.nashorn:nashorn-core", version.ref = "nashorn" }

src/main/java/com/extendedclip/deluxemenus/DeluxeMenus.java

@@ -25,6 +25,7 @@
 import net.kyori.adventure.text.Component;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.AdvancedPie;
+import org.bstats.charts.SimplePie;
 import org.bstats.charts.SingleLineChart;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -169,7 +170,7 @@ public void sms(CommandSender s, Component msg) {
     }
 
     public void sms(CommandSender s, Messages msg) {
-        audiences().sender(s).sendMessage(msg.message());
+        sms(s, msg.message());
     }
 
     public void debug(@NotNull final DebugLevel messageDebugLevel, @NotNull final Level level, @NotNull final String... messages) {
@@ -243,11 +244,11 @@ private void hookIntoVault() {
                 "DeluxeMenus will continue to work but some features (such as the 'has money' requirement) may not be available.");
     }
 
-    @SuppressWarnings("deprecation")
     private void setUpItemHooks() {
         if (!VersionHelper.IS_ITEM_LEGACY) {
             this.head = new ItemStack(Material.PLAYER_HEAD, 1);
         } else {
+            //noinspection deprecation
             this.head = new ItemStack(Material.valueOf("SKULL_ITEM"), 1, (short) 3);
         }
 
@@ -331,6 +332,8 @@ private void setUpMetrics() {
                 .map(MenuOptions::type)
                 .collect(Collectors.groupingBy(Enum::name, Collectors.summingInt(type -> 1)))));
 
+        metrics.addCustomChart(new SimplePie("is_paper", () -> VersionHelper.IS_PAPER ? "true" : "false"));
+
         // added for 1.21 usage
         metrics.addCustomChart(new AdvancedPie("nbt_usage", () -> {
             final var results = new HashMap<String, Integer>();

src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java

@@ -10,11 +10,10 @@
 import com.extendedclip.deluxemenus.utils.SoundUtils;
 import com.extendedclip.deluxemenus.utils.StringUtils;
 import com.extendedclip.deluxemenus.utils.VersionHelper;
-import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 
@@ -32,8 +31,11 @@ public class ClickActionTask extends BukkitRunnable {
     private final UUID uuid;
     private final ActionType actionType;
     private final String exec;
+
     // Ugly hack to get around the fact that arguments are not available at task execution time
     private final Map<String, String> arguments;
+    private final TagResolver tagResolvers;
+
     private final boolean parsePlaceholdersInArguments;
     private final boolean parsePlaceholdersAfterArguments;
 
@@ -43,6 +45,7 @@ public ClickActionTask(
             @NotNull final ActionType actionType,
             @NotNull final String exec,
             @NotNull final Map<String, String> arguments,
+            @NotNull final TagResolver tagResolvers,
             final boolean parsePlaceholdersInArguments,
             final boolean parsePlaceholdersAfterArguments
     ) {
@@ -51,6 +54,7 @@ public ClickActionTask(
         this.actionType = actionType;
         this.exec = exec;
         this.arguments = arguments;
+        this.tagResolvers = tagResolvers;
         this.parsePlaceholdersInArguments = parsePlaceholdersInArguments;
         this.parsePlaceholdersAfterArguments = parsePlaceholdersAfterArguments;
     }
@@ -62,12 +66,21 @@ public void run() {
             return;
         }
 
+        switch (actionType) { // Handle MiniMessage cases to prevent unnecessary executable parsing
+            case MINI_MESSAGE:
+                plugin.audiences().player(player).sendMessage(AdventureUtils.fromString(this.exec, tagResolvers));
+                return;
+
+            case MINI_BROADCAST:
+                plugin.audiences().all().sendMessage(AdventureUtils.fromString(this.exec, tagResolvers));
+                return;
+        }
+
         final Optional<MenuHolder> holder = Menu.getMenuHolder(player);
         final Player target = holder.isPresent() && holder.get().getPlaceholderPlayer() != null
                 ? holder.get().getPlaceholderPlayer()
                 : player;
 
-
         final String executable = StringUtils.replacePlaceholdersAndArguments(
                 this.exec,
                 this.arguments,
@@ -119,14 +132,6 @@ public void run() {
                 Bukkit.dispatchCommand(Bukkit.getConsoleSender(), executable);
                 break;
 
-            case MINI_MESSAGE:
-                plugin.audiences().player(player).sendMessage(MiniMessage.miniMessage().deserialize(executable));
-                break;
-
-            case MINI_BROADCAST:
-                plugin.audiences().all().sendMessage(MiniMessage.miniMessage().deserialize(executable));
-                break;
-
             case MESSAGE:
                 player.sendMessage(StringUtils.color(executable));
                 break;
@@ -276,7 +281,7 @@ public void run() {
                 break;
 
             case JSON_MESSAGE:
-                AdventureUtils.sendJson(plugin, player, executable);
+                plugin.audiences().sender(player).sendMessage(AdventureUtils.fromJson(executable));
                 break;
 
             case JSON_BROADCAST:

src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java

@@ -17,7 +17,6 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 public class ExecuteCommand extends SubCommand {
 
@@ -84,7 +83,13 @@ public void execute(final @NotNull CommandSender sender, final @NotNull List<Str
             return;
         }
 
-        final ClickActionTask actionTask = new ClickActionTask(plugin, target.getUniqueId(), action.getType(), action.getExecutable(), holder.getTypedArgs(), true, true);
+        holder.loadTagResolvers();
+
+        final ClickActionTask actionTask = new ClickActionTask(
+                plugin, target.getUniqueId(), action.getType(), action.getExecutable(), holder.getTypedArgs(),
+                holder.getTagResolvers(),
+                true, true
+        );
 
         if (action.hasDelay()) {
             actionTask.runTaskLater(plugin, action.getDelay(holder));

src/main/java/com/extendedclip/deluxemenus/config/DeluxeMenusConfig.java

@@ -565,6 +565,7 @@ public void loadMenu(FileConfiguration c, String key, boolean mainConfig, final
         builder.parsePlaceholdersInArguments(c.getBoolean(pre + "arguments_support_placeholders", false));
         builder.parsePlaceholdersAfterArguments(c.getBoolean(pre + "parse_placeholders_after_arguments", false));
         builder.enableBypassPerm(c.getBoolean(pre + "enable_open_requirements_bypass_permissions", false));
+        builder.useMiniMessages(c.getBoolean(pre + "use_mini_messages", false));
 
         // Don't need to register the menu since it's done in the constructor
         new Menu(plugin, builder.build(), items, path);
@@ -1231,7 +1232,7 @@ public void onClick(@NotNull final MenuHolder holder) {
                             continue;
                         }
 
-                        final ClickActionTask actionTask = new ClickActionTask(plugin, holder.getViewer().getUniqueId(), action.getType(), action.getExecutable(), holder.getTypedArgs(), holder.parsePlaceholdersInArguments(), holder.parsePlaceholdersAfterArguments());
+                        final ClickActionTask actionTask = new ClickActionTask(plugin, holder.getViewer().getUniqueId(), action.getType(), action.getExecutable(), holder.getTypedArgs(), holder.getTagResolvers(), holder.parsePlaceholdersInArguments(), holder.parsePlaceholdersAfterArguments());
 
                         if (action.hasDelay()) {
                             actionTask.runTaskLater(plugin, action.getDelay(holder));