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

.

Browse Source
This commit is contained in:
Daniel Mills
2020-10-24 03:44:45 -04:00
parent ed40dc34cf
commit 27694036a5
13 changed files with 168 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
View File

@@ -1,8 +1,8 @@
package com.volmit.iris.object;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.gen.v2.DataProvider;
import com.volmit.iris.util.DependsOn;
import com.volmit.iris.util.Desc;
import com.volmit.iris.util.DontObfuscate;
@@ -48,11 +48,11 @@ public class IrisBiomeGeneratorLink
private final transient AtomicCache<IrisGenerator> gen = new AtomicCache<>();
public IrisGenerator getCachedGenerator(ContextualTerrainProvider g)
public IrisGenerator getCachedGenerator(DataProvider g)
{
return gen.aquire(() ->
{
IrisGenerator gen = g != null ? g.loadGenerator(getGenerator()) : Iris.globaldata.getGeneratorLoader().load(getGenerator());
IrisGenerator gen = g != null ? g.getData().getGeneratorLoader().load(getGenerator()) : Iris.globaldata.getGeneratorLoader().load(getGenerator());
if(gen == null)
{
@@ -63,7 +63,7 @@ public class IrisBiomeGeneratorLink
});
}
public double getHeight(ContextualTerrainProvider xg, double x, double z, long seed)
public double getHeight(DataProvider xg, double x, double z, long seed)
{
double g = getCachedGenerator(xg).getHeight(x, z, seed);
g = g < 0 ? 0 : g;

18
src/main/java/com/volmit/iris/object/IrisRegion.java
View File

@@ -1,8 +1,8 @@
package com.volmit.iris.object;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ContextualTerrainProvider;
import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.gen.v2.DataProvider;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.util.ArrayType;
import com.volmit.iris.util.Desc;
@@ -382,7 +382,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
return getShoreHeightGenerator().fitDouble(shoreHeightMin, shoreHeightMax, x / shoreHeightZoom, z / shoreHeightZoom);
}
public KList<IrisBiome> getAllBiomes(ContextualTerrainProvider g)
public KList<IrisBiome> getAllBiomes(DataProvider g)
{
KMap<String, IrisBiome> b = new KMap<>();
KSet<String> names = new KSet<>();
@@ -422,7 +422,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
return b.v();
}
public KList<IrisBiome> getBiomes(ContextualTerrainProvider g, InferredType type)
public KList<IrisBiome> getBiomes(DataProvider g, InferredType type)
{
if(type.equals(InferredType.LAND))
{
@@ -457,7 +457,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
return new KList<>();
}
public KList<IrisBiome> getRealCaveBiomes(ContextualTerrainProvider g)
public KList<IrisBiome> getRealCaveBiomes(DataProvider g)
{
return realCaveBiomes.aquire(() ->
{
@@ -472,7 +472,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealLakeBiomes(ContextualTerrainProvider g)
public KList<IrisBiome> getRealLakeBiomes(DataProvider g)
{
return realLakeBiomes.aquire(() ->
{
@@ -487,7 +487,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealRiverBiomes(ContextualTerrainProvider g)
public KList<IrisBiome> getRealRiverBiomes(DataProvider g)
{
return realRiverBiomes.aquire(() ->
{
@@ -502,7 +502,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealShoreBiomes(ContextualTerrainProvider g)
public KList<IrisBiome> getRealShoreBiomes(DataProvider g)
{
return realShoreBiomes.aquire(() ->
{
@@ -517,7 +517,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealSeaBiomes(ContextualTerrainProvider g)
public KList<IrisBiome> getRealSeaBiomes(DataProvider g)
{
return realSeaBiomes.aquire(() ->
{
@@ -532,7 +532,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
});
}
public KList<IrisBiome> getRealLandBiomes(ContextualTerrainProvider g)
public KList<IrisBiome> getRealLandBiomes(DataProvider g)
{
return realLandBiomes.aquire(() ->
{