Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-29 20:19:06 +00:00
Code Issues Releases Activity

Tweaks

Browse Source
This commit is contained in:
Daniel Mills
2020-08-19 02:18:31 -04:00
parent 4dfd033435
commit b8c4d66160
7 changed files with 131 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java
View File

@@ -704,8 +704,8 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
catch(Throwable e)
{
e.printStackTrace();
Iris.warn("Failed to sample hi biome at " + rx + " " + rz + " using the generator " + gen.getLoadKey());
fail(e);
}
return 0;
});
@@ -727,8 +727,8 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
catch(Throwable e)
{
e.printStackTrace();
Iris.warn("Failed to sample lo biome at " + rx + " " + rz + " using the generator " + gen.getLoadKey());
fail(e);
}
return 0;

24
src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java
View File

@@ -27,8 +27,6 @@ public class GenLayerBiome extends GenLayer
private BiomeDataProvider landProvider;
private BiomeDataProvider shoreProvider;
private BiomeDataProvider caveProvider;
private BiomeDataProvider islandProvider;
private BiomeDataProvider skylandProvider;
private DimensionChunkGenerator iris;
public GenLayerBiome(DimensionChunkGenerator iris, RNG rng)
@@ -39,8 +37,6 @@ public class GenLayerBiome extends GenLayer
landProvider = new BiomeDataProvider(this, InferredType.LAND, rng);
shoreProvider = new BiomeDataProvider(this, InferredType.SHORE, rng);
caveProvider = new BiomeDataProvider(this, InferredType.CAVE, rng);
islandProvider = new BiomeDataProvider(this, InferredType.ISLAND, rng);
skylandProvider = new BiomeDataProvider(this, InferredType.SKYLAND, rng);
regionGenerator = iris.getDimension().getRegionStyle().create(rng.nextParallelRNG(1188519)).bake().scale(1D / iris.getDimension().getRegionZoom());
bridgeGenerator = iris.getDimension().getContinentalStyle().create(rng.nextParallelRNG(1541462)).bake().scale(1D / iris.getDimension().getContinentZoom());
}
@@ -91,16 +87,6 @@ public class GenLayerBiome extends GenLayer
return caveProvider;
}
else if(type.equals(InferredType.ISLAND))
{
return islandProvider;
}
else if(type.equals(InferredType.SKYLAND))
{
return skylandProvider;
}
else
{
Iris.error("Cannot find a BiomeDataProvider for type " + type.name());
@@ -119,18 +105,20 @@ public class GenLayerBiome extends GenLayer
double x = bx;
double z = bz;
double c = iris.getDimension().getLandChance();
InferredType bridge;
if(c >= 1)
{
return InferredType.LAND;
bridge = InferredType.LAND;
}
if(c <= 0)
{
return InferredType.SEA;
bridge = InferredType.SEA;
}
return bridgeGenerator.fitDouble(0, 1, x, z) < c ? InferredType.LAND : InferredType.SEA;
bridge = bridgeGenerator.fitDouble(0, 1, x, z) < c ? InferredType.LAND : InferredType.SEA;
return bridge;
}
public BiomeResult generateBiomeData(double bx, double bz, IrisRegion regionData, CNG cell, KList<IrisBiome> biomes, InferredType inferredType)