BiomeArea is now BiomeVolume and all that this implies

Author: DDoS

src/main/java/org/spongepowered/api/extra/modifier/empty/VoidWorldGeneratorModifier.java

@@ -50,7 +50,7 @@ public void modifyWorldGenerator(WorldProperties world, DataContainer settings,
             biomeSettings.getGroundCoverLayers().clear();
         }
         worldGenerator.setBaseGenerationPopulator((world1, buffer, biomes) -> {});
-        worldGenerator.setBiomeGenerator(buffer -> buffer.getBiomeWorker().fill((x, z) -> BiomeTypes.VOID));
+        worldGenerator.setBiomeGenerator(buffer -> buffer.getBiomeWorker().fill((x, y, z) -> BiomeTypes.VOID));
     }
 
     @Override

src/main/java/org/spongepowered/api/extra/modifier/skylands/SkylandsBiomeGenerator.java

@@ -24,9 +24,9 @@
  */
 package org.spongepowered.api.extra.modifier.skylands;
 
-import com.flowpowered.math.vector.Vector2i;
+import com.flowpowered.math.vector.Vector3i;
 import org.spongepowered.api.world.biome.BiomeTypes;
-import org.spongepowered.api.world.extent.MutableBiomeArea;
+import org.spongepowered.api.world.extent.MutableBiomeVolume;
 import org.spongepowered.api.world.gen.BiomeGenerator;
 
 /**
@@ -36,13 +36,15 @@ public class SkylandsBiomeGenerator implements BiomeGenerator {
 
     @Override
     @SuppressWarnings("ConstantConditions")
-    public void generateBiomes(MutableBiomeArea buffer) {
+    public void generateBiomes(MutableBiomeVolume buffer) {
         // TODO: temporary, custom biome maybe?
-        final Vector2i min = buffer.getBiomeMin();
-        final Vector2i max = buffer.getBiomeMax();
-        for (int yy = min.getY(); yy <= max.getY(); yy++) {
-            for (int xx = min.getX(); xx <= max.getX(); xx++) {
-                buffer.setBiome(xx, yy, BiomeTypes.PLAINS);
+        final Vector3i min = buffer.getBiomeMin();
+        final Vector3i max = buffer.getBiomeMax();
+        for (int zz = min.getZ(); zz <= max.getZ(); zz++) {
+            for (int yy = min.getY(); yy <= max.getY(); yy++) {
+                for (int xx = min.getX(); xx <= max.getX(); xx++) {
+                    buffer.setBiome(xx, yy, zz, BiomeTypes.PLAINS);
+                }
             }
         }
     }

src/main/java/org/spongepowered/api/extra/modifier/skylands/SkylandsGrassPopulator.java

@@ -36,7 +36,7 @@
 import org.spongepowered.api.data.type.ShrubTypes;
 import org.spongepowered.api.event.cause.Cause;
 import org.spongepowered.api.world.World;
-import org.spongepowered.api.world.extent.ImmutableBiomeArea;
+import org.spongepowered.api.world.extent.ImmutableBiomeVolume;
 import org.spongepowered.api.world.extent.MutableBlockVolume;
 import org.spongepowered.api.world.gen.GenerationPopulator;
 
@@ -93,7 +93,7 @@ public SkylandsGrassPopulator() {
 
     @Override
     @SuppressWarnings("ConstantConditions")
-    public void populate(World world, MutableBlockVolume buffer, ImmutableBiomeArea biomes) {
+    public void populate(World world, MutableBlockVolume buffer, ImmutableBiomeVolume biomes) {
         final Vector3i max = buffer.getBlockMax();
         final Vector3i min = buffer.getBlockMin();
         final int yMax = max.getY() - 2;

src/main/java/org/spongepowered/api/extra/modifier/skylands/SkylandsGroundCoverPopulator.java

@@ -31,7 +31,7 @@
 import org.spongepowered.api.block.BlockTypes;
 import org.spongepowered.api.event.cause.Cause;
 import org.spongepowered.api.world.World;
-import org.spongepowered.api.world.extent.ImmutableBiomeArea;
+import org.spongepowered.api.world.extent.ImmutableBiomeVolume;
 import org.spongepowered.api.world.extent.MutableBlockVolume;
 import org.spongepowered.api.world.gen.GenerationPopulator;
 
@@ -50,7 +50,7 @@ public class SkylandsGroundCoverPopulator implements GenerationPopulator {
     private final Cause populatorCause = Cause.source(this).build();
 
     @Override
-    public void populate(World world, MutableBlockVolume buffer, ImmutableBiomeArea biomes) {
+    public void populate(World world, MutableBlockVolume buffer, ImmutableBiomeVolume biomes) {
         final Vector3i max = buffer.getBlockMax();
         final Vector3i min = buffer.getBlockMin();
         final int yMax = max.getY();

src/main/java/org/spongepowered/api/extra/modifier/skylands/SkylandsTerrainGenerator.java

@@ -37,7 +37,7 @@
 import org.spongepowered.api.block.BlockTypes;
 import org.spongepowered.api.event.cause.Cause;
 import org.spongepowered.api.world.World;
-import org.spongepowered.api.world.extent.ImmutableBiomeArea;
+import org.spongepowered.api.world.extent.ImmutableBiomeVolume;
 import org.spongepowered.api.world.extent.MutableBlockVolume;
 import org.spongepowered.api.world.gen.GenerationPopulator;
 
@@ -107,7 +107,7 @@ public SkylandsTerrainGenerator() {
 
     @Override
     @SuppressWarnings("ConstantConditions")
-    public void populate(World world, MutableBlockVolume buffer, ImmutableBiomeArea biomes) {
+    public void populate(World world, MutableBlockVolume buffer, ImmutableBiomeVolume biomes) {
         final Vector3i min = buffer.getBlockMin();
         final Vector3i max = buffer.getBlockMax();
         if (max.getY() < SkylandsTerrainGenerator.MIN_HEIGHT || min.getY() > SkylandsTerrainGenerator.MAX_HEIGHT) {

src/main/java/org/spongepowered/api/world/Chunk.java

@@ -30,7 +30,7 @@
 import org.spongepowered.api.event.cause.Cause;
 import org.spongepowered.api.util.Direction;
 import org.spongepowered.api.world.extent.Extent;
-import org.spongepowered.api.world.extent.worker.MutableBiomeAreaWorker;
+import org.spongepowered.api.world.extent.worker.MutableBiomeVolumeWorker;
 import org.spongepowered.api.world.extent.worker.MutableBlockVolumeWorker;
 
 import java.util.Optional;
@@ -164,7 +164,7 @@ default Optional<Chunk> getNeighbor(Direction direction, boolean shouldLoad) {
     }
 
     @Override
-    MutableBiomeAreaWorker<Chunk> getBiomeWorker();
+    MutableBiomeVolumeWorker<Chunk> getBiomeWorker();
 
     @Override
     MutableBlockVolumeWorker<Chunk> getBlockWorker(Cause cause);

src/main/java/org/spongepowered/api/world/Location.java

@@ -28,7 +28,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
-import com.flowpowered.math.vector.Vector2i;
 import com.flowpowered.math.vector.Vector3d;
 import com.flowpowered.math.vector.Vector3i;
 import com.google.common.base.Objects;
@@ -94,7 +93,7 @@ public final class Location<E extends Extent> implements DataHolder {
     @Nullable
     private Vector3i chunkPosition = null;
     @Nullable
-    private Vector2i biomePosition = null;
+    private Vector3i biomePosition = null;
 
     /**
      * Create a new instance.
@@ -202,9 +201,10 @@ public Vector3i getChunkPosition() {
      *
      * @return The underlying biome position
      */
