2022-01-08 00:35:32 +01: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-08 14:33:46 +02:00
|
|
|
index 6279b843ad04769b202b74913e328c86f256ee13..718b477b2f53a3b2decb4c045ece12ab75aee23d 100644
|
2022-01-08 00:35:32 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2022-06-08 14:33:46 +02:00
|
|
|
@@ -558,7 +558,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2022-01-08 00:35:32 +01:00
|
|
|
}
|
2022-06-08 14:33:46 +02:00
|
|
|
// Paper end
|
2022-01-08 00:35:32 +01:00
|
|
|
|
2022-06-08 14:33:46 +02:00
|
|
|
- org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.typeHolder().value());
|
|
|
|
+ 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().registryOrThrow(net.minecraft.core.Registry.BIOME_REGISTRY)); // Paper
|
2022-01-08 00:35:32 +01: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-08 14:33:46 +02:00
|
|
|
index 5bfd4457f551e5e71e0f74a0d52568e165404e22..f8b7cd7026fcd73c8cf0245d9f7ba58a453fb733 100644
|
2022-01-08 00:35:32 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-06-08 14:33:46 +02:00
|
|
|
@@ -1202,7 +1202,7 @@ public final class CraftServer implements Server {
|
|
|
|
Registry<LevelStem> iregistry = worlddata.worldGenSettings().dimensions();
|
|
|
|
LevelStem worlddimension = (LevelStem) iregistry.get(actualDimension);
|
2022-01-08 00:35:32 +01:00
|
|
|
|
2022-06-08 14:33:46 +02:00
|
|
|
- WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.typeHolder().value());
|
|
|
|
+ WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.typeHolder().value(), worlddimension.generator(), this.getHandle().getServer().registryAccess().registryOrThrow(net.minecraft.core.Registry.BIOME_REGISTRY)); // Paper
|
2022-01-08 00:35:32 +01: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-08 14:33:46 +02:00
|
|
|
index 24d2a9b4a1c602b8ac5960ed9668ab70f34d6620..63e4b8e4e44d6885b537ca3dd052dd806411f618 100644
|
2022-01-08 00:35:32 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-06-05 22:51:44 +02:00
|
|
|
@@ -195,6 +195,31 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
|
|
|
public int getPlayerCount() {
|
|
|
|
return world.players().size();
|
2022-01-08 00:35:32 +01:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public BiomeProvider vanillaBiomeProvider() {
|
|
|
|
+ final net.minecraft.world.level.chunk.ChunkGenerator chunkGenerator;
|
|
|
|
+ if (this.getHandle().chunkSource.getGenerator() instanceof org.bukkit.craftbukkit.generator.CustomChunkGenerator bukkit) {
|
|
|
|
+ chunkGenerator = bukkit.delegate;
|
|
|
|
+ } else {
|
|
|
|
+ chunkGenerator = this.getHandle().chunkSource.getGenerator();
|
|
|
|
+ }
|
|
|
|
+ final net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> biomeRegistry = this.getHandle().registryAccess().registryOrThrow(net.minecraft.core.Registry.BIOME_REGISTRY);
|
|
|
|
+ final List<Biome> possibleBiomes = chunkGenerator.getBiomeSource().possibleBiomes().stream()
|
|
|
|
+ .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) {
|
|
|
|
+ return CraftBlock.biomeBaseToBiome(biomeRegistry, chunkGenerator.getNoiseBiome(x >> 2, y >> 2, z >> 2));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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:33:46 +02:00
|
|
|
index 3795dc9b12d62113146e803554283acd8d0e5db9..704bd0ca45eccce5fa1e6f72690398e428b0af44 100644
|
2022-01-08 00:35:32 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
|
|
|
|
@@ -17,8 +17,17 @@ public class CraftWorldInfo implements WorldInfo {
|
|
|
|
private final long seed;
|
|
|
|
private final int minHeight;
|
|
|
|
private final int maxHeight;
|
|
|
|
+ // Paper start
|
|
|
|
+ private final net.minecraft.world.level.chunk.ChunkGenerator vanillaChunkGenerator;
|
|
|
|
+ private final net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> biomeRegistry;
|
|
|
|
|
|
|
|
public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager) {
|
|
|
|
+ this(worldDataServer, session, environment, dimensionManager, null, null);
|
|
|
|
+ }
|
|
|
|
+ public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager, net.minecraft.world.level.chunk.ChunkGenerator chunkGenerator, net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> biomeRegistry) {
|
|
|
|
+ this.biomeRegistry = biomeRegistry;
|
|
|
|
+ this.vanillaChunkGenerator = chunkGenerator;
|
|
|
|
+ // Paper end
|
|
|
|
this.name = worldDataServer.getLevelName();
|
2022-06-08 14:33:46 +02:00
|
|
|
this.uuid = WorldUUID.getUUID(session.levelDirectory.path().toFile());
|
2022-01-08 00:35:32 +01:00
|
|
|
this.environment = environment;
|
|
|
|
@@ -28,6 +37,10 @@ public class CraftWorldInfo implements WorldInfo {
|
|
|
|
}
|
|
|
|
|
|
|
|
public CraftWorldInfo(String name, UUID uuid, World.Environment environment, long seed, int minHeight, int maxHeight) {
|
|
|
|
+ // Paper start
|
|
|
|
+ this.vanillaChunkGenerator = null;
|
|
|
|
+ this.biomeRegistry = null;
|
|
|
|
+ // Paper end
|
|
|
|
this.name = name;
|
|
|
|
this.uuid = uuid;
|
|
|
|
this.environment = environment;
|
|
|
|
@@ -65,4 +78,24 @@ public class CraftWorldInfo implements WorldInfo {
|
|
|
|
public int getMaxHeight() {
|
|
|
|
return this.maxHeight;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public org.bukkit.generator.BiomeProvider vanillaBiomeProvider() {
|
|
|
|
+ final java.util.List<org.bukkit.block.Biome> possibleBiomes = CraftWorldInfo.this.vanillaChunkGenerator.getBiomeSource().possibleBiomes().stream()
|
|
|
|
+ .map(biome -> org.bukkit.craftbukkit.block.CraftBlock.biomeBaseToBiome(CraftWorldInfo.this.biomeRegistry, biome))
|
|
|
|
+ .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) {
|
|
|
|
+ return org.bukkit.craftbukkit.block.CraftBlock.biomeBaseToBiome(CraftWorldInfo.this.biomeRegistry, CraftWorldInfo.this.vanillaChunkGenerator.getNoiseBiome(x >> 2, y >> 2, z >> 2));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public java.util.List<org.bukkit.block.Biome> getBiomes(final org.bukkit.generator.WorldInfo worldInfo) {
|
|
|
|
+ return possibleBiomes;
|
|
|
|
+ }
|
|
|
|
+ };
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|