God dammit lombok

This commit is contained in:
Daniel Mills
2020-09-09 22:25:34 -04:00
parent 087ab3815f
commit 5bd22f25b8
66 changed files with 427 additions and 872 deletions

View File

@@ -1,13 +1,16 @@
package com.volmit.iris.gen.layer;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.object.InferredType;
import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.object.IrisGeneratorStyle;
import com.volmit.iris.object.IrisRegion;
import com.volmit.iris.util.RNG;
import lombok.Data;
import lombok.NonNull;
@Data
public class BiomeDataProvider
@@ -16,11 +19,19 @@ public class BiomeDataProvider
private CNG generator;
private GenLayerBiome layer;
public BiomeDataProvider(GenLayerBiome layer, InferredType type, RNG rng)
public BiomeDataProvider(@NonNull GenLayerBiome layer, @NonNull InferredType type, @NonNull RNG rng)
{
this.type = type;
this.layer = layer;
generator = layer.getIris().getDimension().getBiomeStyle(type).create(rng.nextParallelRNG(4645079 + (type.ordinal() * 23845)));
IrisGeneratorStyle b = layer.getIris().getDimension().getBiomeStyle(type);
if(b == null)
{
Iris.error("BIOME STYLE IS NULL FOR " + type);
}
generator = b.create(rng.nextParallelRNG(4645079 + (type.ordinal() * 23845)));
}
public IrisBiome generatePureData(ContextualTerrainProvider g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)

View File

@@ -15,6 +15,7 @@ import com.volmit.iris.util.RNG;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
@Data
@EqualsAndHashCode(callSuper = false)
@@ -32,7 +33,7 @@ public class GenLayerBiome extends GenLayer
private BiomeDataProvider lakeProvider;
private DimensionalTerrainProvider iris;
public GenLayerBiome(DimensionalTerrainProvider iris, RNG rng)
public GenLayerBiome(@NonNull DimensionalTerrainProvider iris, @NonNull RNG rng)
{
super(iris, rng);
this.iris = iris;

View File

@@ -29,7 +29,7 @@ public class GenLayerCave extends GenLayer
public GenLayerCave(DimensionalTerrainProvider iris, RNG rng)
{
//@builder
//@NoArgsConstructor
super(iris, rng);
gg = new FastNoiseDouble(324895 * rng.nextParallelRNG(49678).imax());
//@done