mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 10:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Daniel Mills 2020-08-04 00:34:52 -04:00
parent 58b00b6ed5
commit a7428838b3
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,9 +24,7 @@ public class BiomeDataProvider
public BiomeResult generatePureData(double bx, double bz, int rawX, int rawZ, IrisRegion regionData) public BiomeResult generatePureData(double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
{ {
getGenerator().setShuffle(12); getGenerator().setShuffle(regionData.getBiomeShuffle());
double zoom = (layer.getIris().getDimension().getBiomeZoom() * regionData.getBiomeZoom(getType())) * 3.15;
getGenerator().setCellScale(1D / zoom);
return layer.generateBiomeData(bx, bz, regionData, getGenerator(), regionData.getBiomes(getType()), getType()); return layer.generateBiomeData(bx, bz, regionData, getGenerator(), regionData.getBiomes(getType()), getType());
} }

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

@ -53,7 +53,7 @@ public class GenLayerBiome extends GenLayer
return null; return null;
} }
regionGenerator.setShuffle(8); regionGenerator.setShuffle(11);
regionGenerator.setCellScale(0.33 / iris.getDimension().getRegionZoom()); regionGenerator.setCellScale(0.33 / iris.getDimension().getRegionZoom());
double x = bx / iris.getDimension().getBiomeZoom(); double x = bx / iris.getDimension().getBiomeZoom();
double z = bz / iris.getDimension().getBiomeZoom(); double z = bz / iris.getDimension().getBiomeZoom();
@ -133,8 +133,8 @@ public class GenLayerBiome extends GenLayer
return new BiomeResult(null, 0); return new BiomeResult(null, 0);
} }
double x = bx / iris.getDimension().getBiomeZoom(); double x = bx / (iris.getDimension().getBiomeZoom() * regionData.getBiomeZoom(inferredType));
double z = bz / iris.getDimension().getBiomeZoom(); double z = bz / (iris.getDimension().getBiomeZoom() * regionData.getBiomeZoom(inferredType));
IrisBiome biome = cell.get(x, z, biomes); IrisBiome biome = cell.get(x, z, biomes);
biome.setInferredType(inferredType); biome.setInferredType(inferredType);

3
src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java
View File

@ -162,11 +162,10 @@ public class GenLayerCave extends GenLayer
Material e = data.getType(y + 3); Material e = data.getType(y + 3);
Material f = data.getType(y - 1); Material f = data.getType(y - 1);
if(can(a) && canAir(c) && canAir(f) && canWater(d) && canAir(d) && canWater(e)) if(can(a) && canAir(c) && canAir(f) && canWater(d) && canWater(e))
{ {
data.set(y, CAVE_AIR); data.set(y, CAVE_AIR);
data.set(y + 1, CAVE_AIR); data.set(y + 1, CAVE_AIR);
data.set(y + 2, CAVE_AIR);
return true; return true;
} }

4
src/main/java/com/volmit/iris/object/IrisRegion.java
View File

@ -29,6 +29,10 @@ public class IrisRegion extends IrisRegistrant
@DontObfuscate @DontObfuscate
@Desc("The min shore height") @Desc("The min shore height")
private double shoreHeightMin = 1.2; private double shoreHeightMin = 1.2;
@DontObfuscate
@Desc("The scrambling between biomes")
private double biomeShuffle = 11;
@DontObfuscate @DontObfuscate
@Desc("The the max shore height") @Desc("The the max shore height")