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

Fixes

Browse Source
This commit is contained in:
Daniel Mills
2020-11-01 09:16:11 -05:00
parent f97cd10bf6
commit b87153a445
13 changed files with 358 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -631,7 +631,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
});
}
public KList<String> getAllChildren(ContextualTerrainProvider g, int limit)
public KList<String> getAllChildren(DataProvider g, int limit)
{
KSet<String> m = new KSet<>();
m.addAll(getChildren());
@@ -641,7 +641,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
{
for(String i : getChildren())
{
IrisBiome b = g != null ? g.loadBiome(i) : Iris.globaldata.getBiomeLoader().load(i);
IrisBiome b = g != null ? g.getData().getBiomeLoader().load(i) : Iris.globaldata.getBiomeLoader().load(i);
int l = limit;
m.addAll(b.getAllChildren(g, l));
}

13
src/main/java/com/volmit/iris/object/IrisBiomeMutation.java
View File

@@ -13,6 +13,7 @@ import com.volmit.iris.util.RegistryListBiome;
import com.volmit.iris.util.RegistryListObject;
import com.volmit.iris.util.Required;
import com.volmit.iris.v2.scaffold.data.DataProvider;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -63,17 +64,17 @@ public class IrisBiomeMutation
private final transient AtomicCache<KList<String>> sideACache = new AtomicCache<>();
private final transient AtomicCache<KList<String>> sideBCache = new AtomicCache<>();
public KList<String> getRealSideA(ContextualTerrainProvider xg)
public KList<String> getRealSideA(DataProvider xg)
{
return sideACache.aquire(() -> processList(xg, getSideA()));
}
public KList<String> getRealSideB(ContextualTerrainProvider xg)
public KList<String> getRealSideB(DataProvider xg)
{
return sideBCache.aquire(() -> processList(xg, getSideB()));
}
public KList<String> processList(ContextualTerrainProvider xg, KList<String> s)
public KList<String> processList(DataProvider xg, KList<String> s)
{
KSet<String> r = new KSet<>();
@@ -83,14 +84,14 @@ public class IrisBiomeMutation
if(q.startsWith("^"))
{
r.addAll(xg.loadRegion(q.substring(1)).getLandBiomes());
r.addAll(xg.getData().getRegionLoader().load(q.substring(1)).getLandBiomes());
continue;
}
else if(q.startsWith("*"))
{
String name = q.substring(1);
r.addAll(xg.loadBiome(name).getAllChildren(xg, 7));
r.addAll(xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7));
}
else if(q.startsWith("!"))
@@ -101,7 +102,7 @@ public class IrisBiomeMutation
else if(q.startsWith("!*"))
{
String name = q.substring(2);
r.removeAll(xg.loadBiome(name).getAllChildren(xg, 7));
r.removeAll(xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7));
}
else

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

@@ -84,7 +84,7 @@ public class IrisCarveLayer
{
opacity = IrisInterpolation.bezier(1D - M.lerpInverse(maxHeight-innerRange, getMaxHeight(), y));
}
return cng.aquire(() -> getStyle().create(rng.nextParallelRNG(-2340 * getMaxHeight() * getMinHeight()))).fitDouble(0D, 1D, x, y, z) * opacity > getThreshold();
}
}

1
src/main/java/com/volmit/iris/object/IrisTextPlacement.java
View File

@@ -11,6 +11,7 @@ import com.volmit.iris.util.MinNumber;
import com.volmit.iris.util.RNG;
import com.volmit.iris.util.Required;
import com.volmit.iris.v2.scaffold.data.DataProvider;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;