diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index 765bb63fd..c1a003cd6 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -103,8 +103,6 @@ public class IrisComplex implements DataProvider { case SHORE: return shoreBiomeStream; case DEFER: - case LAKE: - case RIVER: default: break; } diff --git a/src/main/java/com/volmit/iris/engine/object/biome/InferredType.java b/src/main/java/com/volmit/iris/engine/object/biome/InferredType.java index db9a22215..121ca032e 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/InferredType.java +++ b/src/main/java/com/volmit/iris/engine/object/biome/InferredType.java @@ -34,12 +34,6 @@ public enum InferredType { @Desc("Represents any cave biome type") CAVE, - @Desc("Represents any river biome type") - RIVER, - - @Desc("Represents any lake biome type") - LAKE, - @Desc("Defers the type to whatever another biome type that already exists is.") DEFER } diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java index d2266fa4c..7b0dc82b5 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java @@ -548,22 +548,8 @@ public class IrisBiome extends IrisRegistrant implements IRare { return inferredType.equals(InferredType.SEA); } - public boolean isLake() { - if (inferredType == null) { - return false; - } - return inferredType.equals(InferredType.LAKE); - } - - public boolean isRiver() { - if (inferredType == null) { - return false; - } - return inferredType.equals(InferredType.RIVER); - } - public boolean isAquatic() { - return isSea() || isLake() || isRiver(); + return isSea(); } @SuppressWarnings("BooleanMethodIsAlwaysInverted") diff --git a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java index 5ed5eb8ce..635c662ef 100644 --- a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java @@ -173,21 +173,6 @@ public class IrisDimension extends IrisRegistrant { @Desc("The placement style of biomes") private IrisGeneratorStyle caveBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @Desc("The placement style of biomes") - private IrisGeneratorStyle riverBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - - @Desc("The placement style of biomes") - private IrisGeneratorStyle lakeBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - - @Desc("The placement style of biomes") - private IrisGeneratorStyle islandBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - - @Desc("The placement style of biomes") - private IrisGeneratorStyle islandBiomeChanceStyle = NoiseStyle.CELLULAR_HEIGHT_IRIS_DOUBLE.style(); - - @Desc("The placement style of biomes") - private IrisGeneratorStyle skylandBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @Desc("Generate caves or not.") private boolean caves = true; @@ -452,10 +437,6 @@ public class IrisDimension extends IrisRegistrant { switch (type) { case CAVE: return caveBiomeStyle; - case LAKE: - return lakeBiomeStyle; - case RIVER: - return riverBiomeStyle; case LAND: return landBiomeStyle; case SEA: diff --git a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java index 906e9c6a4..2541a3ee1 100644 --- a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java @@ -128,14 +128,6 @@ public class IrisRegion extends IrisRegistrant implements IRare { @Desc("How large shore biomes are in this region") private double shoreBiomeZoom = 1; - @MinNumber(0.0001) - @Desc("How large lake biomes are in this region") - private double lakeBiomeZoom = 1; - - @MinNumber(0.0001) - @Desc("How large river biomes are in this region") - private double riverBiomeZoom = 1; - @MinNumber(0.0001) @Desc("How large sea biomes are in this region") private double seaBiomeZoom = 1; @@ -167,16 +159,6 @@ public class IrisRegion extends IrisRegistrant implements IRare { @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList shoreBiomes = new KList<>(); - @RegistryListResource(IrisBiome.class) - @ArrayType(min = 1, type = String.class) - @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") - private KList riverBiomes = new KList<>(); - - @RegistryListResource(IrisBiome.class) - @ArrayType(min = 1, type = String.class) - @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") - private KList lakeBiomes = new KList<>(); - @RegistryListResource(IrisBiome.class) @ArrayType(min = 1, type = String.class) @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") @@ -275,42 +257,10 @@ public class IrisRegion extends IrisRegistrant implements IRare { }); } - public boolean isRiver(RNG rng, double x, double z) { - if (!isRivers()) { - return false; - } - - if (getRiverBiomes().isEmpty()) { - return false; - } - - if (getRiverChanceGen().aquire(() -> getRiverChanceStyle().create(rng, getLoader())).fit(1, getRiverRarity(), x, z) != 1) { - return false; - } - - return getRiverGen().aquire(() -> getRiverStyle().create(rng, getLoader())).fitDouble(0, 1, x, z) < getRiverThickness(); - } - - public boolean isLake(RNG rng, double x, double z) { - if (!isLakes()) { - return false; - } - - if (getLakeBiomes().isEmpty()) { - return false; - } - - return getLakeGen().aquire(() -> getLakeStyle().create(rng, getLoader())).fit(1, getLakeRarity(), x, z) == 1; - } - public double getBiomeZoom(InferredType t) { switch (t) { case CAVE: return caveBiomeZoom; - case LAKE: - return lakeBiomeZoom; - case RIVER: - return riverBiomeZoom; case LAND: return landBiomeZoom; case SEA: @@ -358,8 +308,6 @@ public class IrisRegion extends IrisRegistrant implements IRare { names.addAll(caveBiomes); names.addAll(seaBiomes); names.addAll(shoreBiomes); - names.addAll(riverBiomes); - names.addAll(lakeBiomes); spotBiomes.forEach((i) -> names.add(i.getBiome())); ridgeBiomes.forEach((i) -> names.add(i.getBiome())); @@ -402,10 +350,6 @@ public class IrisRegion extends IrisRegistrant implements IRare { return getRealShoreBiomes(g); } else if (type.equals(InferredType.CAVE)) { return getRealCaveBiomes(g); - } else if (type.equals(InferredType.LAKE)) { - return getRealLakeBiomes(g); - } else if (type.equals(InferredType.RIVER)) { - return getRealRiverBiomes(g); } return new KList<>(); @@ -424,32 +368,6 @@ public class IrisRegion extends IrisRegistrant implements IRare { }); } - public KList getRealLakeBiomes(DataProvider g) { - return realLakeBiomes.aquire(() -> - { - KList realLakeBiomes = new KList<>(); - - for (String i : getLakeBiomes()) { - realLakeBiomes.add(g.getData().getBiomeLoader().load(i)); - } - - return realLakeBiomes; - }); - } - - public KList getRealRiverBiomes(DataProvider g) { - return realRiverBiomes.aquire(() -> - { - KList realRiverBiomes = new KList<>(); - - for (String i : getRiverBiomes()) { - realRiverBiomes.add(g.getData().getBiomeLoader().load(i)); - } - - return realRiverBiomes; - }); - } - public KList getRealShoreBiomes(DataProvider g) { return realShoreBiomes.aquire(() -> { @@ -496,8 +414,6 @@ public class IrisRegion extends IrisRegistrant implements IRare { names.addAll(caveBiomes); names.addAll(seaBiomes); names.addAll(shoreBiomes); - names.addAll(riverBiomes); - names.addAll(lakeBiomes); spotBiomes.forEach((i) -> names.add(i.getBiome())); ridgeBiomes.forEach((i) -> names.add(i.getBiome())); diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java index 14e9df2b8..999a5b349 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java +++ b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java @@ -79,17 +79,17 @@ public class IrisSpawner extends IrisRegistrant { public boolean isValid(IrisBiome biome) { return switch (group) { case NORMAL -> switch (biome.getInferredType()) { - case SHORE, SEA, CAVE, RIVER, LAKE, DEFER -> false; + case SHORE, SEA, CAVE, DEFER -> false; case LAND -> true; }; case CAVE -> true; case UNDERWATER -> switch (biome.getInferredType()) { - case SHORE, LAND, CAVE, RIVER, LAKE, DEFER -> false; + case SHORE, LAND, CAVE, DEFER -> false; case SEA -> true; }; case BEACH -> switch (biome.getInferredType()) { case SHORE -> true; - case LAND, CAVE, RIVER, LAKE, SEA, DEFER -> false; + case LAND, CAVE, SEA, DEFER -> false; }; }; }