MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Terrain generator enhancements

Browse source
This commit is contained in:
paulevsGitch 2021-07-09 01:50:08 +03:00
parent fc3b6ea5b2
commit 3086f6181b
2 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/ru/betterend/world/generator/TerrainBoolCache.java Normal file
View file

@ -0,0 +1,21 @@
package ru.betterend.world.generator;
public class TerrainBoolCache {
private byte[] data = new byte[16384];
public static int scaleCoordinate(int value) {
return value >> 7;
}
private int getIndex(int x, int z) {
return x << 7 | z;
}
public void setData(int x, int z, byte value) {
data[getIndex(x & 127, z & 127)] = value;
}
public byte getData(int x, int z) {
return data[getIndex(x & 127, z & 127)];
}
}

38
src/main/java/ru/betterend/world/generator/TerrainGenerator.java
View file

@ -1,6 +1,9 @@
package ru.betterend.world.generator;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.util.Mth;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.BiomeSource;
@ -9,11 +12,15 @@ import ru.betterend.noise.OpenSimplexNoise;
import java.awt.Point;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.IntStream;
public class TerrainGenerator {
private static final Map<Point, TerrainBoolCache> TERRAIN_BOOL_CACHE_MAP = Maps.newHashMap();
private static final ReentrantLock LOCKER = new ReentrantLock();
private static final Point POS = new Point();
private static final double SCALE_XZ = 8.0;
private static final double SCALE_Y = 4.0;
private static final float[] COEF;
@ -25,10 +32,6 @@ public class TerrainGenerator {
private static OpenSimplexNoise noise1;
private static OpenSimplexNoise noise2;
/*public static boolean canGenerate(int x, int z) {
return GeneratorOptions.noRingVoid() || (long) x + (long) z > CENTER;
}*/
public static void initNoise(long seed) {
Random random = new Random(seed);
largeIslands = new IslandLayer(random.nextInt(), GeneratorOptions.bigOptions);
@ -99,7 +102,25 @@ public class TerrainGenerator {
* @param z - biome pos z
*/
public static boolean isLand(int x, int z) {
int sectionX = TerrainBoolCache.scaleCoordinate(x);
int sectionZ = TerrainBoolCache.scaleCoordinate(z);
LOCKER.lock();
POS.setLocation(sectionX, sectionZ);
TerrainBoolCache section = TERRAIN_BOOL_CACHE_MAP.get(POS);
if (section == null) {
if (TERRAIN_BOOL_CACHE_MAP.size() > 64) {
TERRAIN_BOOL_CACHE_MAP.clear();
}
section = new TerrainBoolCache();
TERRAIN_BOOL_CACHE_MAP.put(new Point(POS.x, POS.y), section);
}
byte value = section.getData(x, z);
if (value > 0) {
LOCKER.unlock();
return value > 1;
}
double px = (x >> 1) + 0.5;
double pz = (z >> 1) + 0.5;
@ -113,6 +134,7 @@ public class TerrainGenerator {
mediumIslands.updatePositions(px, pz);
smallIslands.updatePositions(px, pz);
boolean result = false;
for (int y = 0; y < 32; y++) {
double py = (double) y * SCALE_Y;
float dist = largeIslands.getDensity(px, py, pz);
@ -124,13 +146,15 @@ public class TerrainGenerator {
dist += noise1.eval(px * 0.1, py * 0.1, pz * 0.1) * 0.005 + 0.005;
}
if (dist > -0.01) {
LOCKER.unlock();
return true;
result = true;
break;
}
}
section.setData(x, z, (byte) (result ? 2 : 1));
LOCKER.unlock();
return false;
return result;
}
/**