Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-31 04:46:40 +00:00
Code Issues Releases Activity

Oh the commands

Browse Source
This commit is contained in:
Daniel Mills
2020-08-01 04:36:57 -04:00
parent e5cdd9a7f1
commit 3b76bb64a9
34 changed files with 1427 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/main/java/com/volmit/iris/object/IrisDepositGenerator.java
View File

@@ -3,9 +3,10 @@ package com.volmit.iris.object;
import java.util.concurrent.locks.ReentrantLock;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import org.bukkit.util.BlockVector;
import com.volmit.iris.generator.ParallaxChunkGenerator;
import com.volmit.iris.generator.TerrainChunkGenerator;
import com.volmit.iris.util.BlockDataTools;
import com.volmit.iris.util.Desc;
import com.volmit.iris.util.DontObfuscate;
@@ -99,13 +100,13 @@ public class IrisDepositGenerator
public int getMaxDimension()
{
return (int) Math.round(Math.pow(maxSize, 1D / 3D));
return Math.min(11, (int) Math.round(Math.pow(maxSize, 1D / 3D)));
}
private IrisObject generateClumpObject(RNG rngv)
{
int s = rngv.i(minSize, maxSize);
int dim = (int) Math.round(Math.pow(s, 1D / 3D));
int dim = Math.min(11, (int) Math.round(Math.pow(maxSize, 1D / 3D)));
int w = dim / 2;
IrisObject o = new IrisObject(dim, dim, dim);
@@ -157,31 +158,65 @@ public class IrisDepositGenerator
return blockData;
}
public void generate(int x, int z, RNG rng, ParallaxChunkGenerator g)
public void generate(ChunkData data, RNG rng, TerrainChunkGenerator g)
{
IrisObject clump = getClump(rng);
int height = (int) (Math.round(g.getTerrainHeight(x, z))) - 5;
if(height < 0)
for(int l = 0; l < rng.i(getMinPerChunk(), getMaxPerChunk()); l++)
{
return;
IrisObject clump = getClump(rng);
int af = (int) Math.ceil(clump.getW() / 2D);
int bf = (int) Math.floor(16D - (clump.getW() / 2D));
if(af > bf || af < 0 || bf > 15 || af > 15 || bf < 0)
{
af = 6;
bf = 9;
}
int x = rng.i(af, bf);
int z = rng.i(af, bf);
int height = (int) (Math.round(g.getTerrainHeight(x, z))) - 5;
if(height <= 0)
{
return;
}
int i = Math.max(0, minHeight);
int a = Math.min(height, Math.min(256, maxHeight));
if(i >= a)
{
return;
}
int h = rng.i(i, a);
if(h > maxHeight || h < minHeight)
{
return;
}
for(BlockVector j : clump.getBlocks().keySet())
{
int nx = j.getBlockX() + x;
int ny = j.getBlockY() + h;
int nz = j.getBlockZ() + z;
if(nx > 15 || nx < 0 || ny > 255 || ny < 0 || nz < 0 || nz > 15)
{
continue;
}
BlockData b = data.getBlockData(nx, ny, nz);
if(!b.getMaterial().isSolid())
{
continue;
}
data.setBlock(nx, ny, nz, clump.getBlocks().get(j));
}
}
int i = Math.max(0, minHeight);
int a = Math.min(height, Math.min(256, maxHeight));
if(i >= a)
{
return;
}
int h = rng.i(i, a);
if(h > maxHeight || h < minHeight)
{
return;
}
clump.place(x, h, z, g, config, rng);
}
}

4
src/main/java/com/volmit/iris/object/IrisObject.java
View File

@@ -143,7 +143,7 @@ public class IrisObject extends IrisRegistrant
}
}
for(BlockVector g : blocks.k())
for(BlockVector g : blocks.keySet())
{
BlockVector i = g.clone();
i = config.getRotation().rotate(i.clone(), yf, xf, spinx, spiny, spinz).clone();
@@ -217,7 +217,7 @@ public class IrisObject extends IrisRegistrant
public void place(Location at)
{
for(BlockVector i : blocks.k())
for(BlockVector i : blocks.keySet())
{
at.clone().add(0, getCenter().getY(), 0).add(i).getBlock().setBlockData(blocks.get(i), false);
}

17
src/main/java/com/volmit/iris/object/atomics/AtomicWorldData.java
View File

@@ -8,7 +8,6 @@ import java.io.IOException;
import org.bukkit.World;
import com.volmit.iris.Iris;
import com.volmit.iris.util.ChronoLatch;
import com.volmit.iris.util.ChunkPosition;
import com.volmit.iris.util.KList;
import com.volmit.iris.util.KMap;
@@ -23,8 +22,8 @@ public class AtomicWorldData
private KMap<ChunkPosition, Long> lastChunk;
private KList<ChunkPosition> unloadRegions;
private KList<ChunkPosition> unloadChunks;
private long last = M.ms();
private String prefix;
private ChronoLatch cl = new ChronoLatch(333);
public AtomicWorldData(World world, String prefix)
{
@@ -267,7 +266,7 @@ public class AtomicWorldData
public void clean(int j)
{
if(!cl.flip())
if(M.ms() - last < getUnloadBatchSpeed())
{
return;
}
@@ -309,7 +308,7 @@ public class AtomicWorldData
for(ChunkPosition i : lastChunk.keySet())
{
if(m > 7)
if(m > getUnloadBatchSize())
{
break;
}
@@ -336,4 +335,14 @@ public class AtomicWorldData
unloadChunks.clear();
}
private int getUnloadBatchSize()
{
return Math.max(3, getLoadedRegions().size() / 125);
}
private int getUnloadBatchSpeed()
{
return Math.max(250, 2000 - getLoadedRegions().size());
}
}