Extend the Folia Support from SirYwell

build.gradle.kts

@@ -2,11 +2,12 @@ import org.ajoberstar.grgit.Grgit
 import java.time.format.DateTimeFormatter
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
+import xyz.jpenilla.runpaper.task.RunServer
 import java.net.URI
 
 plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
-    id("xyz.jpenilla.run-paper") version "2.0.1"
+    id("xyz.jpenilla.run-paper") version "2.0.2-SNAPSHOT"
 }
 
 if (!File("$rootDir/.git").exists()) {
@@ -90,6 +91,14 @@ tasks {
                 .toTypedArray())
 
     }
+    register<RunServer>("runFolia") {
+        downloadsApiService.set(xyz.jpenilla.runtask.service.DownloadsAPIService.folia(project))
+        minecraftVersion("1.19.4")
+        group = "run paper"
+        runDirectory.set(file("run-folia"))
+        pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
+                .toTypedArray())
+    }
 }
 
 nexusPublishing {

settings.gradle.kts

@@ -5,7 +5,9 @@ include("worldedit-libs")
 listOf("legacy", "1_17_1", "1_18_2", "1_19", "1_19_3","1_19_4").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
-
+listOf("1_19_4").forEach {
+    include("worldedit-bukkit:folia-adapters:adapter-$it")
+}
 listOf("bukkit", "core", "cli").forEach {
     include("worldedit-libs:$it")
     include("worldedit-$it")
@@ -21,5 +23,14 @@ dependencyResolutionManagement {
         }
     }
 }
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = "jmp repository"
+            url = uri("https://repo.jpenilla.xyz/snapshots")
+        }
+    }
+}
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

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

@@ -95,7 +95,7 @@ public synchronized net.minecraft.world.level.block.state.BlockState setBlockSta
             net.minecraft.world.level.block.state.BlockState blockState
     ) {
         int currentTick = MinecraftServer.currentTick;
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             return levelChunk.setBlockState(blockPos, blockState,
                     this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE)
             );
@@ -266,7 +266,7 @@ public void run(Object value) {
                 }
             }
         };
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             runnableVal.run();
         } else {
             TaskManager.taskManager().sync(runnableVal);

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

@@ -203,7 +203,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
             if (nmsChunk != null) {
                 return nmsChunk;
             }
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
         } else {
@@ -216,7 +216,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
                 return nmsChunk;
             }
             // Avoid "async" methods from the main thread.
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
             CompletableFuture<org.bukkit.Chunk> future = serverLevel.getWorld().getChunkAtAsync(chunkX, chunkZ, true, true);

worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightFaweWorldNativeAccess.java

@@ -95,7 +95,7 @@ public synchronized net.minecraft.world.level.block.state.BlockState setBlockSta
             net.minecraft.world.level.block.state.BlockState blockState
     ) {
         int currentTick = MinecraftServer.currentTick;
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             return levelChunk.setBlockState(blockPos, blockState,
                     this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE)
             );
@@ -266,7 +266,7 @@ public void run(Object value) {
                 }
             }
         };
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             runnableVal.run();
         } else {
             TaskManager.taskManager().sync(runnableVal);

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

@@ -231,7 +231,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
             if (nmsChunk != null) {
                 return nmsChunk;
             }
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
         } else {
@@ -244,7 +244,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
                 return nmsChunk;
             }
             // Avoid "async" methods from the main thread.
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
             CompletableFuture<org.bukkit.Chunk> future = serverLevel.getWorld().getChunkAtAsync(chunkX, chunkZ, true, true);

worldedit-bukkit/adapters/adapter-1_19/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R1/PaperweightFaweWorldNativeAccess.java

@@ -95,7 +95,7 @@ public synchronized net.minecraft.world.level.block.state.BlockState setBlockSta
             net.minecraft.world.level.block.state.BlockState blockState
     ) {
         int currentTick = MinecraftServer.currentTick;
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             return levelChunk.setBlockState(blockPos, blockState,
                     this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE)
             );
@@ -266,7 +266,7 @@ public void run(Object value) {
                 }
             }
         };
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             runnableVal.run();
         } else {
             TaskManager.taskManager().sync(runnableVal);

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

@@ -264,7 +264,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
             if (nmsChunk != null) {
                 return nmsChunk;
             }
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
         } else {
@@ -277,7 +277,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
                 return nmsChunk;
             }
             // Avoid "async" methods from the main thread.
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
             CompletableFuture<org.bukkit.Chunk> future = serverLevel.getWorld().getChunkAtAsync(chunkX, chunkZ, true, true);

worldedit-bukkit/adapters/adapter-1_19_3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R2/PaperweightFaweWorldNativeAccess.java

@@ -96,7 +96,7 @@ public synchronized net.minecraft.world.level.block.state.BlockState setBlockSta
             net.minecraft.world.level.block.state.BlockState blockState
     ) {
         int currentTick = MinecraftServer.currentTick;
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             return levelChunk.setBlockState(blockPos, blockState,
                     this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE)
             );
