mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-12-30 12:29:20 +00:00
Push
This commit is contained in:
Daniel Mills
22
src/main/java/ninja/bytecode/iris/Iris.java
Normal file
22
src/main/java/ninja/bytecode/iris/Iris.java
Normal file
@@ -0,0 +1,22 @@
|
||||
package ninja.bytecode.iris;
|
||||
|
||||
import org.bukkit.generator.ChunkGenerator;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import ninja.bytecode.shuriken.execution.TaskExecutor;
|
||||
|
||||
public class Iris extends JavaPlugin
|
||||
{
|
||||
public static TaskExecutor executor;
|
||||
|
||||
public void onEnable()
|
||||
{
|
||||
executor = new TaskExecutor(-1, Thread.MIN_PRIORITY, "Iris Generator");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ChunkGenerator getDefaultWorldGenerator(String worldName, String id)
|
||||
{
|
||||
return new IrisGenerator();
|
||||
}
|
||||
}
|
||||
178
src/main/java/ninja/bytecode/iris/IrisGenerator.java
Normal file
178
src/main/java/ninja/bytecode/iris/IrisGenerator.java
Normal file
@@ -0,0 +1,178 @@
|
||||
package ninja.bytecode.iris;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
|
||||
import ninja.bytecode.shuriken.math.CNG;
|
||||
import ninja.bytecode.shuriken.math.M;
|
||||
import ninja.bytecode.shuriken.math.RNG;
|
||||
|
||||
public class IrisGenerator extends ParallelChunkGenerator
|
||||
{
|
||||
private static final MB water = new MB(Material.STATIONARY_WATER);
|
||||
private static final MB bedrock = new MB(Material.BEDROCK);
|
||||
private static final MB air = new MB(Material.AIR);
|
||||
private static final MB grass = new MB(Material.GRASS);
|
||||
private static final MB[] earth = {new MB(Material.DIRT), new MB(Material.DIRT, 1),
|
||||
};
|
||||
private static final MB[] sand = {new MB(Material.SAND), new MB(Material.SAND), new MB(Material.SAND, 1),
|
||||
};
|
||||
private static final MB[] sandygrass = {new MB(Material.GRASS), new MB(Material.SAND, 1),
|
||||
};
|
||||
private static final MB[] rock = {new MB(Material.STONE), new MB(Material.STONE, 5), new MB(Material.COBBLESTONE),
|
||||
};
|
||||
private double[][][] scatterCache;
|
||||
private CNG gen;
|
||||
private CNG fracture;
|
||||
private CNG basegen;
|
||||
private CNG faultline;
|
||||
private RNG rng;
|
||||
|
||||
@Override
|
||||
public void onInit(World world, Random random)
|
||||
{
|
||||
//@builder
|
||||
rng = new RNG(world.getSeed());
|
||||
CNG scatter = new CNG(rng.nextRNG(), 1, 1)
|
||||
.scale(10);
|
||||
basegen = new CNG(rng.nextRNG(), 0.46, 3)
|
||||
.scale(0.00295)
|
||||
.fractureWith(new CNG(rng.nextRNG(), 1, 2)
|
||||
.scale(0.025), 70);
|
||||
gen = new CNG(rng.nextRNG(), 0.19D, 4)
|
||||
.scale(0.012)
|
||||
.amp(0.5)
|
||||
.freq(1.1)
|
||||
.fractureWith(new CNG(rng.nextRNG(), 1, 2)
|
||||
.scale(0.018)
|
||||
.fractureWith(new CNG(rng.nextRNG(), 1, 1)
|
||||
.scale(0.15), 24), 44);
|
||||
fracture = new CNG(rng.nextRNG(), 0.6D, 4)
|
||||
.scale(0.118);
|
||||
faultline = new CNG(rng.nextRNG(), 1D, 1)
|
||||
.scale(0.005)
|
||||
.child(new CNG(rng.nextRNG(), 1D, 1)
|
||||
.scale(0.012))
|
||||
.injectWith(CNG.MULTIPLY)
|
||||
.fractureWith(new CNG(rng.nextRNG(), 1, 1)
|
||||
.scale(0.07), 200);
|
||||
//@done
|
||||
|
||||
scatterCache = new double[16][][];
|
||||
|
||||
for(int i = 0; i < 16; i++)
|
||||
{
|
||||
scatterCache[i] = new double[16][];
|
||||
|
||||
for(int j = 0; j < 16; j++)
|
||||
{
|
||||
scatterCache[i][j] = new double[16];
|
||||
|
||||
for(int k = 0; k < 16; k++)
|
||||
{
|
||||
scatterCache[i][j][k] = scatter.noise(i, j, k);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void genColumn(int wx, int wz, int x, int z)
|
||||
{
|
||||
int height = getHeight(wx, wz);
|
||||
MB mb = rock[0];
|
||||
|
||||
for(int i = 0; i < Math.max(height, 63); i++)
|
||||
{
|
||||
int surfdepth = i < height ? height - i : 0;
|
||||
double scatter = scatterCache[x][z][i % 16];
|
||||
|
||||
if(i == 0)
|
||||
{
|
||||
mb = bedrock;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
if(scatter > 0.4 && i == 2)
|
||||
{
|
||||
mb = bedrock;
|
||||
}
|
||||
|
||||
if(scatter > 0.6 && i == 1)
|
||||
{
|
||||
mb = bedrock;
|
||||
}
|
||||
|
||||
if(i > height)
|
||||
{
|
||||
mb = water;
|
||||
}
|
||||
|
||||
else if(i == height)
|
||||
{
|
||||
mb = pick(sand, scatter);
|
||||
}
|
||||
|
||||
else if(i == height + 1 + scatter)
|
||||
{
|
||||
mb = pick(sandygrass, scatter);
|
||||
}
|
||||
|
||||
else if(i == height - 1)
|
||||
{
|
||||
mb = grass;
|
||||
}
|
||||
|
||||
else if(i > height - ((scatter * 2) + 1))
|
||||
{
|
||||
mb = pick(earth, scatter);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
mb = pick(rock, scatter);
|
||||
}
|
||||
|
||||
if(mb.data < 0)
|
||||
{
|
||||
mb = new MB(mb.material, pick(Math.abs(mb.data), scatter));
|
||||
}
|
||||
}
|
||||
|
||||
setBlock(x, i, z, mb.material, mb.data);
|
||||
}
|
||||
}
|
||||
|
||||
public int getHeight(double dx, double dz)
|
||||
{
|
||||
double fnoise = fracture.noise(dx, dz);
|
||||
double fault = faultline.noise(dx, dz);
|
||||
dx += (fnoise * 12);
|
||||
dz -= (fnoise * 12);
|
||||
double base = basegen.noise(dx, dz);
|
||||
double noise = base + gen.noise(dx, dz);
|
||||
double n = noise * 250;
|
||||
n = n > 255 ? 255 : n;
|
||||
n = n < 0 ? 0 : n;
|
||||
|
||||
if(n > 75 && fault > 0.35)
|
||||
{
|
||||
n += (fault * (n / 19.5));
|
||||
}
|
||||
|
||||
return (int) n;
|
||||
}
|
||||
|
||||
public int pick(int max, double noise)
|
||||
{
|
||||
return (int) (noise * max);
|
||||
}
|
||||
|
||||
public MB pick(MB[] array, double noise)
|
||||
{
|
||||
return array[pick(array.length, noise)];
|
||||
}
|
||||
}
|
||||
20
src/main/java/ninja/bytecode/iris/MB.java
Normal file
20
src/main/java/ninja/bytecode/iris/MB.java
Normal file
@@ -0,0 +1,20 @@
|
||||
package ninja.bytecode.iris;
|
||||
|
||||
import org.bukkit.Material;
|
||||
|
||||
public class MB
|
||||
{
|
||||
public final Material material;
|
||||
public final byte data;
|
||||
|
||||
public MB(Material material, int data)
|
||||
{
|
||||
this.material = material;
|
||||
this.data = (byte) data;
|
||||
}
|
||||
|
||||
public MB(Material material)
|
||||
{
|
||||
this(material, 0);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
package ninja.bytecode.iris;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.generator.ChunkGenerator;
|
||||
|
||||
import ninja.bytecode.shuriken.Shuriken;
|
||||
import ninja.bytecode.shuriken.execution.ChronoLatch;
|
||||
import ninja.bytecode.shuriken.execution.J;
|
||||
import ninja.bytecode.shuriken.execution.TaskExecutor.TaskGroup;
|
||||
import ninja.bytecode.shuriken.format.F;
|
||||
|
||||
public abstract class ParallelChunkGenerator extends ChunkGenerator
|
||||
{
|
||||
private int i;
|
||||
private int j;
|
||||
private int wx;
|
||||
private int wz;
|
||||
private ChunkData data;
|
||||
private TaskGroup tg;
|
||||
private boolean ready = false;
|
||||
private ChronoLatch cl = new ChronoLatch(5000);
|
||||
|
||||
public ChunkData generateChunkData(World world, Random random, int x, int z, BiomeGrid biome)
|
||||
{
|
||||
Shuriken.profiler.start("chunkgen-" + world.getName());
|
||||
|
||||
if(!ready)
|
||||
{
|
||||
onInit(world, random);
|
||||
ready = true;
|
||||
}
|
||||
|
||||
data = createChunkData(world);
|
||||
tg = Iris.executor.startWork();
|
||||
|
||||
for(i = 0; i < 16; i++)
|
||||
{
|
||||
wx = (x * 16) + i;
|
||||
|
||||
for(j = 0; j < 16; j++)
|
||||
{
|
||||
wz = (z * 16) + j;
|
||||
int a = wx;
|
||||
int b = wz;
|
||||
int c = i;
|
||||
int d = j;
|
||||
tg.queue(() -> genColumn(a, b, c, d));
|
||||
}
|
||||
}
|
||||
|
||||
tg.execute();
|
||||
Shuriken.profiler.stop("chunkgen-" + world.getName());
|
||||
|
||||
if(cl.flip())
|
||||
{
|
||||
J.a(() -> System.out.print("Gen: " + F.duration(Shuriken.profiler.getResult("chunkgen-" + world.getName()).getAverage(), 2)));
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
public abstract void onInit(World world, Random random);
|
||||
|
||||
public abstract void genColumn(int wx, int wz, int x, int z);
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
protected void setBlock(int x, int y, int z, Material b)
|
||||
{
|
||||
setBlock(x, y, z, b.getId(), (byte) 0);
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
protected void setBlock(int x, int y, int z, Material b, byte d)
|
||||
{
|
||||
setBlock(x, y, z, b.getId(), d);
|
||||
}
|
||||
|
||||
protected void setBlock(int x, int y, int z, int b)
|
||||
{
|
||||
setBlock(x, y, z, b, (byte) 0);
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
protected void setBlock(int x, int y, int z, int b, byte d)
|
||||
{
|
||||
data.setBlock(x, y, z, b, d);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user