Skip to content

Support //regen on Folia #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
strobil wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support //regen on Folia #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e12c265
Fix //regen -b sampling biomes at block coordinates
strobil Oct 10, 2026
6c53204
Support //regen on Folia
strobil Oct 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 78 additions & 14 deletions ...11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.AsyncRegeneration;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.extension.platform.Watchdog;
Expand Down Expand Up @@ -152,6 +153,7 @@
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftChunk;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
Expand Down Expand Up @@ -180,6 +182,7 @@
import org.spigotmc.SpigotConfig;
import org.spigotmc.WatchdogThread;

import java.io.IOException;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
Expand All @@ -198,6 +201,7 @@
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ExecutionException;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -775,13 +779,40 @@ public boolean regenerate(World bukkitWorld, Region region, Extent extent, Regen
}

private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptions options) throws Exception {
try (TemporaryWorld temporaryWorld = createTemporaryWorld(bukkitWorld, options)) {
regenForWorld(region, extent, temporaryWorld.level, options);
}
}

@Override
public CompletionStage<Void> regenerateAsync(World bukkitWorld, Region region, Extent extent, RegenOptions options) {
TemporaryWorld temporaryWorld;
try {
temporaryWorld = createTemporaryWorld(bukkitWorld, options);
} catch (Exception e) {
return CompletableFuture.failedFuture(e);
}
ServerLevel freshWorld = temporaryWorld.level;
// Folia disables the vanilla chunk futures, so the temporary world is loaded through the Bukkit API.
World freshBukkitWorld = freshWorld.getWorld();
return AsyncRegeneration.run(
region,
chunk -> freshBukkitWorld.getChunkAtAsync(chunk.x(), chunk.z(), true)
.thenApply(loaded -> loaded == null ? null : ((CraftChunk) loaded).getHandle(ChunkStatus.FULL)),
chunks -> copyChunks(region, extent, freshWorld, options, chunks),
temporaryWorld
);
}

private TemporaryWorld createTemporaryWorld(World bukkitWorld, RegenOptions options) throws Exception {
Environment env = bukkitWorld.getEnvironment();
ChunkGenerator gen = bukkitWorld.getGenerator();

Path tempDir = Files.createTempDirectory("WorldEditWorldGen");
LevelStorageSource levelStorage = LevelStorageSource.createDefault(tempDir);
ResourceKey<LevelStem> worldDimKey = getWorldDimKey(env);
try (LevelStorageSource.LevelStorageAccess session = levelStorage.createAccess("worldeditregentempworld", worldDimKey)) {
LevelStorageSource.LevelStorageAccess session = levelStorage.createAccess("worldeditregentempworld", worldDimKey);
try {
ServerLevel originalWorld = ((CraftWorld) bukkitWorld).getHandle();
PrimaryLevelData levelProperties = (PrimaryLevelData) originalWorld.getServer()
.getWorldData().overworldData();
Expand Down Expand Up @@ -830,20 +861,14 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio
gen,
bukkitWorld.getBiomeProvider()
);
return new TemporaryWorld(freshWorld, session, tempDir);
} catch (Exception e) {
try {
regenForWorld(region, extent, freshWorld, options);
} finally {
freshWorld.getChunkSource().close(false);
}
} finally {
try {
@SuppressWarnings("unchecked")
Map<String, World> map = (Map<String, World>) serverWorldsField.get(Bukkit.getServer());
map.remove("worldeditregentempworld");
} catch (IllegalAccessException ignored) {
// It's fine if we couldn't remove it
new TemporaryWorld(null, session, tempDir).close();
} catch (Exception suppressed) {
e.addSuppressed(suppressed);
}
SafeFiles.tryHardToDeleteDir(tempDir);
throw e;
}
}

Expand Down Expand Up @@ -873,6 +898,11 @@ private void regenForWorld(Region region, Extent extent, ServerLevel serverWorld
}
return chunkLoadings.stream().allMatch(CompletableFuture::isDone);
});
copyChunks(region, extent, serverWorld, options, chunkLoadings);
}

