Yomamaeatsgoes/folia 26.1 upstream

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,6 +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:
+        - '26.1'
         - '1.21.11'
         - '1.21.10'
         - '1.21.8'

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

@@ -19,7 +19,7 @@ jobs:
       - name: Clean Build
         run: ./gradlew clean build --no-daemon
       - name: Upload Release Assets
-        uses: AButler/upload-release-assets@v3.0
+        uses: AButler/upload-release-assets@v4.0.0
         with:
           files: 'worldedit-bukkit/build/libs/FastAsyncWorldEdit-*.jar'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts

@@ -8,6 +8,8 @@ plugins {
     id("io.papermc.paperweight.userdev")
 }
 
+val requiresReobfJar = project.name.startsWith("adapter-1_")
+
 paperweight {
     injectPaperRepository = false
     reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION
@@ -18,23 +20,23 @@ repositories {
         name = "PaperMC"
         url = uri("https://repo.papermc.io/repository/maven-public/")
         content {
-            excludeModule("io.papermc.paper", "dev-bundle")
+            // excludeModule("io.papermc.paper", "dev-bundle")
         }
     }
     maven {
         name = "EngineHub Repository"
         url = uri("https://maven.enginehub.org/repo/")
         content {
-            excludeModule("io.papermc.paper", "dev-bundle")
+            // excludeModule("io.papermc.paper", "dev-bundle")
         }
     }
-    maven {
+/*    maven {
         name = "IntellectualSites"
         url = uri("https://repo.intellectualsites.dev/repository/paper-dev-bundles/")
         content {
-            includeModule("io.papermc.paper", "dev-bundle")
+            // includeModule("io.papermc.paper", "dev-bundle")
         }
-    }
+    }*/
     mavenCentral()
     afterEvaluate {
         killNonEngineHubRepositories()
@@ -52,8 +54,15 @@ dependencies {
     }
 }
 
+java {
+    // Required when we de-sync release option and declared Java versions.
+    disableAutoTargetJvm()
+}
+
 tasks.named("assemble") {
-    dependsOn("reobfJar")
+    if (requiresReobfJar) {
+        dependsOn("reobfJar")
+    }
 }
 
 tasks.named<Javadoc>("javadoc") {

build.gradle.kts

@@ -8,11 +8,11 @@ plugins {
     alias(libs.plugins.codecov)
     jacoco
     id("buildlogic.common")
-    id("com.gradleup.nmcp.aggregation") version "1.4.4"
+    id("com.gradleup.nmcp.aggregation") version "1.5.0"
     id("xyz.jpenilla.run-paper") version "3.0.2"
 }
 
-var rootVersion by extra("2.15.1")
+var rootVersion by extra("2.15.2")
 var snapshot by extra("SNAPSHOT")
 var revision: String by extra("")
 var buildNumber by extra("")
@@ -94,7 +94,7 @@ allprojects {
 }
 
 val supportedVersions: List<String> = listOf("1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.4", "1.21.5",
-        "1.21.8", "1.21.10", "1.21.11")
+        "1.21.8", "1.21.10", "1.21.11", "26.1.2")
 
 tasks {
     supportedVersions.forEach {

gradle/libs.versions.toml

@@ -13,15 +13,15 @@ worldguard-bukkit = "7.0.15"
 griefprevention = "18.0.0"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "6.0.0.1"
-towny = "0.102.0.13"
+towny = "0.103.0.0"
 plotsquared = "7.5.12"
 
 # Third party
 bstats = "3.2.1"
 sparsebitset = "1.3"
 parallelgzip = "1.0.5"
 adventure = "4.26.1"
-checkerqual = "4.0.0"
+checkerqual = "4.1.0"
 truezip = "6.8.4"
 auto-value = "1.11.1"
 jsr305 = "3.0.2"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -55,7 +55,7 @@ includeBuild("build-logic")
 
 include("worldedit-libs")
 
-listOf("1_20_2", "1_20_4", "1_20_5", "1_21", "1_21_4", "1_21_5", "1_21_6", "1_21_9", "1_21_11").forEach {
+listOf("1_20_2", "1_20_4", "1_20_5", "1_21", "1_21_4", "1_21_5", "1_21_6", "1_21_9", "1_21_11", "26.1").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 
@@ -66,4 +66,4 @@ listOf("bukkit", "core", "cli").forEach {
 include("worldedit-libs:core:ap")
 
 
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+// enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java

@@ -68,10 +68,12 @@
 import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
 import com.sk89q.worldedit.world.generation.StructureType;
+import com.sk89q.worldedit.world.generation.TreeType;
 import com.sk89q.worldedit.world.item.ItemType;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
@@ -113,6 +115,9 @@
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.levelgen.WorldOptions;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import net.minecraft.world.level.levelgen.feature.CoralTreeFeature;
+import net.minecraft.world.level.levelgen.feature.TreeFeature;
+import net.minecraft.world.level.levelgen.placement.PlacedFeature;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.Structure;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
@@ -918,6 +923,20 @@ public void initializeRegistries() {
             }
         }
 
+        // Trees
+        HolderLookup.RegistryLookup<PlacedFeature> placedFeatureRegistry = server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE);
+        placedFeatureRegistry.listElements()
+                .filter(feature -> {
+                    var underlyingFeature = feature.value().feature().value().feature();
+                    return underlyingFeature instanceof TreeFeature || underlyingFeature instanceof CoralTreeFeature;
+                })
+                .forEach(feature -> {
+                    String key = feature.key().toString();
+                    if (TreeType.REGISTRY.get(key) == null) {
+                        TreeType.REGISTRY.register(key, new TreeType(key));
+                    }
+                });
+
         // BiomeCategories
         Registry<Biome> biomeRegistry = server.registryAccess().registryOrThrow(Registries.BIOME);
         biomeRegistry.getTagNames().forEach(tagKey -> {

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java

@@ -20,6 +20,7 @@
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
@@ -53,6 +54,7 @@
 import com.sk89q.worldedit.world.entity.EntityType;
 import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
 import com.sk89q.worldedit.world.generation.StructureType;
+import com.sk89q.worldedit.world.generation.TreeType;
 import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.registry.BlockMaterial;
 import io.papermc.lib.PaperLib;
@@ -90,6 +92,7 @@
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import net.minecraft.world.level.levelgen.placement.PlacedFeature;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.Structure;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
@@ -692,6 +695,44 @@ public boolean generateStructure(StructureType type, World world, EditSession ed
         //FAWE end
     }
 
+    @Override
+    public boolean generateTree(
+            final TreeType treeType,
+            final World world,
+            final EditSession session,
+            final BlockVector3 pt
+    ) throws MaxChangedBlocksException {
+        ServerLevel serverLevel = getServerLevel(world);
+        ChunkGenerator generator = serverLevel.getMinecraftWorld().getChunkSource().getGenerator();
+
+        PlacedFeature placedFeature = serverLevel
+                .registryAccess()
+                .registryOrThrow(Registries.PLACED_FEATURE)
+                .get(ResourceLocation.tryParse(treeType.id()));
+
+        FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);
+        List<CraftBlockState> placed = TaskManager.taskManager().sync(() -> {
+            preCaptureStates(serverLevel);
+            try {
+                if (!placedFeature.place(
+                        populator,
+                        generator,
+                        serverLevel.random,
+                        new BlockPos(pt.x(), pt.y(), pt.z())
+                )) {
+                    return null;
+                }
+                List<CraftBlockState> placedBlocks = new ArrayList<>(populator.getList());
+                placedBlocks.addAll(serverLevel.capturedBlockStates.values());
+                return placedBlocks;
+            } finally {
+                postCaptureBlockStates(serverLevel);
+            }
+        });
+
+        return placeFeatureIntoSession(session, populator, placed);
+    }
+
     private boolean placeFeatureIntoSession(
             final EditSession editSession,
             final FaweBlockStateListPopulator populator,

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightPlacementStateProcessor.java

@@ -34,11 +34,7 @@ public class PaperweightPlacementStateProcessor extends PlacementStateProcessor
 
     public PaperweightPlacementStateProcessor(Extent extent, BlockTypeMask mask, Region region) {
         super(extent, mask, region);
-        World world = ExtentTraverser.getWorldFromExtent(extent);
-        if (world == null) {
-            throw new UnsupportedOperationException(
-                    "World is required for PlacementStateProcessor but none found in given extent.");
-        }
+        World world = getWorldFromExtent(extent);
         BukkitWorld bukkitWorld;
         if (world instanceof WorldWrapper wrapper) {
             bukkitWorld = (BukkitWorld) wrapper.getParent();

worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R3/PaperweightAdapter.java

@@ -68,10 +68,12 @@
 import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
 import com.sk89q.worldedit.world.generation.StructureType;
+import com.sk89q.worldedit.world.generation.TreeType;
 import com.sk89q.worldedit.world.item.ItemType;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
@@ -113,6 +115,9 @@
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.levelgen.WorldOptions;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import net.minecraft.world.level.levelgen.feature.CoralTreeFeature;
+import net.minecraft.world.level.levelgen.feature.TreeFeature;
+import net.minecraft.world.level.levelgen.placement.PlacedFeature;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.Structure;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
@@ -917,6 +922,20 @@ public void initializeRegistries() {
             }
         }
 
+        // Trees
+        HolderLookup.RegistryLookup<PlacedFeature> placedFeatureRegistry = server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE);
+        placedFeatureRegistry.listElements()
+                .filter(feature -> {
+                    var underlyingFeature = feature.value().feature().value().feature();
+                    return underlyingFeature instanceof TreeFeature || underlyingFeature instanceof CoralTreeFeature;
+                })
+                .forEach(feature -> {
+                    String key = feature.key().toString();
+                    if (TreeType.REGISTRY.get(key) == null) {
+                        TreeType.REGISTRY.register(key, new TreeType(key));
+                    }
+                });
+
         // BiomeCategories
         Registry<Biome> biomeRegistry = server.registryAccess().registryOrThrow(Registries.BIOME);
         biomeRegistry.getTagNames().forEach(tagKey -> {