MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cave biome populators

Browse source
This commit is contained in:
paulevsGitch 2021-03-20 09:06:55 +03:00
parent 3dcafa522c
commit 945a322b53
44 changed files with 182 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ru/betterend/world/biome/land/EndBiome.java → src/main/java/ru/betterend/world/biome/EndBiome.java
View file

@ -1,4 +1,4 @@
package ru.betterend.world.biome.land;
package ru.betterend.world.biome;
import java.io.InputStream;
import java.util.List;
@ -14,6 +14,7 @@ import net.minecraft.world.biome.Biome;
import ru.betterend.config.Configs;
import ru.betterend.util.JsonFactory;
import ru.betterend.util.StructureHelper;
import ru.betterend.world.biome.land.BiomeDefinition;
import ru.betterend.world.features.EndFeature;
import ru.betterend.world.features.ListFeature;
import ru.betterend.world.features.ListFeature.StructureInfo;

2
src/main/java/ru/betterend/world/biome/air/BiomeIceStarfield.java
View file

@ -4,8 +4,8 @@ import net.minecraft.entity.EntityType;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.biome.land.BiomeDefinition;
import ru.betterend.world.biome.land.EndBiome;
public class BiomeIceStarfield extends EndBiome {
public BiomeIceStarfield() {

16
src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java
View file

@ -6,15 +6,27 @@ import net.minecraft.block.BlockState;
import net.minecraft.util.collection.WeightedList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.gen.feature.Feature;
import ru.betterend.registry.EndBiomes;
import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.biome.land.BiomeDefinition;
import ru.betterend.world.biome.land.EndBiome;
import ru.betterend.world.features.EndFeature;
import ru.betterend.world.features.terrain.caves.CaveChunkPopulatorFeature;
public class EndCaveBiome extends EndBiome {
private WeightedList<Feature<?>> floorFeatures = new WeightedList<Feature<?>>();
private WeightedList<Feature<?>> ceilFeatures = new WeightedList<Feature<?>>();
public EndCaveBiome(BiomeDefinition definition) {
super(definition.setCaveBiome());
super(makeDef(definition));
}
private static BiomeDefinition makeDef(BiomeDefinition definition) {
EndFeature feature = EndFeature.makeChunkFeature(
definition.getID().getPath() + "_cave_populator",
new CaveChunkPopulatorFeature(() -> (EndCaveBiome) EndBiomes.getBiome(definition.getID()))
);
definition.addFeature(feature).setCaveBiome();
return definition;
}
public void addFloorFeature(Feature<?> feature, int weight) {

1
src/main/java/ru/betterend/world/biome/land/AmberLandBiome.java
View file

@ -7,6 +7,7 @@ import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class AmberLandBiome extends EndBiome {
public AmberLandBiome() {

1
src/main/java/ru/betterend/world/biome/land/BlossomingSpiresBiome.java
View file

@ -5,6 +5,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class BlossomingSpiresBiome extends EndBiome {
public BlossomingSpiresBiome() {

1
src/main/java/ru/betterend/world/biome/land/ChorusForestBiome.java
View file

@ -9,6 +9,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class ChorusForestBiome extends EndBiome {
public ChorusForestBiome() {

1
src/main/java/ru/betterend/world/biome/land/CrystalMountainsBiome.java
View file

@ -5,6 +5,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
public class CrystalMountainsBiome extends EndBiome {
public CrystalMountainsBiome() {

1
src/main/java/ru/betterend/world/biome/land/DragonGraveyardsBiome.java
View file

@ -5,6 +5,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class DragonGraveyardsBiome extends EndBiome {
public DragonGraveyardsBiome() {

1
src/main/java/ru/betterend/world/biome/land/DryShrublandBiome.java
View file

@ -5,6 +5,7 @@ import net.minecraft.world.gen.feature.ConfiguredStructureFeatures;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class DryShrublandBiome extends EndBiome {
public DryShrublandBiome() {

1
src/main/java/ru/betterend/world/biome/land/DustWastelandsBiome.java
View file

@ -5,6 +5,7 @@ import net.minecraft.particle.ParticleTypes;
import net.minecraft.world.gen.feature.ConfiguredStructureFeatures;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class DustWastelandsBiome extends EndBiome {
public DustWastelandsBiome() {

1
src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java
View file

@ -8,6 +8,7 @@ import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndSounds;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
public class FoggyMushroomlandBiome extends EndBiome {
public FoggyMushroomlandBiome() {

1
src/main/java/ru/betterend/world/biome/land/GlowingGrasslandsBiome.java
View file

@ -6,6 +6,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class GlowingGrasslandsBiome extends EndBiome {
public GlowingGrasslandsBiome() {

1
src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java
View file

@ -6,6 +6,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class LanternWoodsBiome extends EndBiome {
public LanternWoodsBiome() {

1
src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java
View file

@ -6,6 +6,7 @@ import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
public class MegalakeBiome extends EndBiome {
public MegalakeBiome() {

1
src/main/java/ru/betterend/world/biome/land/MegalakeGroveBiome.java
View file

@ -7,6 +7,7 @@ import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndSounds;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
public class MegalakeGroveBiome extends EndBiome {
public MegalakeGroveBiome() {

1
src/main/java/ru/betterend/world/biome/land/PaintedMountainsBiome.java
View file

@ -5,6 +5,7 @@ import net.minecraft.particle.ParticleTypes;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndSounds;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
public class PaintedMountainsBiome extends EndBiome {
public PaintedMountainsBiome() {

1
src/main/java/ru/betterend/world/biome/land/ShadowForestBiome.java
View file

@ -7,6 +7,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class ShadowForestBiome extends EndBiome {
public ShadowForestBiome() {

1
src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java
View file

@ -5,6 +5,7 @@ import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.surface.SurfaceBuilders;
public class SulphurSpringsBiome extends EndBiome {

1
src/main/java/ru/betterend/world/biome/land/UmbrellaJungleBiome.java
View file

@ -6,6 +6,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
public class UmbrellaJungleBiome extends EndBiome {
public UmbrellaJungleBiome() {

132
src/main/java/ru/betterend/world/features/terrain/caves/CaveChunkPopulatorFeature.java Normal file
View file

@ -0,0 +1,132 @@
package ru.betterend.world.features.terrain.caves;
import java.util.Random;
import java.util.Set;
import java.util.function.Supplier;
import com.google.common.collect.Sets;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockPos.Mutable;
import net.minecraft.world.StructureWorldAccess;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import net.minecraft.world.gen.feature.Feature;
import ru.betterend.registry.EndTags;
import ru.betterend.util.BlocksHelper;
import ru.betterend.world.biome.cave.EndCaveBiome;
import ru.betterend.world.features.DefaultFeature;
public class CaveChunkPopulatorFeature extends DefaultFeature {
private Supplier<EndCaveBiome> supplier;
public CaveChunkPopulatorFeature(Supplier<EndCaveBiome> biome) {
this.supplier = biome;
}
@Override
public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) {
Set<BlockPos> floorPositions = Sets.newHashSet();
Set<BlockPos> ceilPositions = Sets.newHashSet();
int sx = (pos.getX() >> 4) << 4;
int sz = (pos.getZ() >> 4) << 4;
Mutable min = new Mutable().set(pos);
Mutable max = new Mutable().set(pos);
fillSets(sx, sz, world.getChunk(pos), floorPositions, ceilPositions, min, max);
EndCaveBiome biome = supplier.get();
BlockState surfaceBlock = biome.getBiome().getGenerationSettings().getSurfaceConfig().getTopMaterial();
placeFloor(world, biome, floorPositions, random, surfaceBlock);
placeCeil(world, biome, ceilPositions, random);
BlocksHelper.fixBlocks(world, min, max);
return true;
}
protected void fillSets(int sx, int sz, Chunk chunk, Set<BlockPos> floorPositions, Set<BlockPos> ceilPositions, Mutable min, Mutable max) {
Mutable mut = new Mutable();
Mutable mut2 = new Mutable();
Mutable mut3 = new Mutable();
for (int x = 0; x < 16; x++) {
mut.setX(x);
mut2.setX(x);
for (int z = 0; z < 16; z++) {
mut.setZ(z);
mut2.setZ(z);
mut2.setY(0);
for (int y = 1; y < chunk.getHeight(); y++) {
mut.setY(y);
BlockState top = chunk.getBlockState(mut);
BlockState bottom = chunk.getBlockState(mut2);
if (top.isAir() && (bottom.isIn(EndTags.GEN_TERRAIN) || bottom.isOf(Blocks.STONE))) {
mut3.set(mut2).move(sx, 0, sz);
floorPositions.add(mut3.toImmutable());
updateMin(mut3, min);
updateMax(mut3, max);
}
else if (bottom.isAir() && (top.isIn(EndTags.GEN_TERRAIN)|| top.isOf(Blocks.STONE))) {
mut3.set(mut).move(sx, 0, sz);
ceilPositions.add(mut3.toImmutable());
updateMin(mut3, min);
updateMax(mut3, max);
}
mut2.setY(y);
}
}
}
}
private void updateMin(BlockPos pos, Mutable min) {
if (pos.getX() < min.getX()) {
min.setX(pos.getX());
}
if (pos.getY() < min.getY()) {
min.setY(pos.getY());
}
if (pos.getZ() < min.getZ()) {
min.setZ(pos.getZ());
}
}
private void updateMax(BlockPos pos, Mutable max) {
if (pos.getX() > max.getX()) {
max.setX(pos.getX());
}
if (pos.getY() > max.getY()) {
max.setY(pos.getY());
}
if (pos.getZ() > max.getZ()) {
max.setZ(pos.getZ());
}
}
protected void placeFloor(StructureWorldAccess world, EndCaveBiome biome, Set<BlockPos> floorPositions, Random random, BlockState surfaceBlock) {
float density = biome.getFloorDensity();
floorPositions.forEach((pos) -> {
BlocksHelper.setWithoutUpdate(world, pos, surfaceBlock);
if (density > 0 && random.nextFloat() <= density) {
Feature<?> feature = biome.getFloorFeature(random);
if (feature != null) {
feature.generate(world, null, random, pos.up(), null);
}
}
});
}
protected void placeCeil(StructureWorldAccess world, EndCaveBiome biome, Set<BlockPos> ceilPositions, Random random) {
float density = biome.getCeilDensity();
ceilPositions.forEach((pos) -> {
BlockState ceilBlock = biome.getCeil(pos);
if (ceilBlock != null) {
BlocksHelper.setWithoutUpdate(world, pos, ceilBlock);
}
if (density > 0 && random.nextFloat() <= density) {
Feature<?> feature = biome.getCeilFeature(random);
if (feature != null) {
feature.generate(world, null, random, pos.down(), null);
}
}
});
}
}

2
src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java
View file

@ -21,8 +21,8 @@ import ru.betterend.registry.EndBiomes;
import ru.betterend.registry.EndTags;
import ru.betterend.util.BlocksHelper;
import ru.betterend.util.MHelper;
import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.biome.cave.EndCaveBiome;
import ru.betterend.world.biome.land.EndBiome;
import ru.betterend.world.features.DefaultFeature;
import ru.betterend.world.generator.GeneratorOptions;

2
src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java
View file

@ -19,7 +19,7 @@ import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBiomes;
import ru.betterend.registry.EndTags;
import ru.betterend.util.FeaturesHelper;
import ru.betterend.world.biome.land.EndBiome;
import ru.betterend.world.biome.EndBiome;
public class BetterEndBiomeSource extends BiomeSource {
public static final Codec<BetterEndBiomeSource> CODEC = RecordCodecBuilder.create((instance) -> {

2
src/main/java/ru/betterend/world/generator/BiomeChunk.java
View file

@ -2,7 +2,7 @@ package ru.betterend.world.generator;
import java.util.Random;
import ru.betterend.world.biome.land.EndBiome;
import ru.betterend.world.biome.EndBiome;
public class BiomeChunk
{

2
src/main/java/ru/betterend/world/generator/BiomeMap.java
View file

@ -8,7 +8,7 @@ import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.gen.ChunkRandom;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.util.MHelper;
import ru.betterend.world.biome.land.EndBiome;
import ru.betterend.world.biome.EndBiome;
public class BiomeMap {
private static final ChunkRandom RANDOM = new ChunkRandom();

2
src/main/java/ru/betterend/world/generator/BiomePicker.java
View file

@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import net.minecraft.util.Identifier;
import ru.betterend.world.biome.land.EndBiome;
import ru.betterend.world.biome.EndBiome;
public class BiomePicker {
private final Set<Identifier> immutableIDs = Sets.newHashSet();

2
src/main/java/ru/betterend/world/generator/WeighTree.java
View file

@ -2,7 +2,7 @@ package ru.betterend.world.generator;
import java.util.List;
import ru.betterend.world.biome.land.EndBiome;
import ru.betterend.world.biome.EndBiome;
public class WeighTree {
private final Node root;