mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-17 14:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "sync laptop"

Browse Source 
This reverts commit 63b8a935ae.
This commit is contained in:
RePixelatedMC
2024-04-06 17:07:14 +02:00
parent 83a0a7dd54
commit 206a4e9057
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/volmit/iris/core/IrisSettings.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class IrisSettings {
public static class IrisSettingsGenerator { public static class IrisSettingsGenerator {
public String defaultWorldType = "overworld"; public String defaultWorldType = "overworld";
public int maxBiomeChildDepth = 4; public int maxBiomeChildDepth = 4;
public boolean forceConvertTo320Height = false; // public boolean forceConvertTo320Height = false;
public boolean preventLeafDecay = true; public boolean preventLeafDecay = true;
} }
core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
+1 -1
View File
@@ -450,7 +450,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
return real; return real;
} }
public int getMaxHeight(int test) { public int getMaxHeight() {
return maxHeight.aquire(() -> return maxHeight.aquire(() ->
{ {
int maxHeight = 0; int maxHeight = 0;
core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
+10 -15
View File
@@ -22,7 +22,6 @@ import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.data.DataProvider;
import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.interpolation.IrisInterpolation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@@ -67,24 +66,20 @@ public class IrisBiomeGeneratorLink {
}); });
} }
public int getMax() {
return 320;
}
public double getHeight(DataProvider 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); double g = getCachedGenerator(xg).getHeight(x, z, seed);
g = g < 0 ? 0 : g; g = g < 0 ? 0 : g;
g = g > 1 ? 1 : g; g = g > 1 ? 1 : g;
if (xg.getData().getEngine().getDimension().getForceConvertTo320Height()) { // if (IrisSettings.get().getGenerator().forceConvertTo320Height) {
if (max > 320 || min > 320) { // if (max > 320 || min > 320) {
double scaleFactor = 320.0 / Math.max(max, min); // double scaleFactor = 320.0 / Math.max(max, min);
min *= (int) scaleFactor; // min *= (int) scaleFactor;
max *= (int) scaleFactor; // max *= (int) scaleFactor;
if (min < 0) { // if (min < 0) {
min = 10; //
} // }
} // }
} // }
// todo This // todo This
return IrisInterpolation.lerp(min, max, g); return IrisInterpolation.lerp(min, max, g);
core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
-3
View File
@@ -19,7 +19,6 @@
package com.volmit.iris.engine.object; package com.volmit.iris.engine.object;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.core.loader.IrisRegistrant;
import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.data.cache.AtomicCache;
@@ -211,8 +210,6 @@ public class IrisDimension extends IrisRegistrant {
private IrisCarving carving = new IrisCarving(); private IrisCarving carving = new IrisCarving();
@Desc("Configuration of fluid bodies such as rivers & lakes") @Desc("Configuration of fluid bodies such as rivers & lakes")
private IrisFluidBodies fluidBodies = new IrisFluidBodies(); private IrisFluidBodies fluidBodies = new IrisFluidBodies();
@Desc("forceConvertTo320Height")
private Boolean forceConvertTo320Height = false;
@Desc("The world environment") @Desc("The world environment")
private Environment environment = Environment.NORMAL; private Environment environment = Environment.NORMAL;
@RegistryListResource(IrisRegion.class) @RegistryListResource(IrisRegion.class)