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

Auto stash before merge of "master" and "origin/master"

Browse Source
This commit is contained in:
Daniel Mills
2020-10-29 01:17:39 -04:00
parent c05696df8c
commit 2c8c23522b
65 changed files with 1421 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/volmit/iris/object/IrisBiome.java
View File

@@ -208,7 +208,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
public double getGenLinkMax(String loadKey)
{
return genCacheMax.aquire(() ->
Integer v = genCacheMax.aquire(() ->
{
KMap<String, Integer> l = new KMap<>();
@@ -218,12 +218,14 @@ public class IrisBiome extends IrisRegistrant implements IRare
}
return l;
}).compute(loadKey, (k, v) -> v != null ? v : 0);
}).get(loadKey);
return v == null ? 0 : v;
}
public double getGenLinkMin(String loadKey)
{
return genCacheMin.aquire(() ->
Integer v = genCacheMin.aquire(() ->
{
KMap<String, Integer> l = new KMap<>();
@@ -233,7 +235,9 @@ public class IrisBiome extends IrisRegistrant implements IRare
}
return l;
}).compute(loadKey, (k, v) -> v != null ? v : 0);
}).get(loadKey);
return v == null ? 0 : v;
}
public IrisBiomeGeneratorLink getGenLink(String loadKey)

2
src/main/java/com/volmit/iris/object/NoiseStyle.java
View File

@@ -1,6 +1,6 @@
package com.volmit.iris.object;
import com.volmit.iris.gen.v2.scaffold.layer.ProceduralStream;
import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.noise.CNGFactory;
import com.volmit.iris.noise.NoiseType;