mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 18:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop sky providers

Browse Source
This commit is contained in:
Daniel Mills 2020-10-22 11:17:40 -04:00
parent 43562580d6
commit 9ef1c1935d
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
View File

@ -89,7 +89,7 @@ public abstract class ContextualTerrainProvider implements TerrainProvider, List
tickLatch = new ChronoLatch(650); tickLatch = new ChronoLatch(650);
perSecond = new ChronoLatch(1000); perSecond = new ChronoLatch(1000);
hlast = M.ms(); hlast = M.ms();
cache = new AtomicMulticache((SkyTerrainProvider) this); cache = new AtomicMulticache((IrisTerrainProvider) this);
CNG.creates = 0; CNG.creates = 0;
generated = 0; generated = 0;
ticks = 0; ticks = 0;

2
src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java
View File

@ -51,7 +51,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class IrisTerrainProvider extends SkyTerrainProvider implements IrisContext public class IrisTerrainProvider extends PostBlockTerrainProvider implements IrisContext
{ {
private IrisBiome hb = null; private IrisBiome hb = null;
private IrisRegion hr = null; private IrisRegion hr = null;

21
src/main/java/com/volmit/iris/gen/SkyTerrainProvider.java
View File

@ -1,21 +0,0 @@
package com.volmit.iris.gen;
import com.volmit.iris.gen.scaffold.GeneratedChunk;
import com.volmit.iris.gen.scaffold.TerrainChunk;
import com.volmit.iris.gen.scaffold.TerrainTarget;
import com.volmit.iris.util.RNG;
public abstract class SkyTerrainProvider extends PostBlockTerrainProvider
{
public SkyTerrainProvider(TerrainTarget t, String dimensionName, int threads)
{
super(t, dimensionName, threads);
}
@Override
protected GeneratedChunk onGenerate(RNG random, int x, int z, TerrainChunk terrain)
{
GeneratedChunk gc = super.onGenerate(random, x, z, terrain);
return gc;
}
}

4
src/main/java/com/volmit/iris/gen/atomics/AtomicMulticache.java
View File

@ -3,7 +3,7 @@ package com.volmit.iris.gen.atomics;
import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.LoadingCache;
import com.volmit.iris.IrisSettings; import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.SkyTerrainProvider; import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.object.IrisRegion; import com.volmit.iris.object.IrisRegion;
import com.volmit.iris.util.ChunkPosition; import com.volmit.iris.util.ChunkPosition;
@ -18,7 +18,7 @@ public class AtomicMulticache
private final LoadingCache<ChunkPosition, IrisBiome> rawBiome; private final LoadingCache<ChunkPosition, IrisBiome> rawBiome;
private final LoadingCache<ChunkPosition, IrisRegion> region; private final LoadingCache<ChunkPosition, IrisRegion> region;
public AtomicMulticache(SkyTerrainProvider gen) public AtomicMulticache(IrisTerrainProvider gen)
{ {
height = Caffeine.newBuilder().maximumSize(getLimit()).build((c) -> gen.getNoiseHeight(c.getX(), c.getZ()) + gen.getFluidHeight()); height = Caffeine.newBuilder().maximumSize(getLimit()).build((c) -> gen.getNoiseHeight(c.getX(), c.getZ()) + gen.getFluidHeight());
carvedHeight = Caffeine.newBuilder().maximumSize(getLimit()).build((c) -> carvedHeight = Caffeine.newBuilder().maximumSize(getLimit()).build((c) ->