2022-01-07 23:35:32 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
|
|
Date: Thu, 6 Jan 2022 15:59:06 -0800
|
|
|
|
Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2022-06-20 17:12:05 +00:00
|
|
|
index e977a523759f360854fa0a3ab8bbb956f0c0fdc2..a0f9842bce847d8ff9dfc68801804365ac12e265 100644
|
2022-01-07 23:35:32 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2022-06-09 08:51:45 +00:00
|
|
|
@@ -559,7 +559,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2022-01-07 23:35:32 +00:00
|
|
|
}
|
2022-06-08 12:33:46 +00:00
|
|
|
// Paper end
|
2022-01-07 23:35:32 +00:00
|
|
|
|
2022-06-08 12:33:46 +00:00
|
|
|
- org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.typeHolder().value());
|
2022-06-08 14:46:39 +00:00
|
|
|
+ org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.typeHolder().value(), worlddimension.generator(), this.registryAccess()); // Paper
|
2022-01-07 23:35:32 +00:00
|
|
|
if (biomeProvider == null && gen != null) {
|
|
|
|
biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-06-20 17:12:05 +00:00
|
|
|
index 9add1f02d75925e3d6a0767f0d65b2c0ef8ad697..d66f8e409ece3b06fe14ab3eca8b74991bcfe2db 100644
|
2022-01-07 23:35:32 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-06-20 17:12:05 +00:00
|
|
|
@@ -1208,7 +1208,7 @@ public final class CraftServer implements Server {
|
2022-06-08 12:33:46 +00:00
|
|
|
Registry<LevelStem> iregistry = worlddata.worldGenSettings().dimensions();
|
|
|
|
LevelStem worlddimension = (LevelStem) iregistry.get(actualDimension);
|
2022-01-07 23:35:32 +00:00
|
|
|
|
2022-06-08 12:33:46 +00:00
|
|
|
- WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.typeHolder().value());
|
2022-06-08 14:46:39 +00:00
|
|
|
+ WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.typeHolder().value(), worlddimension.generator(), this.getHandle().getServer().registryAccess()); // Paper
|
2022-01-07 23:35:32 +00:00
|
|
|
if (biomeProvider == null && generator != null) {
|
|
|
|
biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-06-20 17:12:05 +00:00
|
|
|
index 73ad41f2a6f43a05fdb4c8a7787d8e5fae9694ed..377e80a80e60173a709d805ed94bb3af91930453 100644
|
2022-01-07 23:35:32 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-06-08 13:57:04 +00:00
|
|
|
@@ -195,6 +195,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-06-05 20:51:44 +00:00
|
|
|
public int getPlayerCount() {
|
|
|
|
return world.players().size();
|
2022-01-07 23:35:32 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public BiomeProvider vanillaBiomeProvider() {
|
2022-06-08 13:57:04 +00:00
|
|
|
+ net.minecraft.server.level.ServerChunkCache serverCache = this.getHandle().chunkSource;
|
|
|
|
+
|
|
|
|
+ final net.minecraft.world.level.biome.BiomeSource biomeSource = serverCache.getGenerator().getBiomeSource();
|
|
|
|
+ final net.minecraft.world.level.biome.Climate.Sampler sampler = serverCache.randomState().sampler();
|
2022-01-07 23:35:32 +00:00
|
|
|
+ final net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> biomeRegistry = this.getHandle().registryAccess().registryOrThrow(net.minecraft.core.Registry.BIOME_REGISTRY);
|
2022-06-08 13:57:04 +00:00
|
|
|
+
|
|
|
|
+ final List<Biome> possibleBiomes = biomeSource.possibleBiomes().stream()
|
2022-01-07 23:35:32 +00:00
|
|
|
+ .map(biome -> CraftBlock.biomeBaseToBiome(biomeRegistry, biome))
|
|
|
|
+ .toList();
|
|
|
|
+ return new BiomeProvider() {
|
|
|
|
+ @Override
|
|
|
|
+ public Biome getBiome(final org.bukkit.generator.WorldInfo worldInfo, final int x, final int y, final int z) {
|
2022-06-08 13:57:04 +00:00
|
|
|
+ return CraftBlock.biomeBaseToBiome(biomeRegistry, biomeSource.getNoiseBiome(x >> 2, y >> 2, z >> 2, sampler));
|
2022-01-07 23:35:32 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public List<Biome> getBiomes(final org.bukkit.generator.WorldInfo worldInfo) {
|
|
|
|
+ return possibleBiomes;
|
|
|
|
+ }
|
|
|
|
+ };
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
private static final Random rand = new Random();
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
|
2022-06-08 14:46:39 +00:00
|
|
|
index 3795dc9b12d62113146e803554283acd8d0e5db9..b9af0c68bfa877314de0d45741a54795b581d9b8 100644
|
2022-01-07 23:35:32 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
|
2022-06-08 14:46:39 +00:00
|
|
|
@@ -17,8 +17,14 @@ public class CraftWorldInfo implements WorldInfo {
|
2022-01-07 23:35:32 +00:00
|
|
|
private final long seed;
|
|
|
|
private final int minHeight;
|
|
|
|
private final int maxHeight;
|
|
|
|
+ // Paper start
|
|
|
|
+ private final net.minecraft.world.level.chunk.ChunkGenerator vanillaChunkGenerator;
|
2022-06-08 14:46:39 +00:00
|
|
|
+ private final net.minecraft.core.RegistryAccess.Frozen registryAccess;
|
2022-01-07 23:35:32 +00:00
|
|
|
|
2022-06-08 14:46:39 +00:00
|
|
|
- public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager) {
|
|
|
|
+ public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager, net.minecraft.world.level.chunk.ChunkGenerator chunkGenerator, net.minecraft.core.RegistryAccess.Frozen registryAccess) {
|
|
|
|
+ this.registryAccess = registryAccess;
|
2022-01-07 23:35:32 +00:00
|
|
|
+ this.vanillaChunkGenerator = chunkGenerator;
|
|
|
|
+ // Paper end
|
|
|
|
this.name = worldDataServer.getLevelName();
|
2022-06-08 12:33:46 +00:00
|
|
|
this.uuid = WorldUUID.getUUID(session.levelDirectory.path().toFile());
|
2022-01-07 23:35:32 +00:00
|
|
|
this.environment = environment;
|
2022-06-08 14:46:39 +00:00
|
|
|
@@ -27,15 +33,6 @@ public class CraftWorldInfo implements WorldInfo {
|
|
|
|
this.maxHeight = dimensionManager.minY() + dimensionManager.height();
|
2022-01-07 23:35:32 +00:00
|
|
|
}
|
|
|
|
|
2022-06-08 14:46:39 +00:00
|
|
|
- public CraftWorldInfo(String name, UUID uuid, World.Environment environment, long seed, int minHeight, int maxHeight) {
|
|
|
|
- this.name = name;
|
|
|
|
- this.uuid = uuid;
|
|
|
|
- this.environment = environment;
|
|
|
|
- this.seed = seed;
|
|
|
|
- this.minHeight = minHeight;
|
|
|
|
- this.maxHeight = maxHeight;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
@Override
|
|
|
|
public String getName() {
|
|
|
|
return this.name;
|
|
|
|
@@ -65,4 +62,35 @@ public class CraftWorldInfo implements WorldInfo {
|
2022-01-07 23:35:32 +00:00
|
|
|
public int getMaxHeight() {
|
|
|
|
return this.maxHeight;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public org.bukkit.generator.BiomeProvider vanillaBiomeProvider() {
|
2022-06-08 14:46:39 +00:00
|
|
|
+ final net.minecraft.world.level.levelgen.RandomState randomState;
|
|
|
|
+ if (vanillaChunkGenerator instanceof net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator noiseBasedChunkGenerator) {
|
|
|
|
+ randomState = net.minecraft.world.level.levelgen.RandomState.create(noiseBasedChunkGenerator.generatorSettings().value(),
|
|
|
|
+ registryAccess.registryOrThrow(net.minecraft.core.Registry.NOISE_REGISTRY), getSeed());
|
|
|
|
+ } else {
|
|
|
|
+ randomState = net.minecraft.world.level.levelgen.RandomState.create(net.minecraft.world.level.levelgen.NoiseGeneratorSettings.dummy(),
|
|
|
|
+ registryAccess.registryOrThrow(net.minecraft.core.Registry.NOISE_REGISTRY), getSeed());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ final net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> biomeRegistry = CraftWorldInfo.this.registryAccess.registryOrThrow(net.minecraft.core.Registry.BIOME_REGISTRY);
|
2022-01-07 23:35:32 +00:00
|
|
|
+ final java.util.List<org.bukkit.block.Biome> possibleBiomes = CraftWorldInfo.this.vanillaChunkGenerator.getBiomeSource().possibleBiomes().stream()
|
2022-06-08 14:46:39 +00:00
|
|
|
+ .map(biome -> org.bukkit.craftbukkit.block.CraftBlock.biomeBaseToBiome(biomeRegistry, biome))
|
2022-01-07 23:35:32 +00:00
|
|
|
+ .toList();
|
|
|
|
+ return new org.bukkit.generator.BiomeProvider() {
|
|
|
|
+ @Override
|
|
|
|
+ public org.bukkit.block.Biome getBiome(final WorldInfo worldInfo, final int x, final int y, final int z) {
|
2022-06-08 14:46:39 +00:00
|
|
|
+ return org.bukkit.craftbukkit.block.CraftBlock.biomeBaseToBiome(biomeRegistry,
|
|
|
|
+ CraftWorldInfo.this.vanillaChunkGenerator.getBiomeSource().getNoiseBiome(x >> 2, y >> 2, z >> 2, randomState.sampler()));
|
2022-01-07 23:35:32 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public java.util.List<org.bukkit.block.Biome> getBiomes(final org.bukkit.generator.WorldInfo worldInfo) {
|
|
|
|
+ return possibleBiomes;
|
|
|
|
+ }
|
|
|
|
+ };
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|