@@ -267,7 +267,7 @@ public void run(Object value) {
                 }
             }
         };
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             runnableVal.run();
         } else {
             TaskManager.taskManager().sync(runnableVal);

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

@@ -265,7 +265,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
             if (nmsChunk != null) {
                 return nmsChunk;
             }
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
         } else {
@@ -278,7 +278,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
                 return nmsChunk;
             }
             // Avoid "async" methods from the main thread.
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
             CompletableFuture<org.bukkit.Chunk> future = serverLevel.getWorld().getChunkAtAsync(chunkX, chunkZ, true, true);

worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightFaweWorldNativeAccess.java

@@ -95,7 +95,7 @@ public synchronized net.minecraft.world.level.block.state.BlockState setBlockSta
             net.minecraft.world.level.block.state.BlockState blockState
     ) {
         int currentTick = MinecraftServer.currentTick;
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             return levelChunk.setBlockState(blockPos, blockState,
                     this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE)
             );
@@ -266,7 +266,7 @@ public void run(Object value) {
                 }
             }
         };
-        if (Fawe.isMainThread()) {
+        if (Fawe.isTickThread()) {
             runnableVal.run();
         } else {
             TaskManager.taskManager().sync(runnableVal);

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

@@ -261,7 +261,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
             if (nmsChunk != null) {
                 return nmsChunk;
             }
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
         } else {
@@ -274,7 +274,7 @@ public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int c
                 return nmsChunk;
             }
             // Avoid "async" methods from the main thread.
-            if (Fawe.isMainThread()) {
+            if (Fawe.isTickThread()) {
                 return serverLevel.getChunk(chunkX, chunkZ);
             }
             CompletableFuture<org.bukkit.Chunk> future = serverLevel.getWorld().getChunkAtAsync(chunkX, chunkZ, true, true);

worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/regen/PaperweightRegen.java

@@ -273,9 +273,6 @@ protected boolean initNewWorld() throws Exception {
                             WorldEditPlugin.getInstance().getBukkitImplAdapter().getInternalBiomeId(options.getBiomeType())
                     ) : null;
 
-            @Override
-            public void tick(BooleanSupplier shouldKeepTicking) { //no ticking
-            }
 
             @Override
             public Holder<Biome> getUncachedNoiseBiome(int biomeX, int biomeY, int biomeZ) {

worldedit-bukkit/build.gradle.kts

@@ -50,7 +50,15 @@ val adapters = configurations.create("adapters") {
         attribute(Obfuscation.OBFUSCATION_ATTRIBUTE, objects.named(Obfuscation.OBFUSCATED))
     }
 }
-
+val foliaAdapters = configurations.create("foliaAdapters") {
+    description = "Adapters to include in the JAR"
+    isCanBeConsumed = false
+    isCanBeResolved = true
+    shouldResolveConsistentlyWith(configurations["runtimeClasspath"])
+    attributes {
+        attribute(Obfuscation.OBFUSCATION_ATTRIBUTE, objects.named(Obfuscation.OBFUSCATED))
+    }
+}
 dependencies {
     // Modules
     api(projects.worldeditCore)
@@ -59,11 +67,19 @@ dependencies {
     project.project(":worldedit-bukkit:adapters").subprojects.forEach {
         "adapters"(project(it.path))
     }
+    project.project(":worldedit-bukkit:folia-adapters").subprojects.forEach {
+        "foliaAdapters"(project(it.path))
+    }
 
     // Minecraft expectations
     implementation(libs.fastutil)
 
     // Platform expectations
+    compileOnly("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT") {
+        exclude("junit", "junit")
+        exclude(group = "org.slf4j", module = "slf4j-api")
+        exclude(group = "net.kyori")
+    }
     compileOnly("io.papermc.paper:paper-api") {
         exclude("junit", "junit")
         exclude(group = "org.slf4j", module = "slf4j-api")
@@ -132,6 +148,7 @@ addJarManifest(WorldEditKind.Plugin, includeClasspath = true)
 
 tasks.named<ShadowJar>("shadowJar") {
     dependsOn(project.project(":worldedit-bukkit:adapters").subprojects.map { it.tasks.named("assemble") })
+    dependsOn(project.project(":worldedit-bukkit:folia-adapters").subprojects.map { it.tasks.named("assemble") })
     from(Callable {
         adapters.resolve()
                 .map { f ->
@@ -140,6 +157,14 @@ tasks.named<ShadowJar>("shadowJar") {
                     }
                 }
     })
+    from(Callable {
+        foliaAdapters.resolve()
+                .map { f ->
+                    zipTree(f).matching {
+                        exclude("META-INF/")
+                    }
+                }
+    })
     archiveFileName.set("${rootProject.name}-Bukkit-${project.version}.${archiveExtension.getOrElse("jar")}")
     dependencies {
         // In tandem with not bundling log4j, we shouldn't relocate base package here.

worldedit-bukkit/folia-adapters/adapter-1_19_4/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    java
+}
+
+applyPaperweightAdapterConfiguration()
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    paperweightDevBundle("dev.folia", "1.19.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc:paperlib")
+}