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

Fixes

Browse Source
This commit is contained in:
Daniel Mills 2020-10-29 03:50:34 -04:00
parent 2c8c23522b
commit a319314d04
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/misc.xml generated
View File

@ -7,9 +7,5 @@
</list> </list>
</option> </option>
</component> </component>
<<<<<<< Updated upstream
<component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="false" project-jdk-name="15" project-jdk-type="JavaSDK" />
=======
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
>>>>>>> Stashed changes
</project> </project>

4
src/main/java/com/volmit/iris/gen/v2/IrisComplex.java
View File

@ -156,8 +156,6 @@ public class IrisComplex implements DataProvider
? seaBiomeStream.get(x, z) : landBiomeStream.get(x, z)) ? seaBiomeStream.get(x, z) : landBiomeStream.get(x, z))
.convertAware2D(this::implode).cache2D(cacheSize); .convertAware2D(this::implode).cache2D(cacheSize);
heightStream = baseBiomeStream.convertAware2D((b, x, z) -> getHeight(b, x, z, seed)) heightStream = baseBiomeStream.convertAware2D((b, x, z) -> getHeight(b, x, z, seed))
.add(fluidHeight)
.add2D(overlayStream::get)
.roundDouble() .roundDouble()
.cache2D(cacheSize); .cache2D(cacheSize);
slopeStream = heightStream.slope(); slopeStream = heightStream.slope();
@ -335,7 +333,7 @@ public class IrisComplex implements DataProvider
h += M.lerp(lo, hi, gen.getHeight(x, z, seed + 239945)); h += M.lerp(lo, hi, gen.getHeight(x, z, seed + 239945));
} }
return h; return h + fluidHeight + overlayStream.get(x,z);
} }
private void registerGenerator(IrisGenerator cachedGenerator) private void registerGenerator(IrisGenerator cachedGenerator)