Updated Upstream (Bukkit/CraftBukkit) (#10242)

* Updated Upstream (Bukkit/CraftBukkit)

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:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent

CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent

1 files changed, 137 insertions, 0 deletions

diff --git a/patches/server/0688-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0688-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
new file mode 100644
index 0000000000..2d40d8b668
--- /dev/null
+++ b/patches/server/0688-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -0,0 +1,137 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <[email protected]>
+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
+index 7ee46b9f98794d1fec0a8feea71fd495f9199dd0..d19f2ca702ffa32c616ec821219079e2b784a460 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -597,7 +597,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver));
+             LevelStem worlddimension = (LevelStem) dimensions.get(dimensionKey);
+ 
+-            org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.type().value());
++            org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.type().value(), worlddimension.generator(), this.registryAccess()); // Paper - Expose vanilla BiomeProvider from WorldInfo
+             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
+index c366992f3e48f9a3a69ba48491d678ba73e81d61..b3e1f987d31ef5a8f90bc366e248de86e93b9634 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1272,7 +1272,7 @@ public final class CraftServer implements Server {
+         List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
+         LevelStem worlddimension = iregistry.get(actualDimension);
+ 
+-        WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.type().value());
++        WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.type().value(), worlddimension.generator(), this.getHandle().getServer().registryAccess()); // Paper - Expose vanilla BiomeProvider from WorldInfo
+         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
+index df74b47477553bdee0b5faaf40835b94c41316dd..c787fbcef295f2108a6f843524c00cdea4660f27 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -211,6 +211,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+     public int getPlayerCount() {
+         return world.players().size();
+     }
++
++    @Override
++    public BiomeProvider vanillaBiomeProvider() {
++        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();
++
++        final List<Biome> possibleBiomes = biomeSource.possibleBiomes().stream()
++            .map(biome -> org.bukkit.craftbukkit.block.CraftBiome.minecraftHolderToBukkit(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 org.bukkit.craftbukkit.block.CraftBiome.minecraftHolderToBukkit(biomeSource.getNoiseBiome(x >> 2, y >> 2, z >> 2, sampler));
++            }
++
++            @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
+index 5d655d6cd3e23e0287069f8bdf77601487e862fd..cf57c6e9ce63f7b1d95d91ead2453409a31a5c52 100644
+--- a/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
++++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
+@@ -17,8 +17,14 @@ 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.RegistryAccess.Frozen registryAccess;
+ 
+-    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;
++        this.vanillaChunkGenerator = chunkGenerator;
++        // Paper end
+         this.name = worldDataServer.getLevelName();
+         this.uuid = WorldUUID.getUUID(session.levelDirectory.path().toFile());
+         this.environment = environment;
+@@ -27,15 +33,6 @@ public class CraftWorldInfo implements WorldInfo {
+         this.maxHeight = dimensionManager.minY() + dimensionManager.height();
+     }
+ 
+-    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,34 @@ public class CraftWorldInfo implements WorldInfo {
+     public int getMaxHeight() {
+         return this.maxHeight;
+     }
++
++    // Paper start
++    @Override
++    public org.bukkit.generator.BiomeProvider vanillaBiomeProvider() {
++        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.lookupOrThrow(net.minecraft.core.registries.Registries.NOISE), getSeed());
++        } else {
++            randomState = net.minecraft.world.level.levelgen.RandomState.create(net.minecraft.world.level.levelgen.NoiseGeneratorSettings.dummy(),
++                registryAccess.lookupOrThrow(net.minecraft.core.registries.Registries.NOISE), getSeed());
++        }
++
++        final java.util.List<org.bukkit.block.Biome> possibleBiomes = CraftWorldInfo.this.vanillaChunkGenerator.getBiomeSource().possibleBiomes().stream()
++            .map(biome -> org.bukkit.craftbukkit.block.CraftBiome.minecraftHolderToBukkit(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.CraftBiome.minecraftHolderToBukkit(
++                    CraftWorldInfo.this.vanillaChunkGenerator.getBiomeSource().getNoiseBiome(x >> 2, y >> 2, z >> 2, randomState.sampler()));
++            }
++
++            @Override
++            public java.util.List<org.bukkit.block.Biome> getBiomes(final org.bukkit.generator.WorldInfo worldInfo) {
++                return possibleBiomes;
++            }
++        };
++    }
++    // Paper end
+ }