OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 17:52:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-7080: Add World#locateNearestBiome

Browse source 
By: Jishuna <joshl5324@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2023-10-09 20:11:46 +11:00
parent 7c225da381
commit a2e3f213cf
2 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file

@ -27,7 +27,6 @@ import java.util.stream.Collectors;
import net.minecraft.core.BlockPosition;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderSet;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
@ -54,13 +53,12 @@ import net.minecraft.world.entity.item.EntityFallingBlock;
import net.minecraft.world.entity.item.EntityItem;
import net.minecraft.world.entity.player.EntityHuman;
import net.minecraft.world.entity.projectile.EntityArrow;
import net.minecraft.world.entity.projectile.EntityTippedArrow;
import net.minecraft.world.entity.raid.PersistentRaid;
import net.minecraft.world.flag.FeatureFlags;
import net.minecraft.world.level.ChunkCoordIntPair;
import net.minecraft.world.level.GameRules;
import net.minecraft.world.level.RayTrace;
import net.minecraft.world.level.biome.BiomeBase;
import net.minecraft.world.level.biome.Climate;
import net.minecraft.world.level.chunk.ChunkStatus;
import net.minecraft.world.level.chunk.IChunkAccess;
import net.minecraft.world.level.chunk.ProtoChunkExtension;
@ -91,6 +89,7 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.block.data.BlockData;
import org.bukkit.boss.DragonBattle;
import org.bukkit.craftbukkit.block.CraftBiome;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.block.CraftBlockState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
@ -102,7 +101,7 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.metadata.BlockMetadataStore;
import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
import org.bukkit.craftbukkit.potion.CraftPotionUtil;
import org.bukkit.craftbukkit.util.CraftBiomeSearchResult;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
@ -137,6 +136,7 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionType;
import org.bukkit.util.BiomeSearchResult;
import org.bukkit.util.BoundingBox;
import org.bukkit.util.RayTraceResult;
import org.bukkit.util.StructureSearchResult;
@ -1883,6 +1883,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value(), getHandle().registryAccess()), CraftLocation.toBukkit(found.getFirst(), this));
}
@Override
public BiomeSearchResult locateNearestBiome(Location origin, int radius, Biome... biomes) {
return locateNearestBiome(origin, radius, 32, 64, biomes);
}
@Override
public BiomeSearchResult locateNearestBiome(Location origin, int radius, int horizontalInterval, int verticalInterval, Biome... biomes) {
BlockPosition originPos = BlockPosition.containing(origin.getX(), origin.getY(), origin.getZ());
Set<Holder<BiomeBase>> holders = new HashSet<>();
for (Biome biome : biomes) {
holders.add(CraftBiome.bukkitToMinecraftHolder(biome));
}
Climate.Sampler sampler = getHandle().getChunkSource().randomState().sampler();
// The given predicate is evaluated once at the start of the search, so performance isn't a large concern.
Pair<BlockPosition, Holder<BiomeBase>> found = getHandle().getChunkSource().getGenerator().getBiomeSource().findClosestBiome3d(originPos, radius, horizontalInterval, verticalInterval, holders::contains, sampler, getHandle());
if (found == null) {
return null;
}
return new CraftBiomeSearchResult(CraftBiome.minecraftHolderToBukkit(found.getSecond()), new Location(this, found.getFirst().getX(), found.getFirst().getY(), found.getFirst().getZ()));
}
@Override
public Raid locateNearestRaid(Location location, int radius) {
Preconditions.checkArgument(location != null, "Location cannot be null");

24
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftBiomeSearchResult.java Normal file
View file

@ -0,0 +1,24 @@
package org.bukkit.craftbukkit.util;
import org.bukkit.Location;
import org.bukkit.block.Biome;
import org.bukkit.util.BiomeSearchResult;
public class CraftBiomeSearchResult implements BiomeSearchResult {
private final Biome biome;
private final Location location;
public CraftBiomeSearchResult(Biome biome, Location location) {
this.biome = biome;
this.location = location;
}
public Biome getBiome() {
return biome;
}
public Location getLocation() {
return location;
}
}