fix: cancel structure locate in classic plot worlds

Core/src/main/java/com/plotsquared/core/command/CommandCategory.java

@@ -24,7 +24,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.player.PlotPlayer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 
@@ -99,14 +98,6 @@ public enum CommandCategory implements Caption {
         return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
     }
 
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
-        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
-    }
-
     /**
      * Checks if a player has access to this command category
      *

Core/src/main/java/com/plotsquared/core/command/Help.java

@@ -113,34 +113,38 @@ public class Help extends Command {
             }
             if (cat == null && page == 0) {
                 TextComponent.Builder builder = Component.text();
-                builder.append(TranslatableCaption.of("help.help_header").toComponent(player));
+                builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("help.help_header").getComponent(player)));
                 for (CommandCategory c : CommandCategory.values()) {
                     if (!c.canAccess(player)) {
                         continue;
                     }
-                    builder.append(Component.newline());
-                    builder.append(TranslatableCaption.of("help.help_info_item").toComponent(
-                            player, TagResolver.builder()
-                                    .tag("command", Tag.inserting(Component.text("/plot help")))
-                                    .tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
-                                    .tag("category_desc", Tag.inserting(c.toComponent(player)))
-                                    .build()
-                    ));
+                    builder.append(Component.newline()).append(MINI_MESSAGE
+                            .deserialize(
+                                    TranslatableCaption.of("help.help_info_item").getComponent(player),
+                                    TagResolver.builder()
+                                            .tag("command", Tag.inserting(Component.text("/plot help")))
+                                            .tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
+                                            .tag("category_desc", Tag.inserting(c.toComponent(player)))
+                                            .build()
+                            ));
                 }
-                builder.append(Component.newline());
-                builder.append(TranslatableCaption.of("help.help_info_item").toComponent(
-                        player, TagResolver.builder()
-                                .tag("command", Tag.inserting(Component.text("/plot help")))
-                                .tag("category", Tag.inserting(Component.text("all")))
-                                .tag(
-                                        "category_desc", Tag.inserting(TranslatableCaption
-                                                .of("help.help_display_all_commands")
-                                                .toComponent(player))
-                                )
-                                .build()
-                ));
-                builder.append(Component.newline());
-                builder.append(TranslatableCaption.of("help.help_footer").toComponent(player));
+                builder.append(Component.newline()).append(MINI_MESSAGE
+                        .deserialize(
+                                TranslatableCaption.of("help.help_info_item").getComponent(player),
+                                TagResolver.builder()
+                                        .tag("command", Tag.inserting(Component.text("/plot help")))
+                                        .tag("category", Tag.inserting(Component.text("all")))
+                                        .tag(
+                                                "category_desc",
+                                                Tag.inserting(TranslatableCaption
+                                                        .of("help.help_display_all_commands")
+                                                        .toComponent(player))
+                                        )
+                                        .build()
+                        ));
+                builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption
+                        .of("help.help_footer")
+                        .getComponent(player)));
                 player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent())));
                 return true;
             }

Core/src/main/java/com/plotsquared/core/command/Info.java

@@ -20,6 +20,7 @@ package com.plotsquared.core.command;
 
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.Caption;
+import com.plotsquared.core.configuration.caption.StaticCaption;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
 import com.plotsquared.core.permissions.Permission;
@@ -130,9 +131,13 @@ public class Info extends SubCommand {
             info = getCaption(arg);
             if (info == null) {
                 if (Settings.Ratings.USE_LIKES) {
-                    player.sendMessage(TranslatableCaption.of("info.plot_info_categories.use_likes"));
+                    player.sendMessage(StaticCaption.of(
+                            "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                                    + "&aowner&7, " + " &alikes"));
                 } else {
-                    player.sendMessage(TranslatableCaption.of("info.plot_info_categories.use_rating"));
+                    player.sendMessage(StaticCaption.of(
+                            "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                                    + "&aowner&7, " + " &arating"));
                 }
                 return false;
             }

Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java

@@ -20,7 +20,6 @@ package com.plotsquared.core.configuration.caption;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
@@ -45,16 +44,6 @@ public interface Caption {
      */
     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
 
-    /**
-     * Get the Adventure {@link ComponentLike} for this caption while applying custom {@link TagResolver}
-     * (apart from the default {@code core.prefix})
-     * @param localeHolder Local holder
-     * @param tagResolvers custom tag resolvers to replace placeholders / parameters
-     * @return {@link ComponentLike}
-     * @since TODO
-     */
-    @NonNull Component toComponent(@NonNull LocaleHolder localeHolder, @NonNull TagResolver @NonNull... tagResolvers);
-
     @NonNull String toString();
 
 }

Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java

