Terrain generator (WIP)

This commit is contained in:
paulevsGitch 2021-12-18 23:57:44 +03:00
parent c515c3c367
commit ce88ec23f7
65 changed files with 283 additions and 371 deletions

View file

@ -1,13 +1,13 @@
package ru.betterend.world.biome.cave;
import java.util.function.BiFunction;
import net.minecraft.resources.ResourceLocation;
import ru.bclib.api.biomes.BCLBiomeBuilder;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.world.biome.EndBiome;
import java.util.function.BiFunction;
public class EmptyAuroraCaveBiome extends EndCaveBiome.Config {
public static class Biome extends EndCaveBiome {
public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) {

View file

@ -1,12 +1,12 @@
package ru.betterend.world.biome.cave;
import java.util.function.BiFunction;
import net.minecraft.resources.ResourceLocation;
import ru.bclib.api.biomes.BCLBiomeBuilder;
import ru.betterend.registry.EndFeatures;
import ru.betterend.world.biome.EndBiome;
import java.util.function.BiFunction;
public class EmptyEndCaveBiome extends EndCaveBiome.Config {
public static class Biome extends EndCaveBiome {
public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) {

View file

@ -1,13 +1,13 @@
package ru.betterend.world.biome.cave;
import java.util.function.BiFunction;
import net.minecraft.resources.ResourceLocation;
import ru.bclib.api.biomes.BCLBiomeBuilder;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.world.biome.EndBiome;
import java.util.function.BiFunction;
public class EmptySmaragdantCaveBiome extends EndCaveBiome.Config {
public static class Biome extends EndCaveBiome {
public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) {

View file

@ -1,8 +1,5 @@
package ru.betterend.world.biome.cave;
import java.util.Random;
import java.util.function.BiFunction;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.biome.Biome;
@ -19,6 +16,9 @@ import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.features.terrain.caves.CaveChunkPopulatorFeature;
import java.util.Random;
import java.util.function.BiFunction;
public class EndCaveBiome extends EndBiome {
public static abstract class Config extends EndBiome.Config {
protected Config(String name) {

View file

@ -1,7 +1,5 @@
package ru.betterend.world.biome.cave;
import java.util.function.BiFunction;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -11,6 +9,8 @@ import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBlocks;
import ru.betterend.world.biome.EndBiome;
import java.util.function.BiFunction;
public class JadeCaveBiome extends EndCaveBiome.Config {
public static class Biome extends EndCaveBiome {
private static final OpenSimplexNoise WALL_NOISE = new OpenSimplexNoise("jade_cave".hashCode());

View file

@ -1,7 +1,5 @@
package ru.betterend.world.biome.cave;
import java.util.function.BiFunction;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.state.BlockState;
@ -13,6 +11,8 @@ import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.world.biome.EndBiome;
import java.util.function.BiFunction;
public class LushAuroraCaveBiome extends EndCaveBiome.Config {
public static class Biome extends EndCaveBiome {
public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) {

View file

@ -1,7 +1,5 @@
package ru.betterend.world.biome.cave;
import java.util.function.BiFunction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.state.BlockState;
import ru.bclib.api.biomes.BCLBiomeBuilder;
@ -11,6 +9,8 @@ import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;
import ru.betterend.world.biome.EndBiome;
import java.util.function.BiFunction;
public class LushSmaragdantCaveBiome extends EndCaveBiome.Config {
public static class Biome extends EndCaveBiome {
public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) {

View file

@ -1,7 +1,5 @@
package ru.betterend.world.features;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.LevelReader;
@ -27,6 +25,8 @@ import ru.bclib.world.features.NBTStructureFeature;
import ru.betterend.util.BlockFixer;
import ru.betterend.world.biome.EndBiome;
import java.util.Random;
public class CrashedShipFeature extends NBTStructureFeature {
private static final StructureProcessor REPLACER;
private static final String STRUCTURE_PATH = "/data/minecraft/structures/end_city/ship.nbt";

View file

@ -1,7 +1,5 @@
package ru.betterend.world.features.terrain;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.world.level.WorldGenLevel;
@ -20,6 +18,8 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.util.BlockFixer;
import ru.betterend.world.biome.EndBiome;
import java.util.Random;
public class DesertLakeFeature extends DefaultFeature {
private static final BlockState END_STONE = Blocks.END_STONE.defaultBlockState();
private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(15152);

View file

@ -1,7 +1,5 @@
package ru.betterend.world.features.terrain;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.world.level.WorldGenLevel;
@ -20,6 +18,8 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.util.BlockFixer;
import ru.betterend.world.biome.EndBiome;
import java.util.Random;
public class EndLakeFeature extends DefaultFeature {
private static final BlockState END_STONE = Blocks.END_STONE.defaultBlockState();
private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(15152);

View file

@ -1,11 +1,6 @@
package ru.betterend.world.features.terrain;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import com.google.common.collect.Lists;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.WorldGenLevel;
@ -23,6 +18,10 @@ import ru.betterend.registry.EndBiomes;
import ru.betterend.registry.EndFeatures;
import ru.betterend.world.biome.EndBiome;
import java.util.List;
import java.util.Optional;
import java.util.Random;
public class FloatingSpireFeature extends SpireFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {

View file

@ -1,9 +1,5 @@
package ru.betterend.world.features.terrain;
import java.util.Optional;
import java.util.Random;
import java.util.function.Function;
import com.mojang.math.Vector3f;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
@ -41,6 +37,10 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.util.BlockFixer;
import java.util.Optional;
import java.util.Random;
import java.util.function.Function;
public class GeyserFeature extends DefaultFeature {
protected static final Function<BlockState, Boolean> REPLACE1;
protected static final Function<BlockState, Boolean> REPLACE2;

View file

@ -1,12 +1,6 @@
package ru.betterend.world.features.terrain;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.function.Function;
import com.google.common.collect.Lists;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.WorldGenLevel;
@ -31,6 +25,11 @@ import ru.betterend.registry.EndBiomes;
import ru.betterend.registry.EndFeatures;
import ru.betterend.world.biome.EndBiome;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.function.Function;
public class SpireFeature extends DefaultFeature {
protected static final Function<BlockState, Boolean> REPLACE;

View file

@ -1,10 +1,6 @@
package ru.betterend.world.features.terrain;
import java.util.Random;
import java.util.Set;
import com.google.common.collect.Sets;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Direction;
@ -26,6 +22,9 @@ import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBlocks;
import ru.betterend.util.BlockFixer;
import java.util.Random;
import java.util.Set;
public class SulphuricCaveFeature extends DefaultFeature {
private static final BlockState CAVE_AIR = Blocks.CAVE_AIR.defaultBlockState();
private static final BlockState WATER = Blocks.WATER.defaultBlockState();

View file

@ -1,10 +1,6 @@
package ru.betterend.world.features.terrain;
import java.util.Random;
import java.util.Set;
import com.google.common.collect.Sets;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Direction;
@ -23,6 +19,9 @@ import ru.betterend.blocks.SulphurCrystalBlock;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBlocks;
import java.util.Random;
import java.util.Set;
public class SulphuricLakeFeature extends DefaultFeature {
private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(15152);
private static final MutableBlockPos POS = new MutableBlockPos();

View file

@ -1,12 +1,6 @@
package ru.betterend.world.features.terrain.caves;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.function.Supplier;
import com.google.common.collect.Sets;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.world.level.WorldGenLevel;
@ -22,6 +16,11 @@ import ru.bclib.world.features.DefaultFeature;
import ru.betterend.util.BlockFixer;
import ru.betterend.world.biome.cave.EndCaveBiome;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.function.Supplier;
public class CaveChunkPopulatorFeature extends DefaultFeature {
private Supplier<EndCaveBiome> supplier;

View file

@ -1,13 +1,7 @@
package ru.betterend.world.features.terrain.caves;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Direction;
@ -30,6 +24,11 @@ import ru.betterend.registry.EndBiomes;
import ru.betterend.util.BlockFixer;
import ru.betterend.world.biome.cave.EndCaveBiome;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
public abstract class EndCaveFeature extends DefaultFeature {
protected static final BlockState CAVE_AIR = Blocks.CAVE_AIR.defaultBlockState();
protected static final BlockState END_STONE = Blocks.END_STONE.defaultBlockState();

View file

@ -1,14 +1,7 @@
package ru.betterend.world.features.terrain.caves;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.stream.IntStream;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Direction;
@ -30,6 +23,12 @@ import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBiomes;
import ru.betterend.world.biome.cave.EndCaveBiome;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.stream.IntStream;
public class TunelCaveFeature extends EndCaveFeature {
private Set<BlockPos> generate(WorldGenLevel world, BlockPos center, Random random) {
int cx = center.getX() >> 4;

View file

@ -1,14 +1,7 @@
package ru.betterend.world.generator;
import java.awt.Point;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.locks.ReentrantLock;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.minecraft.util.Mth;
import net.minecraft.world.level.biome.BiomeSource;
import ru.bclib.api.biomes.BiomeAPI;
@ -16,6 +9,12 @@ import ru.bclib.util.MHelper;
import ru.bclib.world.biomes.BCLBiome;
import ru.betterend.noise.OpenSimplexNoise;
import java.awt.Point;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.locks.ReentrantLock;
public class TerrainGenerator {
private static final Map<Point, TerrainBoolCache> TERRAIN_BOOL_CACHE_MAP = Maps.newHashMap();
private static final ReentrantLock LOCKER = new ReentrantLock();

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.ChunkPos;
@ -19,6 +17,8 @@ import ru.bclib.world.structures.BCLStructureFeature;
import ru.betterend.BetterEnd;
import ru.betterend.world.structures.piece.NBTPiece;
import java.util.Random;
public class EternalPortalStructure extends FeatureBaseStructure {
private static final ResourceLocation STRUCTURE_ID = BetterEnd.makeID("portal/eternal_portal");
private static final StructureTemplate STRUCTURE = StructureHelper.readStructure(STRUCTURE_ID);

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.Random;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.LevelHeightAccessor;
import net.minecraft.world.level.block.Blocks;
@ -14,6 +12,8 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf
import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier;
import ru.bclib.world.structures.BCLStructureFeature;
import java.util.Random;
public abstract class FeatureBaseStructure extends StructureFeature<NoneFeatureConfiguration> {
protected static final BlockState AIR = Blocks.AIR.defaultBlockState();

View file

@ -1,9 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import com.mojang.math.Vector3f;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
@ -22,6 +18,10 @@ import ru.bclib.util.MHelper;
import ru.betterend.registry.EndBlocks;
import ru.betterend.world.structures.piece.VoxelPiece;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class GiantIceStarStructure extends SDFStructureFeature {
private static final float minSize = 20;
private static final float maxSize = 35;

View file

@ -1,8 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.List;
import java.util.Random;
import com.mojang.math.Vector3f;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@ -31,6 +28,9 @@ import ru.betterend.blocks.basis.FurBlock;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBlocks;
import java.util.List;
import java.util.Random;
public class GiantMossyGlowshroomStructure extends SDFStructureFeature {
public GiantMossyGlowshroomStructure() {
super(GiantMossyGlowshroomStructure::generatePieces);

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.LevelHeightAccessor;
@ -15,6 +13,8 @@ import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilde
import ru.bclib.util.MHelper;
import ru.betterend.world.structures.piece.LakePiece;
import java.util.Random;
public class MegaLakeSmallStructure extends FeatureBaseStructure {
public MegaLakeSmallStructure() {
super(PieceGeneratorSupplier.simple(

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.LevelHeightAccessor;
@ -15,6 +13,8 @@ import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilde
import ru.bclib.util.MHelper;
import ru.betterend.world.structures.piece.LakePiece;
import java.util.Random;
public class MegaLakeStructure extends FeatureBaseStructure {

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.LevelHeightAccessor;
@ -15,6 +13,8 @@ import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilde
import ru.bclib.util.MHelper;
import ru.betterend.world.structures.piece.CrystalMountainPiece;
import java.util.Random;
public class MountainStructure extends FeatureBaseStructure {
public MountainStructure() {

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.LevelHeightAccessor;
@ -18,6 +16,8 @@ import ru.bclib.util.MHelper;
import ru.betterend.registry.EndBlocks;
import ru.betterend.world.structures.piece.PaintedMountainPiece;
import java.util.Random;
public class PaintedMountainStructure extends FeatureBaseStructure {
private static final BlockState[] VARIANTS;

View file

@ -1,8 +1,5 @@
package ru.betterend.world.structures.features;
import java.util.Random;
import java.util.function.BiFunction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.LevelHeightAccessor;
@ -16,6 +13,9 @@ import ru.bclib.sdf.SDF;
import ru.bclib.util.MHelper;
import ru.betterend.world.structures.piece.VoxelPiece;
import java.util.Random;
import java.util.function.BiFunction;
public abstract class SDFStructureFeature extends FeatureBaseStructure {
public SDFStructureFeature(PieceGenerator<NoneFeatureConfiguration> generator) {
super(PieceGeneratorSupplier.simple(

View file

@ -1,7 +1,6 @@
package ru.betterend.world.structures.piece;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.levelgen.feature.StructurePieceType;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.StructurePiece;

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.piece;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.nbt.CompoundTag;
@ -19,6 +17,8 @@ import ru.bclib.util.MHelper;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndStructures;
import java.util.Random;
public class CavePiece extends BasePiece {
private OpenSimplexNoise noise;
private BlockPos center;

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.piece;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.nbt.CompoundTag;
@ -25,6 +23,8 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
import java.util.Random;
public class CrystalMountainPiece extends MountainPiece {
private BlockState top;

View file

@ -1,10 +1,6 @@
package ru.betterend.world.structures.piece;
import java.util.Map;
import java.util.Random;
import com.google.common.collect.Maps;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Direction;
@ -34,6 +30,9 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
import java.util.Map;
import java.util.Random;
public class LakePiece extends BasePiece {
private static final BlockState ENDSTONE = Blocks.END_STONE.defaultBlockState();
private static final BlockState WATER = Blocks.WATER.defaultBlockState();

View file

@ -1,10 +1,6 @@
package ru.betterend.world.structures.piece;
import java.util.Map;
import java.util.Random;
import com.google.common.collect.Maps;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.nbt.CompoundTag;
@ -20,6 +16,9 @@ import ru.bclib.api.biomes.BiomeAPI;
import ru.bclib.util.MHelper;
import ru.betterend.noise.OpenSimplexNoise;
import java.util.Map;
import java.util.Random;
public abstract class MountainPiece extends BasePiece {
protected Map<Integer, Integer> heightmap = Maps.newHashMap();
protected OpenSimplexNoise noise1;

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.piece;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
@ -22,6 +20,8 @@ import ru.bclib.util.StructureHelper;
import ru.betterend.registry.EndStructures;
import ru.betterend.world.biome.EndBiome;
import java.util.Random;
public class NBTPiece extends BasePiece {
private ResourceLocation structureID;
private Rotation rotation;

View file

@ -1,7 +1,5 @@
package ru.betterend.world.structures.piece;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.nbt.CompoundTag;
@ -21,6 +19,8 @@ import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSeriali
import ru.bclib.util.MHelper;
import ru.betterend.registry.EndStructures;
import java.util.Random;
public class PaintedMountainPiece extends MountainPiece {
private BlockState[] slises;

View file

@ -1,8 +1,5 @@
package ru.betterend.world.structures.piece;
import java.util.Random;
import java.util.function.Consumer;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.ChunkPos;
@ -14,6 +11,9 @@ import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSeriali
import ru.bclib.world.structures.StructureWorld;
import ru.betterend.registry.EndStructures;
import java.util.Random;
import java.util.function.Consumer;
public class VoxelPiece extends BasePiece {
private StructureWorld world;