Add 'world' placeholder to status messages

Signed-off-by: Alexander Brandes <mc.cache@web.de>

.github/renovate.json

@@ -2,8 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended",
-    ":semanticCommitsDisabled",
-    "schedule:earlyMondays"
+    ":semanticCommitsDisabled"
   ],
   "automerge": true,
   "labels": [

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -252,11 +252,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return Bukkit.getVersion();
     }
 
-    @Override
-    public @NonNull String serverBrand() {
-        return Bukkit.getName();
-    }
-
     @Override
     @SuppressWarnings("deprecation") // Paper deprecation
     public void onEnable() {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java

@@ -28,6 +28,7 @@ import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.util.PlotFlagUtil;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
@@ -41,11 +42,31 @@ import org.bukkit.event.block.BlockReceiveGameEvent;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 @SuppressWarnings("unused")
 public class BlockEventListener117 implements Listener {
 
+    private static final Set<Material> COPPER_OXIDIZING = Set.of(
+            Material.COPPER_BLOCK,
+            Material.EXPOSED_COPPER,
+            Material.WEATHERED_COPPER,
+            Material.OXIDIZED_COPPER,
+            Material.CUT_COPPER,
+            Material.EXPOSED_CUT_COPPER,
+            Material.WEATHERED_CUT_COPPER,
+            Material.OXIDIZED_CUT_COPPER,
+            Material.CUT_COPPER_STAIRS,
+            Material.EXPOSED_CUT_COPPER_STAIRS,
+            Material.WEATHERED_CUT_COPPER_STAIRS,
+            Material.OXIDIZED_CUT_COPPER_STAIRS,
+            Material.CUT_COPPER_SLAB,
+            Material.EXPOSED_CUT_COPPER_SLAB,
+            Material.WEATHERED_CUT_COPPER_SLAB,
+            Material.OXIDIZED_CUT_COPPER_SLAB
+    );
+
     @Inject
     public BlockEventListener117() {
     }
@@ -163,7 +184,7 @@ public class BlockEventListener117 implements Listener {
         if (plot == null) {
             return;
         }
-        if (event.getNewState().getType().name().contains("COPPER")) {
+        if (COPPER_OXIDIZING.contains(event.getNewState().getType())) {
             if (!plot.getFlag(CopperOxideFlag.class)) {
                 plot.debug("Copper could not oxide because copper-oxide = false");
                 event.setCancelled(true);

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java

@@ -29,7 +29,6 @@ import com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent;
 import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent;
 import com.google.inject.Inject;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.command.Command;
 import com.plotsquared.core.command.MainCommand;
 import com.plotsquared.core.configuration.Settings;
@@ -39,7 +38,6 @@ import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.PlotAreaType;
 import com.plotsquared.core.plot.flag.FlagContainer;
 import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
@@ -50,7 +48,6 @@ import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.PlotFlagUtil;
 import io.papermc.paper.event.entity.EntityMoveEvent;
-import io.papermc.paper.event.world.StructuresLocateEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -461,21 +458,6 @@ public class PaperListener implements Listener {
         }
     }
 
-    /**
-     * Don't let the server die when populating cartographers (villager offering maps) in classic plot worlds
-     * (as those don't generate POIs)
-     */
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    public void onStructuresLocate(StructuresLocateEvent event) {
-        if (!PlotSquared.get().getPlotAreaManager().hasPlotArea(event.getWorld().getName())) {
-            return;
-        }
-        final PlotArea area = PlotSquared.get().getPlotAreaManager().getPlotAreaByString(event.getWorld().getName());
-        if (area != null && area.getType() == PlotAreaType.NORMAL) {
-            event.setCancelled(true);
-        }
-    }
-
     private boolean getBooleanFlagValue(
             @NonNull FlagContainer container,
             @NonNull Class<? extends BooleanFlag<?>> flagClass,

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -64,11 +64,9 @@ import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag;
 import com.plotsquared.core.plot.flag.implementations.TamedInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.TileDropFlag;
 import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag;
-import com.plotsquared.core.plot.flag.implementations.UseFlag;
 import com.plotsquared.core.plot.flag.implementations.VehicleBreakFlag;
 import com.plotsquared.core.plot.flag.implementations.VehicleUseFlag;
 import com.plotsquared.core.plot.flag.implementations.VillagerInteractFlag;
-import com.plotsquared.core.plot.flag.types.BlockTypeWrapper;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
@@ -80,7 +78,6 @@ import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.block.BlockType;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import io.papermc.lib.PaperLib;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -91,8 +88,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Boat;
@@ -155,11 +154,9 @@ import org.bukkit.util.Vector;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.lang.reflect.Field;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
@@ -184,7 +181,6 @@ public class PlayerEventListener implements Listener {
             Material.WRITTEN_BOOK
     );
     private static final Set<String> DYES;
-
     static {
         Set<String> mutableDyes = new HashSet<>(Set.of(
                 "WHITE_DYE",
@@ -219,7 +215,7 @@ public class PlayerEventListener implements Listener {
         // "temporary" fix for https://hub.spigotmc.org/jira/browse/SPIGOT-7813
         // can (and should) be removed when 1.21 support is dropped
         // List of all interactable 1.21 materials
-        INTERACTABLE_MATERIALS = Material.CHEST.isInteractable() ? null : Set.of(
+        INTERACTABLE_MATERIALS = Material.CHEST.isInteractable() ? null :  Set.of(
                 "REDSTONE_ORE", "DEEPSLATE_REDSTONE_ORE", "CHISELED_BOOKSHELF", "DECORATED_POT", "CHEST", "CRAFTING_TABLE",
                 "FURNACE", "JUKEBOX", "OAK_FENCE", "SPRUCE_FENCE", "BIRCH_FENCE", "JUNGLE_FENCE", "ACACIA_FENCE", "CHERRY_FENCE",
                 "DARK_OAK_FENCE", "MANGROVE_FENCE", "BAMBOO_FENCE", "CRIMSON_FENCE", "WARPED_FENCE", "PUMPKIN",
@@ -537,14 +533,12 @@ public class PlayerEventListener implements Listener {
         // Delayed
 
         // Async
-        TaskManager.runTaskLaterAsync(
-                () -> {
-                    if (!player.hasPlayedBefore() && player.isOnline()) {
-                        player.saveData();
-                    }
-                    this.eventDispatcher.doJoinTask(pp);
-                }, TaskTime.seconds(1L)
-        );
+        TaskManager.runTaskLaterAsync(() -> {
+            if (!player.hasPlayedBefore() && player.isOnline()) {
+                player.saveData();
+            }
+            this.eventDispatcher.doJoinTask(pp);
+        }, TaskTime.seconds(1L));
 
         if (pp.hasPermission(Permission.PERMISSION_ADMIN_UPDATE_NOTIFICATION.toString()) && Settings.Enabled_Components.UPDATE_NOTIFICATIONS
                 && PremiumVerification.isPremium() && UpdateUtility.hasUpdate) {
@@ -605,14 +599,8 @@ public class PlayerEventListener implements Listener {
                     // to is identical to the plot's home location, and untrusted-visit is true
                     // i.e. untrusted-visit can override deny-teleport
                     // this is acceptable, because otherwise it wouldn't make sense to have both flags set
-                    if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot
-                            .getHomeSynchronous()
-                            .equals(BukkitUtil.adaptComplete(to)))) {
-                        // returns false if the player is not allowed to enter the plot (if they are denied, for example)
-                        // don't let the move event cancel the entry after teleport, but rather catch and cancel early (#4647)
-                        if (!plotListener.plotEntry(pp, plot)) {
-                            event.setCancelled(true);
-                        }
+                    if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot.getHomeSynchronous().equals(BukkitUtil.adaptComplete(to)))) {
+                        plotListener.plotEntry(pp, plot);
                     } else {
                         pp.sendMessage(
                                 TranslatableCaption.of("deny.no_enter"),
@@ -951,15 +939,12 @@ public class PlayerEventListener implements Listener {
         builder.tag("plot_id", Tag.inserting(Component.text(id.toString())));
         builder.tag("sender", Tag.inserting(Component.text(sender)));
         if (plotPlayer.hasPermission("plots.chat.color")) {
-            builder.tag(
-                    "msg", Tag.inserting(MiniMessage.miniMessage().deserialize(
-                            message,
-                            TagResolver.resolver(
-                                    StandardTags.color(), StandardTags.gradient(),
-                                    StandardTags.rainbow(), StandardTags.decorations()
-                            )
-                    ))
-            );
+            builder.tag("msg", Tag.inserting(MiniMessage.miniMessage().deserialize(
+                    message,
+                    TagResolver.resolver(StandardTags.color(), StandardTags.gradient(),
+                            StandardTags.rainbow(), StandardTags.decorations()
+                    )
+            )));
         } else {
             builder.tag("msg", Tag.inserting(Component.text(message)));
         }
@@ -1268,9 +1253,7 @@ public class PlayerEventListener implements Listener {
                 eventType = PlayerBlockEventType.INTERACT_BLOCK;
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
 
-                if (INTERACTABLE_MATERIALS != null
-                        ? INTERACTABLE_MATERIALS.contains(blockType.name())
-                        : blockType.isInteractable()) {
+                if (INTERACTABLE_MATERIALS != null ? INTERACTABLE_MATERIALS.contains(blockType.name()) : blockType.isInteractable()) {
                     if (!player.isSneaking()) {
                         break;
                     }
@@ -1288,7 +1271,7 @@ public class PlayerEventListener implements Listener {
                 // in the following, lb needs to have the material of the item in hand i.e. type
                 switch (type.toString()) {
                     case "REDSTONE", "STRING", "PUMPKIN_SEEDS", "MELON_SEEDS", "COCOA_BEANS", "WHEAT_SEEDS", "BEETROOT_SEEDS",
-                         "SWEET_BERRIES", "GLOW_BERRIES" -> {
+                            "SWEET_BERRIES", "GLOW_BERRIES" -> {
                         return;
                     }
                     default -> {
@@ -1313,17 +1296,6 @@ public class PlayerEventListener implements Listener {
                     //Allow all players to eat while also allowing the block place event to be fired
                     return;
                 }
-                // Process creature spawning of armor stands & end crystals here if spawned by the player in order to be able to
-                // reset the player's hand item if spawning needs to be cancelled.
-                if (type == Material.ARMOR_STAND || type == Material.END_CRYSTAL) {
-                    Plot plot = location.getOwnedPlotAbs();
-                    if (BukkitEntityUtil.checkEntity(type == Material.ARMOR_STAND ? EntityType.ARMOR_STAND : EntityType.ENDER_CRYSTAL,
-                            plot)) {
-                        event.setCancelled(true);
-                        break;
-                    }
-                }
-                // Continue with normal place event checks
                 if (type == Material.ARMOR_STAND) {
                     location = BukkitUtil.adapt(block.getRelative(event.getBlockFace()).getLocation());
                     eventType = PlayerBlockEventType.PLACE_MISC;
@@ -1398,7 +1370,22 @@ public class PlayerEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBucketEmpty(PlayerBucketEmptyEvent event) {
-        final Block block = event.getBlock();
+        BlockFace bf = event.getBlockFace();
+        // Note: a month after Bukkit 1.14.4 released, they added the API method
+        // PlayerBucketEmptyEvent#getBlock(), which returns the block the
+        // bucket contents is going to be placed at. Currently we determine this
+        // block ourselves to retain compatibility with 1.13.
+        final Block block;
+        // if the block can be waterlogged, the event might waterlog the block
+        // sometimes
+        if (event.getBlockClicked().getBlockData() instanceof Waterlogged waterlogged
+                && !waterlogged.isWaterlogged() && event.getBucket() != Material.LAVA_BUCKET) {
+            block = event.getBlockClicked();
+        } else {
+            block = event.getBlockClicked().getLocation()
+                    .add(bf.getModX(), bf.getModY(), bf.getModZ())
+                    .getBlock();
+        }
         Location location = BukkitUtil.adapt(block.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
@@ -1406,16 +1393,6 @@ public class PlayerEventListener implements Listener {
         }
         BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer());
         Plot plot = area.getPlot(location);
-        final List<BlockTypeWrapper> use =
-                Optional.ofNullable(plot).map(p -> p.getFlag(UseFlag.class)).orElse(area.isRoadFlags() ?
-                        area.getFlag(UseFlag.class) : Collections.emptyList());
-        BlockType type = BukkitAdapter.asBlockType(block.getType());
-        for (final BlockTypeWrapper blockTypeWrapper : use) {
-            if (blockTypeWrapper.accepts(BlockTypes.AIR) || blockTypeWrapper
-                    .accepts(type)) {
-                return;
-            }
-        }
         if (plot == null) {
             if (pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
                 return;
@@ -1487,16 +1464,6 @@ public class PlayerEventListener implements Listener {
         Player player = event.getPlayer();
         BukkitPlayer plotPlayer = BukkitUtil.adapt(player);
         Plot plot = area.getPlot(location);
-        final List<BlockTypeWrapper> use =
-                Optional.ofNullable(plot).map(p -> p.getFlag(UseFlag.class)).orElse(area.isRoadFlags() ?
-                        area.getFlag(UseFlag.class) : Collections.emptyList());
-        BlockType type = BukkitAdapter.asBlockType(blockClicked.getType());
-        for (final BlockTypeWrapper blockTypeWrapper : use) {
-            if (blockTypeWrapper.accepts(BlockTypes.AIR) || blockTypeWrapper
-                    .accepts(type)) {
-                return;
-            }
-        }
         if (plot == null) {
             if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
                 return;

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java

@@ -354,17 +354,13 @@ public class BukkitEntityUtil {
     }
 
     public static boolean checkEntity(Entity entity, Plot plot) {
-        return checkEntity(entity.getType(), plot);
-    }
-
-    public static boolean checkEntity(EntityType type, Plot plot) {
         if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot.getArea()
                 .getFlagContainer().getFlagMap().isEmpty()) {
             return false;
         }
 
         final com.sk89q.worldedit.world.entity.EntityType entityType =
-                BukkitAdapter.adapt(type);
+                BukkitAdapter.adapt(entity.getType());
 
         if (EntityCategories.PLAYER.contains(entityType)) {
             return false;

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -120,14 +120,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
      */
     @NonNull String serverImplementation();
 
-    /**
-     * Gets the server brand name
-     *
-     * @return server brand
-     * @since 7.5.3
-     */
-    @NonNull String serverBrand();
-
     /**
      * Gets the native server code package prefix.
      *

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/DebugPaste.java

@@ -86,8 +86,7 @@ public class DebugPaste extends SubCommand {
                 b.append("# WorldEdit implementation:\n");
                 b.append(PlotSquared.platform().worldEditImplementations()).append("\n\n");
                 b.append("# Server Information\n");
-                b.append("Server Version: ").append(PlotSquared.platform().serverBrand()).append(": ")
-                        .append(PlotSquared.platform().serverImplementation()).append("\n")
+                b.append("Server Version: ").append(PlotSquared.platform().serverImplementation())
                         .append("\n");
                 b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';')
                         .append(!Settings.UUID.OFFLINE).append('\n');

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/command/Music.java

@@ -57,7 +57,7 @@ public class Music extends SubCommand {
                     "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
                     "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
                     "music_disc_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator",
-                    "music_disc_creator_music_box", "music_disc_precipice", "music_disc_tears", "music_disc_lava_chicken"
+                    "music_disc_creator_music_box", "music_disc_precipice"
             );
 
     // make sure all discs and the bedrock ("cancel") fit into the inventory

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 7.5.4
-     */
-    @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>",

Core/src/test/java/com/plotsquared/core/configuration/caption/ClickStripTransformTest.java

@@ -37,7 +37,12 @@ class ClickStripTransformTest {
     void removeClickEvent() {
         var commonAction = ClickEvent.Action.OPEN_FILE;
         var transform = new ClickStripTransform(EnumSet.of(commonAction));
-        var component = Component.text("Hello").clickEvent(ClickEvent.openFile("World"));
+        var component = Component.text("Hello")
+                .clickEvent(ClickEvent.clickEvent(
+                                commonAction,
+                                "World"
+                        )
+                );
         var transformedComponent = transform.transform(component);
         Assertions.assertNull(transformedComponent.clickEvent());
     }
@@ -47,7 +52,10 @@ class ClickStripTransformTest {
     void ignoreClickEvent() {
         var actionToRemove = ClickEvent.Action.SUGGEST_COMMAND;
         var transform = new ClickStripTransform(EnumSet.of(actionToRemove));
-        var originalClickEvent = ClickEvent.changePage(1337);
+        var originalClickEvent = ClickEvent.clickEvent(
+                ClickEvent.Action.CHANGE_PAGE,
+                "World"
+        );
         var component = Component.text("Hello")
                 .clickEvent(originalClickEvent);
         var transformedComponent = transform.transform(component);
@@ -68,12 +76,12 @@ class ClickStripTransformTest {
                 .insertion("DEF");
         var component = Component.text("Hello ")
                 .append(
-                        inner.clickEvent(ClickEvent.openUrl("https://example.org"))
+                        inner.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://example.org"))
                 );
         var transformedComponent = transform.transform(component);
         Assertions.assertFalse(transformedComponent.children().isEmpty()); // child still exists
-        Assertions.assertEquals(inner, transformedComponent.children().getFirst()); // only the click event has changed
-        Assertions.assertNull(transformedComponent.children().getFirst().clickEvent());
+        Assertions.assertEquals(inner, transformedComponent.children().get(0)); // only the click event has changed
+        Assertions.assertNull(transformedComponent.children().get(0).clickEvent());
     }
 
 }

build.gradle.kts

@@ -1,7 +1,9 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
+import com.vanniktech.maven.publish.SonatypeHost
 import groovy.json.JsonSlurper
 import xyz.jpenilla.runpaper.task.RunServer
+import java.net.URI
 
 plugins {
     java
@@ -20,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.5-SNAPSHOT"
+version = "7.5.3-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -67,8 +69,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.13.3")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.3")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.2")
     }
 
     plugins.withId("java") {
@@ -170,7 +172,7 @@ subprojects {
                 url.set("https://github.com/IntellectualSites/PlotSquared/issues")
             }
 
-            publishToMavenCentral()
+            publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
         }
     }
 
@@ -204,14 +206,14 @@ tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
-val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5")
+val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4")
 tasks {
     register("cacheLatestFaweArtifact") {
         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
         val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>)
                 .map { it as Map<*, *> }
                 .map { it["fileName"] as String }
-                .first { it -> it.contains("Paper") }
+                .first { it -> it.contains("Bukkit") }
         project.ext["faweArtifact"] = artifact
     }
 

gradle/libs.versions.toml

@@ -3,40 +3,40 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.9.3"
-checkerqual = "3.49.5"
+checkerqual = "3.49.2"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.23.0"
-adventure-bukkit = "4.4.0"
+adventure = "4.20.0"
+adventure-bukkit = "4.3.4"
 log4j = "2.19.0"
 
 # Plugins
 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
 prtree = "2.0.1"
 aopalliance = "1.0"
 cloud-services = "1.8.4"
-arkitektonika = "2.1.4"
+arkitektonika = "2.1.3"
 squirrelid = "0.3.2"
-paster = "1.1.7"
+paster = "1.1.6"
 bstats = "3.1.0"
 paperlib = "1.0.8"
-informative-annotations = "1.6"
+informative-annotations = "1.5"
 vault = "1.7.1"
 serverlib = "2.3.7"
 
 # Gradle plugins
-shadow = "8.3.8"
+shadow = "8.3.6"
 grgit = "4.1.1"
-spotless = "7.2.0"
-publish = "0.34.0"
+spotless = "7.0.3"
+publish = "0.31.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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell