Merge branch 'main' into feat/improved-entity-operations

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,7 +27,7 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.20.1'
+        - '1.20.2'
         - '1.20'
         - '1.19.4'
         - '1.18.2'

.github/renovate.json

@@ -19,10 +19,15 @@
     "net.fabricmc:fabric-loader",
     "net.fabricmc.fabric-api:fabric-api",
     "com.github.luben:zstd-jni",
-    "net.kyori",
-    "net.kyori:adventure-nbt",
     "org.jetbrains.kotlin.jvm",
-    "log4j"
+    "log4j",
+    "org.apache.logging.log4j:log4j-api",
+    "org.apache.logging.log4j:log4j-bom",
+    "org.apache.logging.log4j:log4j-slf4j-impl",
+    "org.apache.logging.log4j:log4j-core",
+    "org.bstats:bstats-sponge",
+    "org.spongepowered:spongeapi",
+    "org.yaml:snakeyaml"
   ],
   "labels": ["Renovate"],
   "rebaseWhen": "conflicted",

.github/workflows/build-pr.yml

@@ -9,7 +9,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         language: ['java']
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
         uses: actions/setup-java@v3
         with:

.github/workflows/upload-release-assets.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java

build.gradle.kts

@@ -7,7 +7,7 @@ import xyz.jpenilla.runpaper.task.RunServer
 
 plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
-    id("xyz.jpenilla.run-paper") version "2.1.0"
+    id("xyz.jpenilla.run-paper") version "2.2.0"
 }
 
 if (!File("$rootDir/.git").exists()) {
@@ -34,7 +34,7 @@ logger.lifecycle("""
 *******************************************
 """)
 
-var rootVersion by extra("2.6.5")
+var rootVersion by extra("2.8.1")
 var snapshot by extra("SNAPSHOT")
 var revision: String by extra("")
 var buildNumber by extra("")
@@ -83,7 +83,7 @@ allprojects {
 }
 
 applyCommonConfiguration()
-val supportedVersions = listOf("1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.1")
+val supportedVersions = listOf("1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.2")
 
 tasks {
     supportedVersions.forEach {
@@ -97,7 +97,7 @@ tasks {
         }
     }
     runServer {
-        minecraftVersion("1.20.1")
+        minecraftVersion("1.20.2")
         pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
                 .toTypedArray())
 

buildSrc/src/main/kotlin/AdapterConfig.kt

@@ -15,7 +15,6 @@ fun Project.applyPaperweightAdapterConfiguration() {
 
     dependencies {
         "implementation"(project(":worldedit-bukkit"))
-        "implementation"(platform("com.intellectualsites.bom:bom-1.18.x:1.31"))
     }
 
     tasks.named("assemble") {

buildSrc/src/main/kotlin/CommonJavaConfig.kt

@@ -40,12 +40,11 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean
 
     dependencies {
         "compileOnly"("com.google.code.findbugs:jsr305:3.0.2")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.9.2")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-params:5.9.2")
-        "testImplementation"("org.mockito:mockito-core:5.1.1")
-        "testImplementation"("org.mockito:mockito-junit-jupiter:5.1.1")
-        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.9.2")
-        "implementation"(platform("com.intellectualsites.bom:bom-1.18.x:1.31"))
+        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.10.0")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-params:5.10.0")
+        "testImplementation"("org.mockito:mockito-core:5.4.0")
+        "testImplementation"("org.mockito:mockito-junit-jupiter:5.4.0")
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.10.0")
     }
 
     // Java 8 turns on doclint which we fail

gradle/libs.versions.toml

@@ -1,51 +1,66 @@
 [versions]
 # Minecraft expectations
+paper = "1.20.2-R0.1-SNAPSHOT"
 fastutil = "8.5.9"
 guava = "31.1-jre"
 log4j = "2.19.0"
+gson = "2.10"
+snakeyaml = "2.0"
 
 # Plugins
 dummypermscompat = "1.10"
-worldguard-bukkit = "7.0.8"
+worldguard-bukkit = "7.0.9"
 mapmanager = "1.8.0-SNAPSHOT"
 griefprevention = "16.18.1"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "4.5._13.1"
-towny = "0.99.2.7"
+towny = "0.99.5.20"
+plotsquared = "7.0.0"
 
 # Third party
 bstats = "3.0.2"
-sparsebitset = "1.2"
+sparsebitset = "1.3"
 parallelgzip = "1.0.5"
-adventure = "4.9.3"
+adventure = "4.14.0"
+adventure-bukkit = "4.3.1"
+checkerqual = "3.38.0"
 truezip = "6.8.4"
 auto-value = "1.10.2"
 findbugs = "3.0.2"
 rhino-runtime = "1.7.14"
 zstd-jni = "1.4.8-1" # Not latest as it can be difficult to obtain latest ZSTD libs
-antlr4 = "4.13.0"
+antlr4 = "4.13.1"
 json-simple = "1.1.1"
 jlibnoise = "1.0.0"
 jchronic = "0.2.4a"
 lz4-java = "1.8.0"
 lz4-stream = "1.0.0"
+commons-cli = "1.5.0"
+paperlib = "1.0.8"
+paster = "1.1.5"
+vault = "1.7.1"
+serverlib = "2.3.4"
 ## Internal
-adventure-text-minimessage = "4.2.0-SNAPSHOT"
 text-adapter = "3.0.6"
 text = "3.0.4"
 piston = "0.5.7"
 
 # Tests
-mockito = "5.4.0"
+mockito = "5.5.0"
 
 # Gradle plugins
 pluginyml = "0.6.0"
+minotaur = "2.8.4"
 
 [libraries]
 # Minecraft expectations
+paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
 fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
 log4jBom = { group = "org.apache.logging.log4j", name = "log4j-bom", version.ref = "log4j" }
+log4jApi = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
 guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" }
 
 # Plugins
 dummypermscompat = { group = "com.sk89q", name = "dummypermscompat", version.ref = "dummypermscompat" }
@@ -55,9 +70,12 @@ griefprevention = { group = "com.github.TechFortress", name = "GriefPrevention",
 griefdefender = { group = "com.griefdefender", name = "api", version.ref = "griefdefender" }
 residence = { group = "com.bekvon.bukkit.residence", name = "Residence", version.ref = "residence" }
 towny = { group = "com.palmergames.bukkit.towny", name = "towny", version.ref = "towny" }
+plotSquaredCore = { group = "com.intellectualsites.plotsquared", name = "plotsquared-core", version.ref = "plotsquared" }
+plotSquaredBukkit = { group = "com.intellectualsites.plotsquared", name = "plotsquared-bukkit", version.ref = "plotsquared" }
 
 # Third Party
 bstatsBase = { group = "org.bstats", name = "bstats-base", version.ref = "bstats" }
+bstatsBukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
 sparsebitset = { group = "com.zaxxer", name = "SparseBitSet", version.ref = "sparsebitset" }
 parallelgzip = { group = "org.anarres", name = "parallelgzip", version.ref = "parallelgzip" }
 adventureNbt = { group = "net.kyori", name = "adventure-nbt", version.ref = "adventure" }
@@ -74,6 +92,15 @@ jlibnoise = { group = "com.sk89q.lib", name = "jlibnoise", version.ref = "jlibno
 jchronic = { group = "com.sk89q", name = "jchronic", version.ref = "jchronic" }
 lz4Java = { group = "org.lz4", name = "lz4-java", version.ref = "lz4-java" }
 lz4JavaStream = { group = "net.jpountz", name = "lz4-java-stream", version.ref = "lz4-stream" }
+commonsCli = { group = "commons-cli", name = "commons-cli", version.ref = "commons-cli" }
+paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" }
+adventureApi = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
+adventureMiniMessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
+adventureBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-bukkit" }
+paster = { group = "com.intellectualsites.paster", name = "Paster", version.ref = "paster" }
+vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" }
+serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
+checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" }
 
 # Internal
 ## Text
@@ -95,3 +122,4 @@ log4jCore = { group = "org.apache.logging.log4j", name = "log4j-core", version.r
 
 [plugins]
 pluginyml = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }
+minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

settings.gradle.kts

@@ -2,7 +2,7 @@ rootProject.name = "FastAsyncWorldEdit"
 
 include("worldedit-libs")
 
-listOf("legacy", "1_17_1", "1_18_2", "1_19_4", "1_20").forEach {
+listOf("legacy", "1_17_1", "1_18_2", "1_19_4", "1_20", "1_20_2").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 

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

@@ -22,5 +22,5 @@ configurations.all {
 
 dependencies {
     the<PaperweightUserDependenciesExtension>().paperDevBundle("1.17.1-R0.1-20220414.034903-210")
-    compileOnly("io.papermc:paperlib")
+    compileOnly(libs.paperlib)
 }

worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightPlatformAdapter.java

@@ -12,6 +12,7 @@
 import com.fastasyncworldedit.core.util.TaskManager;
 import com.mojang.datafixers.util.Either;
 import com.sk89q.worldedit.bukkit.adapter.Refraction;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.biome.BiomeTypes;
 import com.sk89q.worldedit.world.block.BlockState;
@@ -48,6 +49,8 @@
 import net.minecraft.world.level.chunk.PalettedContainer;
 import net.minecraft.world.level.gameevent.GameEventDispatcher;
 import net.minecraft.world.level.gameevent.GameEventListener;
+import org.apache.logging.log4j.Logger;
+import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_17_R1.CraftChunk;
 import sun.misc.Unsafe;
 
@@ -61,6 +64,8 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
@@ -80,17 +85,15 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
 
     private static final MethodHandle methodGetVisibleChunk;
 
-    private static final int CHUNKSECTION_BASE;
-    private static final int CHUNKSECTION_SHIFT;
-
     private static final Field fieldLock;
-    private static final long fieldLockOffset;
 
     private static final Field fieldGameEventDispatcherSections;
     private static final MethodHandle methodremoveBlockEntityTicker;
 
     private static final Field fieldRemove;
 
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
+
     static {
         try {
             fieldBits = PalettedContainer.class.getDeclaredField(Refraction.pickName("bits", "l"));
@@ -120,15 +123,12 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
             getVisibleChunkIfPresent.setAccessible(true);
             methodGetVisibleChunk = MethodHandles.lookup().unreflect(getVisibleChunkIfPresent);
 
-            Unsafe unsafe = ReflectionUtils.getUnsafe();
             if (!PaperLib.isPaper()) {
-
                 fieldLock = PalettedContainer.class.getDeclaredField(Refraction.pickName("lock", "m"));
-                fieldLockOffset = unsafe.objectFieldOffset(fieldLock);
+                fieldLock.setAccessible(true);
             } else {
                 // in paper, the used methods are synchronized properly
                 fieldLock = null;
-                fieldLockOffset = -1;
             }
 
             fieldGameEventDispatcherSections = LevelChunk.class.getDeclaredField(Refraction.pickName(
@@ -145,13 +145,6 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
 
             fieldRemove = BlockEntity.class.getDeclaredField(Refraction.pickName("remove", "p"));
             fieldRemove.setAccessible(true);
-
-            CHUNKSECTION_BASE = unsafe.arrayBaseOffset(LevelChunkSection[].class);
-            int scale = unsafe.arrayIndexScale(LevelChunkSection[].class);
-            if ((scale & (scale - 1)) != 0) {
-                throw new Error("data type scale not a power of two");
-            }
-            CHUNKSECTION_SHIFT = 31 - Integer.numberOfLeadingZeros(scale);
         } catch (RuntimeException e) {
             throw e;
         } catch (Throwable rethrow) {
@@ -166,9 +159,8 @@ static boolean setSectionAtomic(
             LevelChunkSection value,
             int layer
     ) {
-        long offset = ((long) layer << CHUNKSECTION_SHIFT) + CHUNKSECTION_BASE;
         if (layer >= 0 && layer < sections.length) {
-            return ReflectionUtils.getUnsafe().compareAndSwapObject(sections, offset, expected, value);
+            return ReflectionUtils.compareAndSet(sections, expected, value, layer);
         }
         return false;
     }
@@ -183,14 +175,13 @@ static DelegateSemaphore applyLock(LevelChunkSection section) {
         }
         try {
             synchronized (section) {
-                Unsafe unsafe = ReflectionUtils.getUnsafe();
                 PalettedContainer<net.minecraft.world.level.block.state.BlockState> blocks = section.getStates();
-                Semaphore currentLock = (Semaphore) unsafe.getObject(blocks, fieldLockOffset);
+                Semaphore currentLock = (Semaphore) fieldLock.get(blocks);
                 if (currentLock instanceof DelegateSemaphore delegateSemaphore) {
                     return delegateSemaphore;
                 }
                 DelegateSemaphore newLock = new DelegateSemaphore(1, currentLock);
-                unsafe.putObject(blocks, fieldLockOffset, newLock);
+                fieldLock.set(blocks, newLock);
                 return newLock;
             }
         } catch (Throwable e) {
@@ -225,7 +216,21 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
             }
             CompletableFuture<org.bukkit.Chunk> future = serverLevel.getWorld().getChunkAtAsync(chunkX, chunkZ, true, true);
             try {
-                CraftChunk chunk = (CraftChunk) future.get();
+                CraftChunk chunk;
+                try {
+                    chunk = (CraftChunk) future.get(10, TimeUnit.SECONDS);
+                } catch (TimeoutException e) {
+                    String world = serverLevel.getWorld().getName();
+                    // We've already taken 10 seconds we can afford to wait a little here.
+                    boolean loaded = TaskManager.taskManager().sync(() -> Bukkit.getWorld(world) != null);
+                    if (loaded) {
+                        LOGGER.warn("Chunk {},{} failed to load in 10 seconds in world {}. Retrying...", chunkX, chunkZ, world);
+                        // Retry chunk load
+                        chunk = (CraftChunk) serverLevel.getWorld().getChunkAtAsync(chunkX, chunkZ, true, true).get();
+                    } else {
+                        throw new UnsupportedOperationException("Cannot load chunk from unloaded world " + world + "!");
+                    }
+                }
                 return chunk.getHandle();
             } catch (Throwable e) {
                 e.printStackTrace();