chore: cherry-pick appropriate changes from upstream

.gitignore

@@ -16,6 +16,7 @@ target
 forge-download
 out
 run
+.jqwik-database
 
 /dependency-reduced-pom.xml
 *-private.sh

buildSrc/src/main/kotlin/CommonJavaConfig.kt

@@ -36,13 +36,16 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean
     }
 
     tasks.withType<Test>().configureEach {
-        useJUnitPlatform()
+        useJUnitPlatform {
+            includeEngines("junit-jupiter", "jqwik")
+        }
     }
 
     dependencies {
         "compileOnly"("com.google.code.findbugs:jsr305:3.0.2")
         "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.11.1")
         "testImplementation"("org.junit.jupiter:junit-jupiter-params:5.11.1")
+        "testImplementation"("net.jqwik:jqwik:1.9.0")
         "testImplementation"("org.mockito:mockito-core:5.14.0")
         "testImplementation"("org.mockito:mockito-junit-jupiter:5.14.0")
         "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.11.1")

buildSrc/src/main/kotlin/PlatformConfig.kt

@@ -151,7 +151,7 @@ fun Project.applyShadowConfiguration() {
 
 val CLASSPATH = listOf("truezip", "truevfs", "js")
     .map { "$it.jar" }
-    .flatMap { listOf(it, "FastAsyncWorldEdit/$it") }
+    .flatMap { listOf(it, "FastAsyncWorldEdit/$it", "../$it", "../FastAsyncWorldEdit/$it") }
     .joinToString(separator = " ")
 
 sealed class WorldEditKind(

worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightServerLevelDelegateProxy.java

@@ -103,8 +103,7 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
         if (tileEntity == null) {
             return null;
         }
-        BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos));
-        newEntity.loadWithComponents(
+        tileEntity.loadWithComponents(
                 (CompoundTag) adapter.fromNativeLin(this.editSession.getFullBlock(
                         blockPos.getX(),
                         blockPos.getY(),
@@ -113,7 +112,7 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
                 this.serverLevel.registryAccess()
         );
 
-        return newEntity;
+        return tileEntity;
     }
 
     private BlockState getBlockState(BlockPos blockPos) {

worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_R1/PaperweightServerLevelDelegateProxy.java

@@ -103,8 +103,7 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
         if (tileEntity == null) {
             return null;
         }
-        BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos));
-        newEntity.loadWithComponents(
+        tileEntity.loadWithComponents(
                 (CompoundTag) adapter.fromNativeLin(this.editSession.getFullBlock(
                         blockPos.getX(),
                         blockPos.getY(),
@@ -113,7 +112,7 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
                 this.serverLevel.registryAccess()
         );
 
-        return newEntity;
+        return tileEntity;
     }
 
     private BlockState getBlockState(BlockPos blockPos) {

worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_4/PaperweightServerLevelDelegateProxy.java

@@ -103,8 +103,7 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
         if (tileEntity == null) {
             return null;
         }
-        BlockEntity newEntity = tileEntity.getType().create(blockPos, getBlockState(blockPos));
-        newEntity.loadWithComponents(
+        tileEntity.loadWithComponents(
                 (CompoundTag) adapter.fromNativeLin(this.editSession.getFullBlock(
                         blockPos.getX(),
                         blockPos.getY(),
@@ -113,7 +112,7 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
                 this.serverLevel.registryAccess()
         );
 
-        return newEntity;
+        return tileEntity;
     }
 
     private BlockState getBlockState(BlockPos blockPos) {

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/IBukkitAdapter.java

@@ -166,10 +166,8 @@ default Entity adapt(org.bukkit.entity.Entity entity) {
      */
     default Material adapt(ItemType itemType) {
         checkNotNull(itemType);
-        if (!itemType.id().startsWith("minecraft:")) {
-            throw new IllegalArgumentException("Bukkit only supports Minecraft items");
-        }
-        return Material.getMaterial(itemType.id().substring(10).toUpperCase(Locale.ROOT));
+        NamespacedKey key = checkNotNull(NamespacedKey.fromString(itemType.id()), "Item type key is invalid");
+        return Registry.MATERIAL.get(key);
     }
 
     /**
@@ -180,11 +178,8 @@ default Material adapt(ItemType itemType) {
      */
     default Material adapt(BlockType blockType) {
         checkNotNull(blockType);
-        if (!blockType.id().startsWith("minecraft:")) {
-            throw new IllegalArgumentException("Bukkit only supports Minecraft blocks");
-        }
-        String id = blockType.id().substring(10).toUpperCase(Locale.ROOT);
-        return Material.getMaterial(id);
+        NamespacedKey key = checkNotNull(NamespacedKey.fromString(blockType.id()), "Block type key is invalid");
+        return Registry.MATERIAL.get(key);
     }
 
     default org.bukkit.entity.EntityType adapt(EntityType entityType) {

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java

@@ -52,10 +52,10 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -83,6 +83,7 @@ private static IBukkitAdapter getAdapter() {
 
     static {
         TO_BLOCK_CONTEXT.setRestricted(false);
+        TO_BLOCK_CONTEXT.setTryLegacy(false);
     }
 
     /**
@@ -366,6 +367,9 @@ public static GameMode adapt(org.bukkit.GameMode gameMode) {
         //FAWE end
     }
 
+    private static final Map<Biome, BiomeType> biomeBiomeTypeCache = new ConcurrentHashMap<>();
+    private static final Map<BiomeType, Biome> biomeTypeBiomeCache = new ConcurrentHashMap<>();
+
     /**
      * Create a WorldEdit BiomeType from a Bukkit one.
      *
@@ -402,8 +406,8 @@ public static org.bukkit.entity.EntityType adapt(EntityType entityType) {
         //FAWE end
     }
 
-    private static final EnumMap<Material, BlockType> materialBlockTypeCache = new EnumMap<>(Material.class);
-    private static final EnumMap<Material, ItemType> materialItemTypeCache = new EnumMap<>(Material.class);
+    private static final Map<Material, BlockType> materialBlockTypeCache = new ConcurrentHashMap<>();
+    private static final Map<Material, ItemType> materialItemTypeCache = new ConcurrentHashMap<>();
 
     /**
      * Converts a Material to a BlockType.

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java

@@ -28,10 +28,7 @@
 import com.sk89q.worldedit.world.registry.BundledBlockRegistry;
 import com.sk89q.worldedit.world.registry.PassthroughBlockMaterial;
 import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
-
 import javax.annotation.Nullable;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -312,9 +312,10 @@ private void initializeRegistries() {
         /*
 
         // Block & Item
-        for (Material material : Material.values()) {
-            if (material.isBlock() && !material.isLegacy()) {
-                BlockType.REGISTRY.register(material.getKey().toString(), new BlockType(material.getKey().toString(), blockState -> {
+        Registry.MATERIAL.forEach(material -> {
+            String key = material.getKey().toString();
+            if (material.isBlock()) {
+                BlockType.REGISTRY.register(key, new BlockType(key, blockState -> {
                     // TODO Use something way less hacky than this.
                     ParserContext context = new ParserContext();
                     context.setPreferringWildcard(true);
@@ -331,13 +332,13 @@ private void initializeRegistries() {
                         }
                         return defaultState;
                     } catch (InputParseException e) {
-                        LOGGER.warn("Error loading block state for " + material.getKey(), e);
+                        LOGGER.warn("Error loading block state for " + key, e);
                         return blockState;
                     }
                 }));
             }
-            if (material.isItem() && !material.isLegacy()) {
-                ItemType.REGISTRY.register(material.getKey().toString(), new ItemType(material.getKey().toString()));
+            if (material.isItem()) {
+                ItemType.REGISTRY.register(key, new ItemType(key));
             }
         }
 */
@@ -359,10 +360,12 @@ private void setupTags() {
         // Tags
         try {
             for (Tag<Material> blockTag : Bukkit.getTags(Tag.REGISTRY_BLOCKS, Material.class)) {
-                BlockCategory.REGISTRY.register(blockTag.getKey().toString(), new BlockCategory(blockTag.getKey().toString()));
+                String key = blockTag.getKey().toString();
+                BlockCategory.REGISTRY.register(key, new BlockCategory(blockTag.getKey().toString()));
             }
             for (Tag<Material> itemTag : Bukkit.getTags(Tag.REGISTRY_ITEMS, Material.class)) {
-                ItemCategory.REGISTRY.register(itemTag.getKey().toString(), new ItemCategory(itemTag.getKey().toString()));
+                String key = itemTag.getKey().toString();
+                ItemCategory.REGISTRY.register(key, new ItemCategory(itemTag.getKey().toString()));
             }
         } catch (NoSuchMethodError ignored) {
             LOGGER.warn(