From a45887c9b4308ef5a5bd866aaa24d6aa713491f6 Mon Sep 17 00:00:00 2001
From: Phillip Glanz <p.glanz@madfix.me>
Date: Sun, 2 Apr 2023 20:43:36 +0200
Subject: [PATCH] Add special adapter load for folia

---
 settings.gradle.kts                                         | 4 +++-
 worldedit-bukkit/build.gradle.kts                           | 4 ++++
 .../sk89q/worldedit/bukkit/adapter/BukkitImplLoader.java    | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index d8b8012cf..e11d39a3c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,9 @@ include("worldedit-libs")
 listOf("1_17_1", "1_18_2", "1_19_4", "1_20", "1_20_2").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")
diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts
index dfcae5783..daf66f42b 100644
--- a/worldedit-bukkit/build.gradle.kts
+++ b/worldedit-bukkit/build.gradle.kts
@@ -69,6 +69,9 @@ dependencies {
     project.project(":worldedit-bukkit:adapters").subprojects.forEach {
         "adapters"(project(it.path))
     }
+    project.project(":worldedit-bukkit:folia-adapters").subprojects.forEach {
+        "adapters"(project(it.path))
+    }
 
     // Minecraft expectations
     implementation(libs.fastutil)
@@ -142,6 +145,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 ->
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplLoader.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplLoader.java
index 5cf783350..793cdf233 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplLoader.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplLoader.java
@@ -20,6 +20,7 @@
 package com.sk89q.worldedit.bukkit.adapter;
 
 import com.fastasyncworldedit.bukkit.util.MinecraftVersion;
+import com.fastasyncworldedit.core.util.FoliaSupport;
 import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import com.sk89q.worldedit.util.io.Closer;
 import org.apache.logging.log4j.Logger;
@@ -44,7 +45,7 @@ public class BukkitImplLoader {
     private int zeroth = 0;
     private String customCandidate;
 
-    private static final String SEARCH_PACKAGE = "com.sk89q.worldedit.bukkit.adapter.impl.fawe";
+    private static String SEARCH_PACKAGE = "com.sk89q.worldedit.bukkit.adapter.impl.fawe";
     private static final String SEARCH_PACKAGE_DOT = SEARCH_PACKAGE + ".";
     private static final String SEARCH_PATH = SEARCH_PACKAGE.replace(".", "/");
     private static final String CLASS_SUFFIX = ".class";
@@ -65,6 +66,9 @@ public class BukkitImplLoader {
      * Create a new instance.
      */
     public BukkitImplLoader() {
+        if (FoliaSupport.isFolia()) {
+            SEARCH_PACKAGE = "com.sk89q.worldedit.folia.adapter.impl.fawe";
+        }
         addDefaults();
     }