From 8c0cbfe93a26d4a7b45ca77d2a21df9f165ef3ac Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 31 Aug 2020 16:20:24 -0400 Subject: [PATCH] Fix text renderer --- .../com/volmit/iris/gen/ParallaxChunkGenerator.java | 11 ++++++----- .../com/volmit/iris/object/IrisTextPlacement.java | 13 ++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java b/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java index a97c95662..5bba7c72b 100644 --- a/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java @@ -226,7 +226,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple return getParallaxChunk(x >> 4, z >> 4).getStructure(this, y); } - protected void onGenerateParallax(RNG random, int x, int z) + protected void onGenerateParallax(RNG randomx, int x, int z) { String key = "par." + x + "." + z; ChunkPosition rad = getDimension().getParallaxSize(this); @@ -240,6 +240,8 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple { int j = jj; + RNG random = getMasterRandom().nextParallelRNG(i).nextParallelRNG(j); + if(isParallaxGenerated(ii, jj)) { continue; @@ -254,7 +256,6 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple { IrisBiome b = sampleTrueBiome((i * 16) + 7, (j * 16) + 7).getBiome(); RNG ro = getMasterRandom().nextParallelRNG(496888 + i + j); - int g = 1; searching: for(IrisBiomeMutation k : getDimension().getMutations()) @@ -294,7 +295,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple lockq.lock(); q.add(() -> { - k.place(this, random.nextParallelRNG(-7228), i, j); + k.place(this, random.nextParallelRNG(-7228 + (34 * ((i * 30) + (j * 30)) * i * j) + i - j + 1569962), i, j); }); lockq.unlock(); } @@ -304,7 +305,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple lockq.lock(); q.add(() -> { - k.place(this, random.nextParallelRNG(-4228), i, j); + k.place(this, random.nextParallelRNG(-4228 + -7228 + (34 * ((i * 30) + (j * 30)) * i * j) + i - j + 1569962), i, j); }); lockq.unlock(); } @@ -314,7 +315,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple lockq.lock(); q.add(() -> { - k.place(this, random.nextParallelRNG(-22228), i, j); + k.place(this, random.nextParallelRNG(-22228 + -4228 + -7228 + (34 * ((i * 30) + (j * 30)) * i * j) + i - j + 1569962), i, j); }); lockq.unlock(); } diff --git a/src/main/java/com/volmit/iris/object/IrisTextPlacement.java b/src/main/java/com/volmit/iris/object/IrisTextPlacement.java index 54f8b608c..be6575534 100644 --- a/src/main/java/com/volmit/iris/object/IrisTextPlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisTextPlacement.java @@ -1,6 +1,5 @@ package com.volmit.iris.object; -import com.volmit.iris.Iris; import com.volmit.iris.gen.ParallaxChunkGenerator; import com.volmit.iris.gen.atomics.AtomicCache; import com.volmit.iris.util.ArrayType; @@ -107,16 +106,16 @@ public class IrisTextPlacement return m; } - public void place(ParallaxChunkGenerator g, RNG rngf, int x, int z) + public void place(ParallaxChunkGenerator g, RNG rng, int x, int z) { - RNG rngg = rngf.nextParallelRNG(x).nextParallelRNG(z); - for(int i = 0; i < getConfig().getTriesForChunk(rngg); i++) + int tr = getConfig().getTriesForChunk(rng); + + for(int i = 0; i < tr; i++) { - RNG rng = rngg.nextParallelRNG((i * 3 + 8) - 23040); + rng = rng.nextParallelRNG((i * 3 + 8) - 23040); int xb = (x * 16) + rng.nextInt(16); int zb = (z * 16) + rng.nextInt(16); - Iris.info("Placing at " + xb + " " + zb); - getRender().get(rng.nextInt(getRender().size())).place(g, rngg, getConfig(), xb, zb); + getRender().get(rng.nextInt(getRender().size())).place(g, rng, getConfig(), xb, zb); } } }