private void copyChunks(Region region, Extent extent, ServerLevel serverWorld, RegenOptions options,
List<CompletableFuture<ChunkAccess>> chunkLoadings) throws WorldEditException {
Map<ChunkPos, ChunkAccess> chunks = new HashMap<>();
for (CompletableFuture<ChunkAccess> future : chunkLoadings) {
@Nullable
Expand Down Expand Up @@ -902,7 +932,7 @@ private void regenForWorld(Region region, Extent extent, ServerLevel serverWorld
}
extent.setBlock(vec, state.toBaseBlock());
if (options.shouldRegenBiomes()) {
Biome origBiome = chunk.getNoiseBiome(vec.x(), vec.y(), vec.z()).value();
Biome origBiome = chunk.getNoiseBiome(vec.x() >> 2, vec.y() >> 2, vec.z() >> 2).value();
BiomeType adaptedBiome = adapt(serverWorld, origBiome);
if (adaptedBiome != null) {
extent.setBiome(vec, adaptedBiome);
Expand Down Expand Up @@ -1309,4 +1339,38 @@ public void tick() {
}
}
}

/**
* A world that exists only to generate chunks in; closing it releases everything it uses.
*/
private final class TemporaryWorld implements AutoCloseable {
@Nullable
private final ServerLevel level;
private final LevelStorageSource.LevelStorageAccess session;
private final Path tempDir;

private TemporaryWorld(@Nullable ServerLevel level, LevelStorageSource.LevelStorageAccess session, Path tempDir) {
this.level = level;
this.session = session;
this.tempDir = tempDir;
}

@Override
public void close() throws IOException {
try (session) {
if (level != null) {
level.getChunkSource().close(false);
}
} finally {
try {
@SuppressWarnings("unchecked")
Map<String, World> map = (Map<String, World>) serverWorldsField.get(Bukkit.getServer());
map.remove("worldeditregentempworld");
} catch (IllegalAccessException ignored) {
// It's fine if we couldn't remove it
}
SafeFiles.tryHardToDeleteDir(tempDir);
}
}
}
}
92 changes: 78 additions & 14 deletions ...1.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.AsyncRegeneration;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.extension.platform.Watchdog;
Expand Down Expand Up @@ -150,6 +151,7 @@
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftChunk;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
Expand Down Expand Up @@ -178,6 +180,7 @@
import org.spigotmc.SpigotConfig;
import org.spigotmc.WatchdogThread;

import java.io.IOException;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
Expand All @@ -196,6 +199,7 @@
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ExecutionException;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -755,13 +759,40 @@ public boolean regenerate(World bukkitWorld, Region region, Extent extent, Regen
}

private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptions options) throws Exception {
try (TemporaryWorld temporaryWorld = createTemporaryWorld(bukkitWorld, options)) {
regenForWorld(region, extent, temporaryWorld.level, options);
}
}

@Override
public CompletionStage<Void> regenerateAsync(World bukkitWorld, Region region, Extent extent, RegenOptions options) {
TemporaryWorld temporaryWorld;
try {
temporaryWorld = createTemporaryWorld(bukkitWorld, options);
} catch (Exception e) {
return CompletableFuture.failedFuture(e);
}
ServerLevel freshWorld = temporaryWorld.level;
// Folia disables the vanilla chunk futures, so the temporary world is loaded through the Bukkit API.
World freshBukkitWorld = freshWorld.getWorld();
return AsyncRegeneration.run(
region,
chunk -> freshBukkitWorld.getChunkAtAsync(chunk.x(), chunk.z(), true)
.thenApply(loaded -> loaded == null ? null : ((CraftChunk) loaded).getHandle(ChunkStatus.FULL)),
chunks -> copyChunks(region, extent, freshWorld, options, chunks),
temporaryWorld
);
}

