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

Structure tile seed cohesion

Browse Source
This commit is contained in:
Daniel Mills 2020-09-04 03:48:47 -04:00
parent fad17c9cd2
commit ab4bee5d69
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/volmit/iris/object/IrisStructurePlacement.java
View File

@ -69,8 +69,8 @@ public class IrisStructurePlacement
{ {
try try
{ {
RNG rng = g.getMasterRandom().nextParallelRNG(-88738456); RNG rng = g.getMasterRandom().nextParallelRNG(-88738456 + rngno.nextInt());
RNG rnp = rng.nextParallelRNG(cx - (cz * cz << 3)); RNG rnp = rng.nextParallelRNG(cx - (cz * cz << 3) + rngno.nextInt());
int s = gridSize(g) - (getStructure(g).isMergeEdges() ? 1 : 0); int s = gridSize(g) - (getStructure(g).isMergeEdges() ? 1 : 0);
int sh = gridHeight(g) - (getStructure(g).isMergeEdges() ? 1 : 0); int sh = gridHeight(g) - (getStructure(g).isMergeEdges() ? 1 : 0);
KSet<ChunkPosition> m = new KSet<>(); KSet<ChunkPosition> m = new KSet<>();
@ -183,19 +183,19 @@ public class IrisStructurePlacement
return false; return false;
} }
if(getChanceGenerator(random).getIndex(x / zoom, y / zoom, z / zoom, getRarity()) == getRarity() / 2) if(getChanceGenerator(g, random).getIndex(x / zoom, y / zoom, z / zoom, getRarity()) == getRarity() / 2)
{ {
return ratio > 0 ? getChanceGenerator(random).getDistance(x / zoom, z / zoom) > ratio : getChanceGenerator(random).getDistance(x / zoom, z / zoom) < Math.abs(ratio); return ratio > 0 ? getChanceGenerator(g, random).getDistance(x / zoom, z / zoom) > ratio : getChanceGenerator(g, random).getDistance(x / zoom, z / zoom) < Math.abs(ratio);
} }
return false; return false;
} }
public CellGenerator getChanceGenerator(RNG random) public CellGenerator getChanceGenerator(ParallaxChunkGenerator g, RNG random)
{ {
return chanceCell.aquire(() -> return chanceCell.aquire(() ->
{ {
CellGenerator chanceCell = new CellGenerator(random.nextParallelRNG(-72346)); CellGenerator chanceCell = new CellGenerator(g.getMasterRandom().nextParallelRNG(-72346).nextParallelRNG((height + 10000) * rarity));
chanceCell.setCellScale(1D); chanceCell.setCellScale(1D);
chanceCell.setShuffle(getShuffle()); chanceCell.setShuffle(getShuffle());
return chanceCell; return chanceCell;