Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 15:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a proper registry for biomes

Browse Source
This commit is contained in:
Matthew Miller
2019-02-16 17:27:00 +10:00
parent d6bc85ccbe
commit 1b101740fe
33 changed files with 314 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/sk89q/worldedit/function/biome/BiomeReplace.java
View File

@ -25,7 +25,7 @@ import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.FlatRegionFunction;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.biome.BiomeType;
/**
* Replaces the biome at the locations that this function is applied to.
@ -33,7 +33,7 @@ import com.sk89q.worldedit.world.biome.BaseBiome;
public class BiomeReplace implements FlatRegionFunction {
private final Extent extent;
private BaseBiome biome;
private BiomeType biome;
/**
* Create a new instance.
@ -41,7 +41,7 @@ public class BiomeReplace implements FlatRegionFunction {
* @param extent an extent
* @param biome a biome
*/
public BiomeReplace(Extent extent, BaseBiome biome) {
public BiomeReplace(Extent extent, BiomeType biome) {
checkNotNull(extent);
checkNotNull(biome);
this.extent = extent;

16
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BiomeMask2D.java
View File

@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.biome.BiomeType;
import java.util.Arrays;
import java.util.Collection;
@ -36,7 +36,7 @@ import java.util.Set;
public class BiomeMask2D extends AbstractMask2D {
private final Extent extent;
private final Set<BaseBiome> biomes = new HashSet<>();
private final Set<BiomeType> biomes = new HashSet<>();
/**
* Create a new biome mask.
@ -44,7 +44,7 @@ public class BiomeMask2D extends AbstractMask2D {
* @param extent the extent
* @param biomes a list of biomes to match
*/
public BiomeMask2D(Extent extent, Collection<BaseBiome> biomes) {
public BiomeMask2D(Extent extent, Collection<BiomeType> biomes) {
checkNotNull(extent);
checkNotNull(biomes);
this.extent = extent;
@ -57,7 +57,7 @@ public class BiomeMask2D extends AbstractMask2D {
* @param extent the extent
* @param biome an array of biomes to match
*/
public BiomeMask2D(Extent extent, BaseBiome... biome) {
public BiomeMask2D(Extent extent, BiomeType... biome) {
this(extent, Arrays.asList(checkNotNull(biome)));
}
@ -66,7 +66,7 @@ public class BiomeMask2D extends AbstractMask2D {
*
* @param biomes a list of biomes
*/
public void add(Collection<BaseBiome> biomes) {
public void add(Collection<BiomeType> biomes) {
checkNotNull(biomes);
this.biomes.addAll(biomes);
}
@ -76,7 +76,7 @@ public class BiomeMask2D extends AbstractMask2D {
*
* @param biome an array of biomes
*/
public void add(BaseBiome... biome) {
public void add(BiomeType... biome) {
add(Arrays.asList(checkNotNull(biome)));
}
@ -85,13 +85,13 @@ public class BiomeMask2D extends AbstractMask2D {
*
* @return a list of biomes
*/
public Collection<BaseBiome> getBiomes() {
public Collection<BiomeType> getBiomes() {
return biomes;
}
@Override
public boolean test(BlockVector2 vector) {
BaseBiome biome = extent.getBiome(vector);
BiomeType biome = extent.getBiome(vector);
return biomes.contains(biome);
}