-    public Vector2i getBiomePosition() {
+    public Vector3i getBiomePosition() {
         if (this.biomePosition == null) {
-            this.biomePosition = getBlockPosition().toVector2(true);
+            final Vector3i blockPosition = getBlockPosition();
+            this.biomePosition = new Vector3i(blockPosition.getX(), 0, blockPosition.getZ());
         }
         return this.biomePosition;
     }
@@ -432,7 +432,7 @@ public <T> T mapChunk(BiFunction<E, Vector3i, T> mapper) {
      * @param <T> The return type of the mapper
      * @return The results of the mapping
      */
-    public <T> T mapBiome(BiFunction<E, Vector2i, T> mapper) {
+    public <T> T mapBiome(BiFunction<E, Vector3i, T> mapper) {
         return mapper.apply(getExtent(), getBiomePosition());
     }
 

src/main/java/org/spongepowered/api/world/World.java

@@ -36,7 +36,7 @@
 import org.spongepowered.api.world.difficulty.Difficulty;
 import org.spongepowered.api.world.explosion.Explosion;
 import org.spongepowered.api.world.extent.Extent;
-import org.spongepowered.api.world.extent.worker.MutableBiomeAreaWorker;
+import org.spongepowered.api.world.extent.worker.MutableBiomeVolumeWorker;
 import org.spongepowered.api.world.extent.worker.MutableBlockVolumeWorker;
 import org.spongepowered.api.world.gen.WorldGenerator;
 import org.spongepowered.api.world.storage.WorldProperties;
@@ -316,7 +316,7 @@ default void setSerializationBehavior(SerializationBehavior behavior) {
     PortalAgent getPortalAgent();
 
     @Override
-    MutableBiomeAreaWorker<World> getBiomeWorker();
+    MutableBiomeVolumeWorker<World> getBiomeWorker();
 
     @Override
     MutableBlockVolumeWorker<World> getBlockWorker(Cause cause);

src/main/java/org/spongepowered/api/world/extent/ArchetypeVolume.java

@@ -73,7 +73,7 @@ default Optional<TileEntityArchetype> getTileEntityArchetype(Vector3i position)
     }
 
     /**
-     * Gets a map containing all tile entitiy archetypes within this volume,
+     * Gets a map containing all tile entity archetypes within this volume,
      * keyed by their positions within the volume.
      * 
      * @return The tile entity map