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

Lake prototype

Browse source
This commit is contained in:
paulevsGitch 2021-01-15 00:53:40 +03:00
parent 6d039875d2
commit 21f8cb54c0
4 changed files with 202 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/registry/EndStructures.java
View file

@ -33,7 +33,7 @@ public class EndStructures {
public static final StructurePieceType NBT_PIECE = register("nbt_piece", NBTPiece::new); public static final StructurePieceType NBT_PIECE = register("nbt_piece", NBTPiece::new);
public static final EndStructureFeature GIANT_MOSSY_GLOWSHROOM = new EndStructureFeature("giant_mossy_glowshroom", new StructureGiantMossyGlowshroom(), Feature.SURFACE_STRUCTURES, 16, 8); public static final EndStructureFeature GIANT_MOSSY_GLOWSHROOM = new EndStructureFeature("giant_mossy_glowshroom", new StructureGiantMossyGlowshroom(), Feature.SURFACE_STRUCTURES, 16, 8);
public static final EndStructureFeature MEGALAKE = new EndStructureFeature("megalake", new StructureMegaLake(), Feature.RAW_GENERATION, 8, 2); public static final EndStructureFeature MEGALAKE = new EndStructureFeature("megalake", new StructureMegaLake(), Feature.RAW_GENERATION, 4, 1);
public static final EndStructureFeature MOUNTAIN = new EndStructureFeature("mountain", new StructureMountain(), Feature.RAW_GENERATION, 3, 2); public static final EndStructureFeature MOUNTAIN = new EndStructureFeature("mountain", new StructureMountain(), Feature.RAW_GENERATION, 3, 2);
public static final EndStructureFeature PAINTED_MOUNTAIN = new EndStructureFeature("painted_mountain", new StructurePaintedMountain(), Feature.RAW_GENERATION, 3, 2); public static final EndStructureFeature PAINTED_MOUNTAIN = new EndStructureFeature("painted_mountain", new StructurePaintedMountain(), Feature.RAW_GENERATION, 3, 2);
public static final EndStructureFeature ETERNAL_PORTAL = new EndStructureFeature("eternal_portal", new StructureEternalPortal(), Feature.SURFACE_STRUCTURES, 16, 6); public static final EndStructureFeature ETERNAL_PORTAL = new EndStructureFeature("eternal_portal", new StructureEternalPortal(), Feature.SURFACE_STRUCTURES, 16, 6);

8
src/main/java/ru/betterend/world/structures/features/StructureMegaLake.java
View file

@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.feature.StructureFeature;
import ru.betterend.util.MHelper; import ru.betterend.util.MHelper;
import ru.betterend.world.structures.piece.LakePiece; import ru.betterend.world.structures.piece.LakePiece;
import ru.betterend.world.structures.piece.LakePiece2;
public class StructureMegaLake extends StructureFeatureBase { public class StructureMegaLake extends StructureFeatureBase {
@Override @Override
@ -30,9 +31,10 @@ public class StructureMegaLake extends StructureFeatureBase {
int z = (chunkZ << 4) | MHelper.randRange(4, 12, random); int z = (chunkZ << 4) | MHelper.randRange(4, 12, random);
int y = chunkGenerator.getHeight(x, z, Type.WORLD_SURFACE_WG); int y = chunkGenerator.getHeight(x, z, Type.WORLD_SURFACE_WG);
if (y > 5) { if (y > 5) {
float radius = MHelper.randRange(50, 150, random); float radius = MHelper.randRange(64, 96, random);
float depth = MHelper.randRange(6, 10, random); float depth = MHelper.randRange(8, 25, random);
LakePiece piece = new LakePiece(new BlockPos(x, y - 3, z), radius, depth, random, biome); //LakePiece piece = new LakePiece(new BlockPos(x, y - 3, z), radius, depth, random, biome);
LakePiece2 piece = new LakePiece2(new BlockPos(x, y, z), radius, depth, random, biome);
this.children.add(piece); this.children.add(piece);
} }
this.setBoundingBoxFromChildren(); this.setBoundingBoxFromChildren();

25
src/main/java/ru/betterend/world/structures/piece/LakePiece.java
View file

@ -105,12 +105,12 @@ public class LakePiece extends BasePiece {
pos.setZ(z); pos.setZ(z);
dist = 1 - dist / r2; dist = 1 - dist / r2;
int maxY = map.get(x, z); int maxY = map.get(x, z);
if (MathHelper.abs(maxY - center.getY()) < 8) { if (MathHelper.abs(maxY - center.getY()) < 16) {
float minY = (float) Math.sqrt(dist) * depth * getHeightClamp(world, 8, px, pz); float minY = (float) Math.sqrt(dist) * depth * getHeightClamp(world, 12, px, pz);
if (minY > 0) { if (minY > 0) {
minY *= (float) noise1.eval(px * 0.05, pz * 0.05) * 0.3F + 0.7F; //minY *= (float) noise1.eval(px * 0.05, pz * 0.05) * 0.3F + 0.7F;
minY *= (float) noise1.eval(px * 0.1, pz * 0.1) * 0.1F + 0.8F; //minY *= (float) noise1.eval(px * 0.1, pz * 0.1) * 0.1F + 0.8F;
float lerp = minY / 4F; float lerp = minY / 8F;
if (lerp > 1) { if (lerp > 1) {
lerp = 1; lerp = 1;
} }
@ -214,23 +214,26 @@ public class LakePiece extends BasePiece {
} }
h = world.getTopY(Type.WORLD_SURFACE_WG, pos.getX(), pos.getZ()); h = world.getTopY(Type.WORLD_SURFACE_WG, pos.getX(), pos.getZ());
h = MathHelper.abs(h - center.getY()); /*h = 5 - MathHelper.abs(h - center.getY());
if (h > 4) { if (h < 2) {
h = 4 - h;
heightmap.put(p, h); heightmap.put(p, h);
return h; return h;
} }
h = MHelper.floor(noise2.eval(pos.getX() * 0.01, pos.getZ() * 0.01) * noise2.eval(pos.getX() * 0.002, pos.getZ() * 0.002) * 8 + 8); h = MHelper.floor(noise2.eval(pos.getX() * 0.01, pos.getZ() * 0.01) * noise2.eval(pos.getX() * 0.002, pos.getZ() * 0.002) * 8 + 8);*/
if (h < 0) { h = 8 - MathHelper.abs(h - center.getY());
heightmap.put(p, h);
return h;
/*if (h < 0) {
heightmap.put(p, 0); heightmap.put(p, 0);
return 0; return 0;
} }
heightmap.put(p, h); heightmap.put(p, h);
return h; return h;*/
} }
private float getHeightClamp(StructureWorldAccess world, int radius, int posX, int posZ) { private float getHeightClamp(StructureWorldAccess world, int radius, int posX, int posZ) {

182
src/main/java/ru/betterend/world/structures/piece/LakePiece2.java Normal file
View file

@ -0,0 +1,182 @@
package ru.betterend.world.structures.piece;
import java.util.Map;
import java.util.Random;
import com.google.common.collect.Maps;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtHelper;
import net.minecraft.structure.StructureManager;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockBox;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockPos.Mutable;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.StructureWorldAccess;
import net.minecraft.world.Heightmap.Type;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.gen.StructureAccessor;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBiomes;
import ru.betterend.registry.EndStructures;
import ru.betterend.registry.EndTags;
import ru.betterend.util.MHelper;
public class LakePiece2 extends BasePiece {
private static final BlockState ENDSTONE = Blocks.END_STONE.getDefaultState();
private static final BlockState WATER = Blocks.WATER.getDefaultState();
private Map<Integer, Byte> heightmap = Maps.newHashMap();
private OpenSimplexNoise noise;
private BlockPos center;
private float radius;
private float aspect;
private float depth;
private int seed;
private Identifier biomeID;
public LakePiece2(BlockPos center, float radius, float depth, Random random, Biome biome) {
super(EndStructures.LAKE_PIECE, random.nextInt());
this.center = center;
this.radius = radius;
this.depth = depth;
this.seed = random.nextInt();
this.noise = new OpenSimplexNoise(this.seed);
this.aspect = radius / depth;
this.biomeID = EndBiomes.getBiomeID(biome);
makeBoundingBox();
}
public LakePiece2(StructureManager manager, CompoundTag tag) {
super(EndStructures.LAKE_PIECE, tag);
makeBoundingBox();
}
@Override
protected void toNbt(CompoundTag tag) {
tag.put("center", NbtHelper.fromBlockPos(center));
tag.putFloat("radius", radius);
tag.putFloat("depth", depth);
tag.putInt("seed", seed);
tag.putString("biome", biomeID.toString());
}
@Override
protected void fromNbt(CompoundTag tag) {
center = NbtHelper.toBlockPos(tag.getCompound("center"));
radius = tag.getFloat("radius");
depth = tag.getFloat("depth");
seed = tag.getInt("seed");
noise = new OpenSimplexNoise(seed);
aspect = radius / depth;
biomeID = new Identifier(tag.getString("biome"));
}
@Override
public boolean generate(StructureWorldAccess world, StructureAccessor arg, ChunkGenerator chunkGenerator, Random random, BlockBox blockBox, ChunkPos chunkPos, BlockPos blockPos) {
int minY = this.boundingBox.minY;
int maxY = this.boundingBox.maxY;
int sx = chunkPos.x << 4;
int sz = chunkPos.z << 4;
Mutable mut = new Mutable();
Chunk chunk = world.getChunk(chunkPos.x, chunkPos.z);
for (int x = 0; x < 16; x++) {
mut.setX(x);
int wx = x | sx;
double nx = wx * 0.1;
int x2 = MHelper.pow2(wx - center.getX());
for (int z = 0; z < 16; z++) {
mut.setZ(z);
int wz = z | sz;
double nz = wz * 0.1;
int z2 = MHelper.pow2(wz - center.getZ());
float clamp = getHeightClamp(world, 8, wx, wz);
if (clamp < 0.01) continue;
for (int y = minY; y <= maxY; y++) {
mut.setY(y);
double ny = y * 0.1;
double y2 = MHelper.pow2((y - center.getY()) * aspect);
double r2 = (noise.eval(nx, ny, nz) * 10 + radius) * clamp;
double r3 = r2 + 8;
r2 *= r2;
r3 *= r3;
double dist = x2 + y2 + z2;
if (dist < r2) {
BlockState state = chunk.getBlockState(mut);
if (state.isIn(EndTags.GEN_TERRAIN) || state.getMaterial().isReplaceable()) {
state = y < center.getY() ? WATER : AIR;
chunk.setBlockState(mut, state, false);
}
}
else if (dist < r3 && y < center.getY()) {
BlockState state = chunk.getBlockState(mut);
BlockPos worldPos = mut.add(sx, 0, sz);
if (!state.isFullCube(world, worldPos) || !state.isSolidBlock(world, worldPos)) {
chunk.setBlockState(mut, ENDSTONE, false);
}
}
}
}
}
return true;
}
private int getHeight(StructureWorldAccess world, BlockPos pos) {
int p = ((pos.getX() & 2047) << 11) | (pos.getZ() & 2047);
int h = heightmap.getOrDefault(p, Byte.MIN_VALUE);
if (h > Byte.MIN_VALUE) {
return h;
}
if (!EndBiomes.getBiomeID(world.getBiome(pos)).equals(biomeID)) {
heightmap.put(p, (byte) 0);
return 0;
}
h = world.getTopY(Type.WORLD_SURFACE_WG, pos.getX(), pos.getZ());
h = MathHelper.abs(h - center.getY());
h = h < 8 ? 1 : 0;
heightmap.put(p, (byte) h);
return h;
}
private float getHeightClamp(StructureWorldAccess world, int radius, int posX, int posZ) {
Mutable mut = new Mutable();
int r2 = radius * radius;
float height = 0;
float max = 0;
for (int x = -radius; x <= radius; x++) {
mut.setX(posX + x);
int x2 = x * x;
for (int z = -radius; z <= radius; z++) {
mut.setZ(posZ + z);
int z2 = z * z;
if (x2 + z2 < r2) {
float mult = 1 - (float) Math.sqrt(x2 + z2) / radius;
max += mult;
height += getHeight(world, mut) * mult;
}
}
}
height /= max;
return MathHelper.clamp(height, 0, 1);
}
private void makeBoundingBox() {
int minX = MHelper.floor(center.getX() - radius - 8);
int minY = MHelper.floor(center.getX() - depth - 8);
int minZ = MHelper.floor(center.getZ() - radius - 8);
int maxX = MHelper.floor(center.getX() + radius + 8);
int maxY = MHelper.floor(center.getY() + depth + 8);
int maxZ = MHelper.floor(center.getZ() + radius + 8);
this.boundingBox = new BlockBox(minX, minY, minZ, maxX, maxY, maxZ);
}
}