@@ -21,7 +21,6 @@ package com.plotsquared.core.configuration.caption;
 import com.google.common.base.Preconditions;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class StaticCaption implements Caption {
@@ -52,14 +51,6 @@ public final class StaticCaption implements Caption {
         return MiniMessage.miniMessage().deserialize(this.value);
     }
 
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
-        return MiniMessage.miniMessage().deserialize(this.value, tagResolvers);
-    }
-
     @Override
     public @NonNull String toString() {
         return "StaticCaption(" + value + ")";

Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java

@@ -27,7 +27,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
@@ -97,23 +96,13 @@ public final class TranslatableCaption implements NamespacedCaption {
 
     @Override
     public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
-        return this.toComponent(localeHolder, new TagResolver[0]);
-    }
-
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
         if (getKey().equals("core.prefix")) {
             return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
         }
-        TagResolver[] finalResolvers = Arrays.copyOf(tagResolvers, tagResolvers.length + 1);
-        finalResolvers[finalResolvers.length - 1] = TagResolver.resolver(
+        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), TagResolver.resolver(
                 "prefix",
                 Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(localeHolder))
-        );
-        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), finalResolvers);
+        ));
     }
 
     @Override

Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java

@@ -25,24 +25,30 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.util.StringMan;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.jetbrains.annotations.NotNull;
 
 public class HelpObject implements ComponentLike {
 
+    static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
+
     private final Component rendered;
 
     public HelpObject(final Command command, final String label, final PlotPlayer<?> audience) {
-        this.rendered = TranslatableCaption.of("help.help_item").toComponent(audience, TagResolver.builder()
-                .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label))))
-                .tag("alias", Tag.inserting(Component.text(
-                        command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")
-                )))
-                .tag("desc", Tag.inserting(command.getDescription().toComponent(audience)))
-                .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments()))))
-                .tag("label", Tag.inserting(Component.text(label)))
-                .build());
+        rendered = MINI_MESSAGE.deserialize(
+                TranslatableCaption.of("help.help_item").getComponent(audience),
+                TagResolver.builder()
+                        .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label))))
+                        .tag("alias", Tag.inserting(Component.text(
+                                command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")
+                        )))
+                        .tag("desc", Tag.inserting(command.getDescription().toComponent(audience)))
+                        .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments()))))
+                        .tag("label", Tag.inserting(Component.text(label)))
+                        .build()
+        );
     }
 
     private String buildArgumentList(final Argument<?>[] arguments) {

Core/src/main/resources/lang/messages_en.json

@@ -353,8 +353,6 @@
   "info.infinite": "<gray>Infinite</gray>",
   "info.plot_unowned": "<prefix><red>The current plot must have an owner to perform this action.</red>",
   "info.plot_info_unclaimed": "<prefix><gray>Plot <gold><plot></gold> is not yet claimed.</gray>",
-  "info.plot_info_categories.use_rating": "<prefix><gold>Categories: </gold> <gray>members, alias, biome, seen, denied, flags, id, size, trusted, owner, rating</gray>",
-  "info.plot_info_categories.use_likes": "<prefix><gold>Categories: </gold> <gray>members, alias, biome, seen, denied, flags, id, size, trusted, owner, likes</gray>",
   "info.plot_info_header": "<dark_gray><strikethrough>--------- <reset><gold>INFO </gold><dark_gray><strikethrough>---------</dark_gray><reset>",
   "info.plot_info_hidden": "<prefix><red>You cannot view the information about this plot.</red>",
   "info.plot_info_format": "<header>\n<gold>ID: <gray><id></gray>\nCreation: <gray><creationdate></gray>\nArea: <gray><area></gray>\nAlias: <gray><alias></gray>\nOwner: <gray><owner></gray>\nBiome: <gray><biome></gray>\nCan Build: <gray><build></gray>\nRating: <gray><rating></gray>\nSeen: <gray><seen></gray>\nTrusted: <gray><trusted></gray>\nMembers: <gray><members></gray>\nDenied: <gray><denied></gray>\nFlags: <gray><flags></gray>\nDescription: <gray><desc></gray></gold>\n<footer>",

build.gradle.kts

@@ -69,8 +69,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.13.2")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.1")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.2")
     }
 
     plugins.withId("java") {

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.9.3"
-checkerqual = "3.49.4"
+checkerqual = "3.49.3"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
@@ -15,8 +15,8 @@ log4j = "2.19.0"
 worldedit = "7.2.20"
 fawe = "2.13.0"
 placeholderapi = "2.11.6"
-luckperms = "5.5"
-essentialsx = "2.21.1"
+luckperms = "5.4"
+essentialsx = "2.21.0"
 mvdwapi = "3.1.1"
 
 # Third party
@@ -33,10 +33,10 @@ vault = "1.7.1"
 serverlib = "2.3.7"
 
 # Gradle plugins
-shadow = "8.3.7"
+shadow = "8.3.6"
 grgit = "4.1.1"
-spotless = "7.0.4"
-publish = "0.33.0"
+spotless = "7.0.3"
+publish = "0.32.0"
 runPaper = "2.3.1"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME