mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 14:04:49 +01:00
9df2066642
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: dfe1fb48 PR-906: Add missing MinecraftExperimental annotation to Bundles 825ab30d PR-905: Add missing MapCursor.Type and update documentation e03d10e6 PR-903: Make BARRIER Waterlogged 1961ead6 PR-898: Use Java Consumer instead of Bukkit Consumer CraftBukkit Changes: f71a799f0 Make BARRIER Waterlogged 172f76a45 Upgrade specialsource-maven-plugin f0702775c SPIGOT-7486: Alternate approach to null profile names 069495671 SPIGOT-7485: Allow air entity items since required for Vanilla logic 5dfd33dc2 SPIGOT-7484: Cancelling PlayerEditBookEvent does not update client's book contents 02d490788 PR-1250: Standardize and centralize Bukkit / Minecraft registry conversion 9024a09b9 PR-1251: Use Java Consumer instead of Bukkit Consumer 6d4b25bf1 Increase diff stability
127 lines
6.7 KiB
Diff
127 lines
6.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MiniDigger <admin@benndorf.dev>
|
|
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 854980b4d52403a22847167b89b89cf3dda1793c..a68374e527a9d8f29863baf8e18fbd09d45e4185 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2363,6 +2363,88 @@ public final class CraftServer implements Server {
|
|
return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME));
|
|
}
|
|
|
|
+ // Paper start
|
|
+ private static final List<net.minecraft.world.level.chunk.ChunkStatus> 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.FEATURES,
|
|
+ net.minecraft.world.level.chunk.ChunkStatus.INITIALIZE_LIGHT,
|
|
+ net.minecraft.world.level.chunk.ChunkStatus.LIGHT
|
|
+ );
|
|
+
|
|
+ @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 net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> biomeRegistry = serverLevel.getServer().registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME);
|
|
+ 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.getDelegate();
|
|
+ } 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<Runnable> 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<net.minecraft.world.level.chunk.ChunkAccess> 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.core.Holder<net.minecraft.world.level.biome.Biome> biomeHolder = serverLevel.registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME).getHolderOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
|
|
+ final net.minecraft.world.level.chunk.ChunkAccess chunk = new net.minecraft.world.level.chunk.EmptyLevelChunk(serverLevel, new net.minecraft.world.level.ChunkPos(xx, zz), biomeHolder);
|
|
+ chunks.add(chunk);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ chunkStatus.generate(
|
|
+ mailbox::tell,
|
|
+ serverLevel,
|
|
+ chunkGenerator,
|
|
+ serverLevel.getStructureManager(),
|
|
+ serverLevel.chunkSource.getLightEngine(),
|
|
+ chunk -> {
|
|
+ throw new UnsupportedOperationException("Not creating full chunks here");
|
|
+ },
|
|
+ chunks
|
|
+ ).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.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 c23ce88cb9693291fec81a99e3a5bcb2615bb897..189a584b4b81bbc28d4c47b901b5aa6f85fb7932 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<net.minecraft.world.level.biome.Biome> biomes;
|
|
private Set<BlockPos> tiles;
|
|
private final Set<BlockPos> lights = new HashSet<>();
|
|
@@ -189,7 +189,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
|
|
return this.tiles;
|
|
}
|
|
|
|
- Set<BlockPos> getLights() {
|
|
+ public Set<BlockPos> getLights() { // Paper
|
|
return this.lights;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ public void setRawChunkData(LevelChunkSection[] sections) {
|
|
+ this.sections = sections;
|
|
+ }
|
|
+ // Paper end
|
|
}
|