PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-30 16:28:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.20.4' into 1.21

Browse source
This commit is contained in:
Sollace 2024-10-14 19:20:23 +01:00
commit 9907d3c907
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/main/java/com/minelittlepony/unicopia/server/world/gen/CloudCarver.java
View file

@ -27,11 +27,6 @@ import net.minecraft.world.gen.chunk.AquiferSampler;
import net.minecraft.world.gen.densityfunction.DensityFunction.NoisePos; import net.minecraft.world.gen.densityfunction.DensityFunction.NoisePos;
public class CloudCarver extends CaveCarver { public class CloudCarver extends CaveCarver {
private Random random;
private final LongSet topWrittenPositions = new LongOpenHashSet();
public CloudCarver(Codec<CaveCarverConfig> codec) { public CloudCarver(Codec<CaveCarverConfig> codec) {
super(codec); super(codec);
} }
@ -62,25 +57,13 @@ public class CloudCarver extends CaveCarver {
ChunkPos chunkPos, ChunkPos chunkPos,
CarvingMask carvingMask CarvingMask carvingMask
) { ) {
this.random = random; CloudCarverContext carverContext = new CloudCarverContext(sampler, random);
boolean result = super.carve(context, config, chunk, function, random, new AquiferSampler() { boolean result = super.carve(context, config, chunk, function, random, carverContext, chunkPos, carvingMask);
@Override
public BlockState apply(NoisePos pos, double density) {
BlockState state = sampler.apply(pos, density);
return state != null && state.isAir() ? UBlocks.CLOUD.getDefaultState() : state;
}
@Override
public boolean needsFluidTick() {
return sampler.needsFluidTick();
}
}, chunkPos, carvingMask);
BlockPos.Mutable mutable = new BlockPos.Mutable(); BlockPos.Mutable mutable = new BlockPos.Mutable();
topWrittenPositions.forEach(l -> { carverContext.topWrittenPositions.forEach(l -> {
processSurfaceBlocks(mutable.set(l), context, config, chunk, random); processSurfaceBlocks(mutable.set(l), context, config, chunk, random);
}); });
topWrittenPositions.clear(); carverContext.topWrittenPositions.clear();
return result; return result;
} }
@ -99,17 +82,17 @@ public class CloudCarver extends CaveCarver {
CarvingMask mask, CarvingMask mask,
Carver.SkipPredicate skipPredicate Carver.SkipPredicate skipPredicate
) { ) {
if (random == null) { if (!(aquiferSampler instanceof CloudCarverContext c)) {
return; return;
} }
int maxY = context.getMinY() + context.getHeight(); int maxY = context.getMinY() + context.getHeight();
int bubbleCount = 10 + random.nextInt(12); int bubbleCount = 10 + c.random.nextInt(12);
for (int i = 0; i < bubbleCount; i++) { for (int i = 0; i < bubbleCount; i++) {
double width = 1.5 * xScale + random.nextTriangular(3, 2); double width = 1.5 * xScale +c.random.nextTriangular(3, 2);
double height = Math.min(width * yScale * (1 + random.nextFloat() * 2) + MathHelper.sin((float) (Math.PI / 2)) * xScale, maxY - y); double height = Math.min(width * yScale * (1 + c.random.nextFloat() * 2) + MathHelper.sin((float) (Math.PI / 2)) * xScale, maxY - y);
double bubbleX = x + (random.nextFloat() * 2 - 1) * width; double bubbleX = x + (c.random.nextFloat() * 2 - 1) * width;
double bubbleZ = z + (random.nextFloat() * 2 - 1) * width; double bubbleZ = z + (c.random.nextFloat() * 2 - 1) * width;
carveRegion(context, config, chunk, posToBiome, aquiferSampler, bubbleX + 1.0, y, bubbleZ, width, height, mask, skipPredicate); carveRegion(context, config, chunk, posToBiome, aquiferSampler, bubbleX + 1.0, y, bubbleZ, width, height, mask, skipPredicate);
} }
} }
@ -136,17 +119,17 @@ public class CloudCarver extends CaveCarver {
CarvingMask mask, CarvingMask mask,
Carver.SkipPredicate skipPredicate Carver.SkipPredicate skipPredicate
) { ) {
if (random == null) { if (!(aquiferSampler instanceof CloudCarverContext c)) {
return; return;
} }
int maxY = context.getMinY() + context.getHeight(); int maxY = context.getMinY() + context.getHeight();
int bubbleCount = 10 + random.nextInt(12); int bubbleCount = 10 + c.random.nextInt(12);
for (int i = 0; i < bubbleCount; i++) { for (int i = 0; i < bubbleCount; i++) {
double width = /*1.5 + MathHelper.sin((float) (Math.PI / 2)) * xScale +*/ 1.5 * horizontalScale + random.nextInt(3) + w; double width = /*1.5 + MathHelper.sin((float) (Math.PI / 2)) * xScale +*/ 1.5 * horizontalScale + c.random.nextInt(3) + w;
double height = width * (1 + random.nextFloat() * 2) * verticalScale * 0.2; double height = width * (1 + c.random.nextFloat() * 2) * verticalScale * 0.2;
double bubbleX = x + (random.nextFloat() * 2 - 1) * width * 1.5; double bubbleX = x + (c.random.nextFloat() * 2 - 1) * width * 1.5;
double bubbleZ = z + (random.nextFloat() * 2 - 1) * width * 1.5; double bubbleZ = z + (c.random.nextFloat() * 2 - 1) * width * 1.5;
double bubbleY = y + random.nextFloat() * height * 0.5; double bubbleY = y + c.random.nextFloat() * height * 0.5;
if (bubbleY + height < maxY) { if (bubbleY + height < maxY) {
carveRegion(context, config, chunk, posToBiome, aquiferSampler, bubbleX, bubbleY, bubbleZ, width, height, mask, skipPredicate); carveRegion(context, config, chunk, posToBiome, aquiferSampler, bubbleX, bubbleY, bubbleZ, width, height, mask, skipPredicate);
} }
@ -168,10 +151,12 @@ public class CloudCarver extends CaveCarver {
) { ) {
if (super.carveAtPoint(context, config, chunk, posToBiome, mask, pos, tmp, aquiferSampler, replacedGrassy)) { if (super.carveAtPoint(context, config, chunk, posToBiome, mask, pos, tmp, aquiferSampler, replacedGrassy)) {
tmp.set(pos).move(Direction.DOWN); tmp.set(pos).move(Direction.DOWN);
if (!topWrittenPositions.isEmpty()) { if (aquiferSampler instanceof CloudCarverContext c) {
topWrittenPositions.remove(tmp.asLong()); if (!c.topWrittenPositions.isEmpty()) {
c.topWrittenPositions.remove(tmp.asLong());
}
c.topWrittenPositions.add(pos.asLong());
} }
topWrittenPositions.add(pos.asLong());
if (chunk.getBlockState(tmp).isOf(UBlocks.SOGGY_CLOUD)) { if (chunk.getBlockState(tmp).isOf(UBlocks.SOGGY_CLOUD)) {
chunk.setBlockState(tmp, UBlocks.CLOUD.getDefaultState(), false); chunk.setBlockState(tmp, UBlocks.CLOUD.getDefaultState(), false);
} }
@ -185,4 +170,27 @@ public class CloudCarver extends CaveCarver {
chunk.setBlockState(pos.move(Direction.DOWN), UBlocks.SOGGY_CLOUD.getDefaultState(), false); chunk.setBlockState(pos.move(Direction.DOWN), UBlocks.SOGGY_CLOUD.getDefaultState(), false);
} }
} }
static class CloudCarverContext implements AquiferSampler {
private final AquiferSampler sampler;
public final LongSet topWrittenPositions = new LongOpenHashSet();
public final Random random;
public CloudCarverContext(AquiferSampler sampler, Random random) {
this.sampler = sampler;
this.random = random;
}
@Override
public BlockState apply(NoisePos pos, double density) {
BlockState state = sampler.apply(pos, density);
return state != null && state.isAir() ? UBlocks.CLOUD.getDefaultState() : state;
}
@Override
public boolean needsFluidTick() {
return sampler.needsFluidTick();
}
}
} }