From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Wed, 29 Apr 2020 02:10:32 +0200 Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 02e25451737841001363f4697fd05b1e2c6240cd..d91abf93f2a06f73d3124f4fcff2491fe8d36655 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2287,6 +2287,107 @@ public final class CraftServer implements Server { return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), world); // Paper - Anti-Xray - Add parameters } + // Paper start + private static final List VANILLA_GEN_STATUSES = List.of( + net.minecraft.world.level.chunk.ChunkStatus.EMPTY, + net.minecraft.world.level.chunk.ChunkStatus.STRUCTURE_STARTS, + net.minecraft.world.level.chunk.ChunkStatus.STRUCTURE_REFERENCES, + net.minecraft.world.level.chunk.ChunkStatus.BIOMES, + net.minecraft.world.level.chunk.ChunkStatus.NOISE, + net.minecraft.world.level.chunk.ChunkStatus.SURFACE, + net.minecraft.world.level.chunk.ChunkStatus.CARVERS, + net.minecraft.world.level.chunk.ChunkStatus.LIQUID_CARVERS, + net.minecraft.world.level.chunk.ChunkStatus.FEATURES, + net.minecraft.world.level.chunk.ChunkStatus.LIGHT + ); + + @net.minecraft.MethodsReturnNonnullByDefault + private static final class PaperEmptyLevelChunk extends net.minecraft.world.level.chunk.EmptyLevelChunk { + private final net.minecraft.world.level.biome.Biome biome; + + public PaperEmptyLevelChunk(net.minecraft.world.level.Level world, net.minecraft.world.level.ChunkPos pos) { + super(world, pos); + this.biome = this.level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY).getOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS); + } + + @Override + public net.minecraft.world.level.biome.Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ) { + return this.biome; + } + + @Override + public void markPosForPostprocessing(BlockPos pos) {} + } + + @Override + @Deprecated(forRemoval = true) + public ChunkGenerator.ChunkData createVanillaChunkData(World world, int x, int z) { + // do bunch of vanilla shit + final net.minecraft.server.level.ServerLevel serverLevel = ((CraftWorld) world).getHandle(); + final Registry biomeRegistry = serverLevel.getServer().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY); + final net.minecraft.world.level.chunk.ProtoChunk protoChunk = new net.minecraft.world.level.chunk.ProtoChunk( + new net.minecraft.world.level.ChunkPos(x, z), + net.minecraft.world.level.chunk.UpgradeData.EMPTY, + serverLevel, + biomeRegistry, + null + ); + + final net.minecraft.world.level.chunk.ChunkGenerator chunkGenerator; + if (serverLevel.chunkSource.getGenerator() instanceof org.bukkit.craftbukkit.generator.CustomChunkGenerator bukkit) { + chunkGenerator = bukkit.delegate; + } else { + chunkGenerator = serverLevel.chunkSource.getGenerator(); + } + + final net.minecraft.world.level.ChunkPos chunkPos = new net.minecraft.world.level.ChunkPos(x, z); + final net.minecraft.util.thread.ProcessorMailbox mailbox = net.minecraft.util.thread.ProcessorMailbox.create( + net.minecraft.Util.backgroundExecutor(), + "CraftServer#createVanillaChunkData(worldName='" + world.getName() + "', x='" + x + "', z='" + z + "')" + ); + for (final net.minecraft.world.level.chunk.ChunkStatus chunkStatus : VANILLA_GEN_STATUSES) { + final List chunks = Lists.newArrayList(); + final int statusRange = Math.max(1, chunkStatus.getRange()); + + for (int zz = chunkPos.z - statusRange; zz <= chunkPos.z + statusRange; ++zz) { + for (int xx = chunkPos.x - statusRange; xx <= chunkPos.x + statusRange; ++xx) { + if (xx == chunkPos.x && zz == chunkPos.z) { + chunks.add(protoChunk); + } else { + final net.minecraft.world.level.chunk.ChunkAccess chunk = new PaperEmptyLevelChunk(serverLevel, new net.minecraft.world.level.ChunkPos(xx, zz)); + chunks.add(chunk); + } + } + } + + chunkStatus.generate( + mailbox::tell, + serverLevel, + chunkGenerator, + serverLevel.getStructureManager(), + serverLevel.chunkSource.getLightEngine(), + chunk -> { + throw new UnsupportedOperationException("Not creating full chunks here"); + }, + chunks, + true + ).thenAccept(either -> { + if (chunkStatus == net.minecraft.world.level.chunk.ChunkStatus.NOISE) { + either.left().ifPresent(chunk -> net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(chunk, net.minecraft.world.level.chunk.ChunkStatus.POST_FEATURES)); + } + }).join(); + } + + // get empty object + OldCraftChunkData data = (OldCraftChunkData) this.createChunkData(world); + // copy over generated sections + data.getLights().addAll(protoChunk.getLights().toList()); + data.setRawChunkData(protoChunk.getSections()); + // hooray! + return data; + } + // Paper end + @Override public BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag... flags) { return new CraftBossBar(title, color, style, flags); diff --git a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java index 6f6bf950cd15b34031618782c82824cf0b191ff8..8d8c7d84a76b11e14ee252e93349d495eec77957 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java @@ -23,7 +23,7 @@ import org.bukkit.material.MaterialData; public final class OldCraftChunkData implements ChunkGenerator.ChunkData { private final int minHeight; private final int maxHeight; - private final LevelChunkSection[] sections; + private LevelChunkSection[] sections; // Paper private final Registry biomes; private Set tiles; private final Set lights = new HashSet<>(); @@ -194,7 +194,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData { return this.tiles; } - Set getLights() { + public Set getLights() { // Paper return this.lights; } + + // Paper start + public void setRawChunkData(LevelChunkSection[] sections) { + this.sections = sections; + } + // Paper end }