private TemporaryWorld createTemporaryWorld(World bukkitWorld, RegenOptions options) throws Exception {
Environment env = bukkitWorld.getEnvironment();
ChunkGenerator gen = bukkitWorld.getGenerator();

Path tempDir = Files.createTempDirectory("WorldEditWorldGen");
LevelStorageSource levelStorage = LevelStorageSource.createDefault(tempDir);
ResourceKey<LevelStem> worldDimKey = getWorldDimKey(env);
try (LevelStorageSource.LevelStorageAccess session = levelStorage.createAccess("worldeditregentempworld", worldDimKey)) {
LevelStorageSource.LevelStorageAccess session = levelStorage.createAccess("worldeditregentempworld", worldDimKey);
try {
ServerLevel originalWorld = ((CraftWorld) bukkitWorld).getHandle();
PrimaryLevelData levelProperties = (PrimaryLevelData) originalWorld.getServer()
.getWorldData().overworldData();
Expand Down Expand Up @@ -811,20 +842,14 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio
gen,
bukkitWorld.getBiomeProvider()
);
return new TemporaryWorld(freshWorld, session, tempDir);
} catch (Exception e) {
try {
regenForWorld(region, extent, freshWorld, options);
} finally {
freshWorld.getChunkSource().close(false);
}
} finally {
try {
@SuppressWarnings("unchecked")
Map<String, World> map = (Map<String, World>) serverWorldsField.get(Bukkit.getServer());
map.remove("worldeditregentempworld");
} catch (IllegalAccessException ignored) {
// It's fine if we couldn't remove it
new TemporaryWorld(null, session, tempDir).close();
} catch (Exception suppressed) {
e.addSuppressed(suppressed);
}
SafeFiles.tryHardToDeleteDir(tempDir);
throw e;
}
}

Expand Down Expand Up @@ -854,6 +879,11 @@ private void regenForWorld(Region region, Extent extent, ServerLevel serverWorld
}
return chunkLoadings.stream().allMatch(CompletableFuture::isDone);
});
copyChunks(region, extent, serverWorld, options, chunkLoadings);
}

private void copyChunks(Region region, Extent extent, ServerLevel serverWorld, RegenOptions options,
List<CompletableFuture<ChunkAccess>> chunkLoadings) throws WorldEditException {
Map<ChunkPos, ChunkAccess> chunks = new HashMap<>();
for (CompletableFuture<ChunkAccess> future : chunkLoadings) {
@Nullable
Expand All @@ -876,7 +906,7 @@ private void regenForWorld(Region region, Extent extent, ServerLevel serverWorld
}
extent.setBlock(vec, state.toBaseBlock());
if (options.shouldRegenBiomes()) {
Biome origBiome = chunk.getNoiseBiome(vec.x(), vec.y(), vec.z()).value();
Biome origBiome = chunk.getNoiseBiome(vec.x() >> 2, vec.y() >> 2, vec.z() >> 2).value();
BiomeType adaptedBiome = adapt(serverWorld, origBiome);
if (adaptedBiome != null) {
extent.setBiome(vec, adaptedBiome);
Expand Down Expand Up @@ -1275,4 +1305,38 @@ public void stop() {
}

}

/**
* A world that exists only to generate chunks in; closing it releases everything it uses.
*/
private final class TemporaryWorld implements AutoCloseable {
@Nullable
private final ServerLevel level;
private final LevelStorageSource.LevelStorageAccess session;
private final Path tempDir;

private TemporaryWorld(@Nullable ServerLevel level, LevelStorageSource.LevelStorageAccess session, Path tempDir) {
this.level = level;
this.session = session;
this.tempDir = tempDir;
}

@Override
public void close() throws IOException {
try (session) {
if (level != null) {
level.getChunkSource().close(false);
}
} finally {
try {
@SuppressWarnings("unchecked")
Map<String, World> map = (Map<String, World>) serverWorldsField.get(Bukkit.getServer());
map.remove("worldeditregentempworld");
} catch (IllegalAccessException ignored) {
// It's fine if we couldn't remove it
}
SafeFiles.tryHardToDeleteDir(tempDir);
}
}
}
}
Loading