From c295ff484f5277d1528041f8de62971fb643f170 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 9 Feb 2016 11:35:59 +1100 Subject: [PATCH] Massive cleanup of GenLayerShore --- .../common/world/WorldChunkManagerBOP.java | 3 +- .../common/world/layer/GenLayerShoreBOP.java | 148 ++++++++++++++++++ 2 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java diff --git a/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOP.java b/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOP.java index 87bbbd7b2..ecbba7f03 100644 --- a/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOP.java +++ b/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOP.java @@ -24,6 +24,7 @@ import biomesoplenty.common.world.layer.GenLayerRaggedEdges; import biomesoplenty.common.world.layer.GenLayerRainfallNoise; import biomesoplenty.common.world.layer.GenLayerRainfallRandom; import biomesoplenty.common.world.layer.GenLayerRiverMixBOP; +import biomesoplenty.common.world.layer.GenLayerShoreBOP; import biomesoplenty.common.world.layer.GenLayerSubBiomesBOP; import biomesoplenty.common.world.layer.GenLayerTemperatureLatitude; import biomesoplenty.common.world.layer.GenLayerTemperatureNoise; @@ -258,7 +259,7 @@ public class WorldChunkManagerBOP extends WorldChunkManager { mainBranch = new GenLayerZoom((long)(1000 + i), mainBranch); if (i == 0) {mainBranch = new GenLayerRaggedEdges(3L, mainBranch);} - if (i == 1 || biomeSize == 1) {mainBranch = new GenLayerShore(1000L, mainBranch);} + if (i == 1 || biomeSize == 1) {mainBranch = new GenLayerShoreBOP(1000L, mainBranch);} } mainBranch = new GenLayerSmooth(1000L, mainBranch); diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java new file mode 100644 index 000000000..7070b44b6 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java @@ -0,0 +1,148 @@ +/******************************************************************************* + * Copyright 2016, the Biomes O' Plenty Team + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. + ******************************************************************************/ +package biomesoplenty.common.world.layer; + +import com.google.common.base.Predicate; + +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.BiomeGenJungle; +import net.minecraft.world.biome.BiomeGenMesa; +import net.minecraft.world.gen.layer.GenLayer; +import net.minecraft.world.gen.layer.IntCache; + +public class GenLayerShoreBOP extends BOPGenLayer +{ + public GenLayerShoreBOP(long seed, GenLayer parent) + { + super(seed); + this.parent = parent; + } + + @Override + public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight) + { + int[] biomeIds = this.parent.getInts(areaX - 1, areaY - 1, areaWidth + 2, areaHeight + 2); + int[] out = IntCache.getIntCache(areaWidth * areaHeight); + + for (int z = 0; z < areaHeight; ++z) + { + for (int x = 0; x < areaWidth; ++x) + { + this.initChunkSeed((long)(x + areaX), (long)(z + areaY)); + //The biome we're going to attempt to put a beach beside + int biomeId = biomeIds[x + 1 + (z + 1) * (areaWidth + 2)]; + BiomeGenBase biome = BiomeGenBase.getBiome(biomeId); + + if (biomeId == BiomeGenBase.mushroomIsland.biomeID) + { + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.mushroomIslandShore.biomeID, OCEAN_PREDICATE); + } + else if (biome != null && biome.getBiomeClass() == BiomeGenJungle.class) + { + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.jungleEdge.biomeID, JUNGLE_BORDER_PREDICATE); + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.beach.biomeID, OCEANIC_PREDICATE); + } + else if (biomeId != BiomeGenBase.extremeHills.biomeID && biomeId != BiomeGenBase.extremeHillsPlus.biomeID && biomeId != BiomeGenBase.extremeHillsEdge.biomeID) + { + if (!isBiomeOceanic(biomeId) && biome != null && biome.isSnowyBiome()) //Snowy biomes should have cold beaches + { + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.coldBeach.biomeID, OCEANIC_PREDICATE); + } + else if (biomeId != BiomeGenBase.mesa.biomeID && biomeId != BiomeGenBase.mesaPlateau_F.biomeID) + { + if (biomeId != BiomeGenBase.ocean.biomeID && biomeId != BiomeGenBase.deepOcean.biomeID && biomeId != BiomeGenBase.river.biomeID && biomeId != BiomeGenBase.swampland.biomeID) + { + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.beach.biomeID, OCEANIC_PREDICATE); + } + else //Biome is watery, don't put any beaches next to it + { + out[x + z * areaWidth] = biomeId; + } + } + else //Biome is a variant of the mesa + { + int biomeNorth = biomeIds[x + 1 + (z + 1 - 1) * (areaWidth + 2)]; + int biomeEast = biomeIds[x + 1 + 1 + (z + 1) * (areaWidth + 2)]; + int biomeWest = biomeIds[x + 1 - 1 + (z + 1) * (areaWidth + 2)]; + int biomeSouth = biomeIds[x + 1 + (z + 1 + 1) * (areaWidth + 2)]; + + //Ensure that none of the surrounding biomes are ocean + if (!isBiomeOceanic(biomeNorth) && !isBiomeOceanic(biomeEast) && !isBiomeOceanic(biomeWest) && !isBiomeOceanic(biomeSouth)) + { + //If at least one of the surrounding biomes is a non-mesa, set it to desert + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.desert.biomeID, MESA_PREDICATE); + } + else + { + out[x + z * areaWidth] = biomeId; + } + } + } + else //Biome is a variant of the extreme hills + { + this.setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.stoneBeach.biomeID, OCEANIC_PREDICATE); + } + } + } + + return out; + } + + private void setBiomeWithAdjacent(int[] biomeIds, int[] out, int x, int z, int areaWidth, int biomeId, int beachId, Predicate adjacentPredicate) + { + int biomeNorth = biomeIds[x + 1 + (z + 1 - 1) * (areaWidth + 2)]; + int biomeEast = biomeIds[x + 1 + 1 + (z + 1) * (areaWidth + 2)]; + int biomeWest = biomeIds[x + 1 - 1 + (z + 1) * (areaWidth + 2)]; + int biomeSouth = biomeIds[x + 1 + (z + 1 + 1) * (areaWidth + 2)]; + + if (adjacentPredicate.apply(biomeNorth) || adjacentPredicate.apply(biomeEast) || adjacentPredicate.apply(biomeWest) || adjacentPredicate.apply(biomeSouth)) + { + out[x + z * areaWidth] = beachId; + } + else + { + out[x + z * areaWidth] = biomeId; + } + } + + private static final Predicate OCEAN_PREDICATE = new Predicate() + { + @Override + public boolean apply(Integer input) + { + return input == BiomeGenBase.ocean.biomeID; + } + }; + + private static final Predicate OCEANIC_PREDICATE = new Predicate() + { + @Override + public boolean apply(Integer input) + { + return isBiomeOceanic(input); + } + }; + + private static final Predicate JUNGLE_BORDER_PREDICATE = new Predicate() + { + @Override + public boolean apply(Integer input) + { + return BiomeGenBase.getBiome(input) != null && BiomeGenBase.getBiome(input).getBiomeClass() == BiomeGenJungle.class ? true : input == BiomeGenBase.jungleEdge.biomeID || input == BiomeGenBase.jungle.biomeID || input == BiomeGenBase.jungleHills.biomeID || input == BiomeGenBase.forest.biomeID || input == BiomeGenBase.taiga.biomeID || isBiomeOceanic(input); + } + }; + + private static final Predicate MESA_PREDICATE = new Predicate() + { + @Override + public boolean apply(Integer input) + { + return !(BiomeGenBase.getBiome(input) instanceof BiomeGenMesa); + } + }; +}