Merge branch 'IntellectualSites:main' into main

build.gradle.kts

@@ -6,7 +6,7 @@ import java.time.format.DateTimeFormatter
 import xyz.jpenilla.runpaper.task.RunServer
 
 plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
     id("xyz.jpenilla.run-paper") version "2.2.3"
 }
 
@@ -34,7 +34,7 @@ logger.lifecycle("""
 *******************************************
 """)
 
-var rootVersion by extra("2.9.2")
+var rootVersion by extra("2.9.3")
 var snapshot by extra("SNAPSHOT")
 var revision: String by extra("")
 var buildNumber by extra("")

buildSrc/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
     implementation(gradleApi())
     implementation("org.ajoberstar.grgit:grgit-gradle:5.2.2")
     implementation("com.github.johnrengelman:shadow:8.1.1")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.12")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.13")
 }
 
 kotlin {

gradle/libs.versions.toml

@@ -15,7 +15,7 @@ griefprevention = "17.0.0"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "4.5._13.1"
 towny = "0.100.2.0"
-plotsquared = "7.3.6"
+plotsquared = "7.3.7"
 
 # Third party
 bstats = "3.0.2"

worldedit-bukkit/adapters/adapter-1_20_4/build.gradle.kts

@@ -12,6 +12,6 @@ repositories {
 
 dependencies {
     // url=https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/1.20.4-R0.1-SNAPSHOT
-    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.4-R0.1-20240402.103709-145")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.4-R0.1-20240407.005218-157")
     compileOnly(libs.paperlib)
 }

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ScatterBrush.java

@@ -93,7 +93,7 @@ public class ScatterBrush implements Brush {
     /**
      * @deprecated Use {@link ScatterBrush#finish(EditSession, BlockVector3Set, BlockVector3, Pattern, double)}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
+    @Deprecated(forRemoval = true, since = "2.9.2")
     public void finish(EditSession editSession, LocalBlockVectorSet placed, BlockVector3 pos, Pattern pattern, double size) {
         finish(editSession, (BlockVector3Set) placed, pos, pattern, size);
     }
@@ -101,7 +101,7 @@ public class ScatterBrush implements Brush {
     /**
      * Complete the scatter brush process.
      *
-     * @since TODO
+     * @since 2.9.2
      */
     public void finish(EditSession editSession, BlockVector3Set placed, BlockVector3 pos, Pattern pattern, double size) {
     }
@@ -118,7 +118,7 @@ public class ScatterBrush implements Brush {
     /**
      * @deprecated Use {@link ScatterBrush#apply(EditSession, BlockVector3Set, BlockVector3, Pattern, double)}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
+    @Deprecated(forRemoval = true, since = "2.9.2")
     public void apply(EditSession editSession, LocalBlockVectorSet placed, BlockVector3 pt, Pattern p, double size) throws
             MaxChangedBlocksException {
         apply(editSession, (BlockVector3Set) placed, pt, p, size);
@@ -127,7 +127,7 @@ public class ScatterBrush implements Brush {
     /**
      * Apply the scatter brush to a given position
      *
-     * @since TODO
+     * @since 2.9.2
      */
     public void apply(EditSession editSession, BlockVector3Set placed, BlockVector3 pt, Pattern p, double size) throws
             MaxChangedBlocksException {

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TransformExtent.java

@@ -15,7 +15,7 @@ import com.sk89q.worldedit.world.block.BlockStateHolder;
 /**
  * @deprecated Unused internal, will be removed in v3
  */
-@Deprecated(forRemoval = true, since = "TODO")
+@Deprecated(forRemoval = true, since = "2.9.2")
 public class TransformExtent extends BlockTransformExtent {
 
     private final MutableVector3 mutable1 = new MutableVector3();

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/Linear2DBlockPattern.java

@@ -15,7 +15,7 @@ import static java.lang.Math.floorDiv;
  * @deprecated replaced by {@link com.sk89q.worldedit.function.pattern.RandomPattern}
  * combined with {@link com.fastasyncworldedit.core.math.random.Linear2DRandom}.
  */
-@Deprecated(forRemoval = true, since = "TODO")
+@Deprecated(forRemoval = true, since = "2.9.2")
 public class Linear2DBlockPattern extends AbstractPattern {
 
     private final Pattern[] patternsArray;

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/Linear3DBlockPattern.java

@@ -15,7 +15,7 @@ import static java.lang.Math.floorDiv;
  * @deprecated replaced by {@link com.sk89q.worldedit.function.pattern.RandomPattern}
  * combined with {@link com.fastasyncworldedit.core.math.random.Linear3DRandom}.
  */
-@Deprecated(forRemoval = true, since = "TODO")
+@Deprecated(forRemoval = true, since = "2.9.2")
 public class Linear3DBlockPattern extends AbstractPattern {
 
     private final Pattern[] patternsArray;

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/random/Linear2DRandom.java

@@ -6,7 +6,7 @@ import static java.lang.Math.floorDiv;
 /**
  * A {@link SimpleRandom} that deterministically maps coordinates
  * to values.
- * @since TODO
+ * @since 2.9.2
  */
 public class Linear2DRandom implements SimpleRandom {
     private final int xScale;

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/random/Linear3DRandom.java

@@ -5,7 +5,7 @@ import static java.lang.Math.floorDiv;
 /**
  * A {@link SimpleRandom} that deterministically maps coordinates
  * to values.
- * @since TODO
+ * @since 2.9.2
  */
 public class Linear3DRandom implements SimpleRandom {
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/util/collection/BlockVector3Set.java

@@ -59,7 +59,7 @@ public interface BlockVector3Set extends Set<BlockVector3> {
      *
      * @param x x offset
      * @param z z offset
-     * @since TODO
+     * @since 2.9.2
      */
     void setOffset(int x, int z);
 
@@ -70,7 +70,7 @@ public interface BlockVector3Set extends Set<BlockVector3> {
      * @param x x offset
      * @param y y offset
      * @param z z offset
-     * @since TODO
+     * @since 2.9.2
      */
     void setOffset(int x, int y, int z);
 
@@ -81,7 +81,7 @@ public interface BlockVector3Set extends Set<BlockVector3> {
      * @param y      y radius center
      * @param z      z radius center
      * @return if radius is contained by the set
-     * @since TODO
+     * @since 2.9.2
      */
     boolean containsRadius(int x, int y, int z, int radius);
 

worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/Pattern.java

@@ -79,7 +79,7 @@ public interface Pattern extends Filter {
      * Get the likely maximum size of the volume this pattern will affect
      *
      * @return Pattern size
-     * @since TODO
+     * @since 2.9.2
      */
     default BlockVector3 size() {
         return BlockVector3.ONE;

worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/RegionSelectorType.java

@@ -65,7 +65,7 @@ public enum RegionSelectorType {
      * Get a {@link RegionSelectorType} for the given {@link RegionSelector}
      *
      * @param selector Region selector to get type enum for
-     * @since TODO
+     * @since 2.9.2
      */
     @Nullable
     public static RegionSelectorType getForSelector(RegionSelector selector) {