mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert PaletteInfo to record

Browse Source
This commit is contained in:
dfsek 2021-12-04 19:51:03 -07:00
parent b52e00a842
commit ec77519923
3 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java
View File

@ -77,8 +77,8 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class); PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
int sea = paletteInfo.getSeaLevel(); int sea = paletteInfo.seaLevel();
Palette seaPalette = paletteInfo.getOcean(); Palette seaPalette = paletteInfo.ocean();
BlockState data; BlockState data;
for(int y = world.getMaxHeight() - 1; y >= world.getMinHeight(); y--) { for(int y = world.getMaxHeight() - 1; y >= world.getMinHeight(); y--) {
@ -125,8 +125,8 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
else level = 0; else level = 0;
} }
return palette.get(level, x, y, z, world.getSeed()); return palette.get(level, x, y, z, world.getSeed());
} else if(y <= paletteInfo.getSeaLevel()) { } else if(y <= paletteInfo.seaLevel()) {
return paletteInfo.getOcean().get(paletteInfo.getSeaLevel() - y, x, y, z, world.getSeed()); return paletteInfo.ocean().get(paletteInfo.seaLevel() - y, x, y, z, world.getSeed());
} else return air; } else return air;
} }

4
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java
View File

@ -20,7 +20,7 @@ public final class PaletteUtil {
private static final double DERIVATIVE_DIST = 0.55; private static final double DERIVATIVE_DIST = 0.55;
public static Palette getPalette(int x, int y, int z, Sampler3D sampler, PaletteInfo paletteInfo) { public static Palette getPalette(int x, int y, int z, Sampler3D sampler, PaletteInfo paletteInfo) {
SlantHolder slant = paletteInfo.getSlantHolder(); SlantHolder slant = paletteInfo.slantHolder();
if(slant != null) { if(slant != null) {
double slope = derivative(sampler, x, y, z); double slope = derivative(sampler, x, y, z);
if(slope > slant.getMinSlope()) { if(slope > slant.getMinSlope()) {
@ -28,7 +28,7 @@ public final class PaletteUtil {
} }
} }
return paletteInfo.getPaletteHolder().getPalette(y); return paletteInfo.paletteHolder().getPalette(y);
} }
public static double derivative(Sampler3D sampler, double x, double y, double z) { public static double derivative(Sampler3D sampler, double x, double y, double z) {

33
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteInfo.java
View File

@ -11,33 +11,8 @@ import com.dfsek.terra.api.properties.Properties;
import com.dfsek.terra.api.world.chunk.generation.util.Palette; import com.dfsek.terra.api.world.chunk.generation.util.Palette;
public class PaletteInfo implements Properties { public record PaletteInfo(PaletteHolder paletteHolder,
private final PaletteHolder paletteHolder; SlantHolder slantHolder,
private final SlantHolder slantHolder; Palette ocean,
private final Palette ocean; int seaLevel) implements Properties {
private final int seaLevel;
public PaletteInfo(PaletteHolder paletteHolder, SlantHolder slantHolder, Palette ocean, int seaLevel) {
this.paletteHolder = paletteHolder;
this.slantHolder = slantHolder;
this.ocean = ocean;
this.seaLevel = seaLevel;
}
public Palette getOcean() {
return ocean;
}
public PaletteHolder getPaletteHolder() {
return paletteHolder;
}
public SlantHolder getSlantHolder() {
return slantHolder;
}
public int getSeaLevel() {
return seaLevel;
}
} }