diff --git a/src/main/java/mod/bluestaggo/modernerbeta/util/random/BedrockWorldgenRandom.java b/src/main/java/mod/bluestaggo/modernerbeta/util/random/BedrockWorldgenRandom.java index 513e828a..55b51dd5 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/util/random/BedrockWorldgenRandom.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/util/random/BedrockWorldgenRandom.java @@ -11,9 +11,9 @@ public class BedrockWorldgenRandom extends WorldgenRandom { @Override public void setLargeFeatureSeed(long worldSeed, int chunkX, int chunkZ) { this.setSeed(worldSeed); - int randX = this.nextInt(); - int randZ = this.nextInt(); - long seed = (long)chunkX * randX ^ (long)chunkZ * randZ ^ worldSeed; + long randX = this.nextInt() >>> 1; + long randZ = this.nextInt() >>> 1; + long seed = chunkX * randX ^ chunkZ * randZ ^ worldSeed; this.setSeed(seed); } } diff --git a/src/main/java/mod/bluestaggo/modernerbeta/util/random/mersenne/MersenneTwister.java b/src/main/java/mod/bluestaggo/modernerbeta/util/random/mersenne/MersenneTwister.java index 46573710..6b84e731 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/util/random/mersenne/MersenneTwister.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/util/random/mersenne/MersenneTwister.java @@ -18,7 +18,7 @@ public class MersenneTwister { private static final int DEFAULT_SEED = 4357; private static final int[] MAG_01 = { 0x0, MATRIX_A }; - private final int mt[]; + private final int[] mt; public int mti; private int mtiFast; @@ -78,6 +78,7 @@ public class MersenneTwister { for (this.mti = 1; this.mti < N; this.mti++) { this.mt[this.mti] = (1812433253 * (this.mt[this.mti-1] ^ (this.mt[this.mti-1] >>> 30)) + this.mti); } + this.mtiFast = N; } public synchronized void initFast(int seed) { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/world/chunk/ModernBetaChunkGenerator.java b/src/main/java/mod/bluestaggo/modernerbeta/world/chunk/ModernBetaChunkGenerator.java index 19fb8cf5..c43bcd2d 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/world/chunk/ModernBetaChunkGenerator.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/world/chunk/ModernBetaChunkGenerator.java @@ -317,9 +317,7 @@ public class ModernBetaChunkGenerator extends NoiseBasedChunkGenerator { configuredCarver.carve(carverContext, chunk, biomeAccessWithSource::getBiome, random, aquiferSampler, carverPos, carvingMask); } - if (seedMethod != CaveGeneration.SeedMethod.BEDROCK) { - ++salt; - } + ++salt; } } }