chore/fix: use #getBlock method for block retrieval in PlayerBucketEmptyEvent

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

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

@@ -252,6 +252,11 @@ 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/PlayerEventListener.java

@@ -88,10 +88,8 @@ 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;
@@ -1370,22 +1368,7 @@ public class PlayerEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBucketEmpty(PlayerBucketEmptyEvent event) {
-        BlockFace bf = event.getBlockFace();
+        final Block block = event.getBlock();
-        // 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) {

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

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

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

@@ -144,6 +144,7 @@ public class Buy extends Command {
             plot.getPlotModificationManager().setSign(player.getName());
             player.sendMessage(
                     TranslatableCaption.of("working.claimed"),
+                    TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))),
                     TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
             );
             this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);

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

@@ -131,6 +131,7 @@ public class Clear extends Command {
                     player.sendMessage(
                             TranslatableCaption.of("working.clearing_done"),
                             TagResolver.builder()
+                                    .tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName())))
                                     .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
                                     .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
                                     .build()

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

@@ -86,7 +86,8 @@ 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().serverImplementation())
+                b.append("Server Version: ").append(PlotSquared.platform().serverBrand()).append(": ")
+                        .append(PlotSquared.platform().serverImplementation()).append("\n")
                         .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/Delete.java

@@ -124,6 +124,7 @@ public class Delete extends SubCommand {
                                 "amount",
                                 Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
                         ),
+                        TagResolver.resolver("world", Tag.inserting(Component.text(plotArea.getWorldName()))),
                         TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
                 );
                 eventDispatcher.callPostDelete(plot);

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -1717,6 +1717,7 @@ public class Plot {
         }
         player.sendMessage(
                 TranslatableCaption.of("working.claimed"),
+                TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))),
                 TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
         );
         if (teleport) {

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

@@ -390,11 +390,11 @@
   "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
   "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
   "working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
-  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
-  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
   "working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>",
   "working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>",
-  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>",
+  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><world>;<plot></gold><dark_aqua>.</dark_aqua>",
   "working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>",
   "working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>",
   "list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>",

gradle/libs.versions.toml

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

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # 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" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

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