From 206a4e905708b66275e5caa5c5cd35f6f3903485 Mon Sep 17 00:00:00 2001
From: RePixelatedMC <repixelatedmc@gmail.com>
Date: Sat, 6 Apr 2024 17:07:14 +0200
Subject: [PATCH] Revert "sync laptop"

This reverts commit 63b8a935ae65c254b75921d4308fcce1a9c05fc5.
---
 .../com/volmit/iris/core/IrisSettings.java    |  2 +-
 .../volmit/iris/engine/object/IrisBiome.java  |  2 +-
 .../engine/object/IrisBiomeGeneratorLink.java | 25 ++++++++-----------
 .../iris/engine/object/IrisDimension.java     |  3 ---
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/IrisSettings.java b/core/src/main/java/com/volmit/iris/core/IrisSettings.java
index a4fc25838..4abe1ba79 100644
--- a/core/src/main/java/com/volmit/iris/core/IrisSettings.java
+++ b/core/src/main/java/com/volmit/iris/core/IrisSettings.java
@@ -177,7 +177,7 @@ public class IrisSettings {
     public static class IrisSettingsGenerator {
         public String defaultWorldType = "overworld";
         public int maxBiomeChildDepth = 4;
-        public boolean forceConvertTo320Height = false;
+       // public boolean forceConvertTo320Height = false;
         public boolean preventLeafDecay = true;
     }
 
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java b/core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
index ecb8d8230..c08d3fa11 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
@@ -450,7 +450,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         return real;
     }
 
-    public int getMaxHeight(int test) {
+    public int getMaxHeight() {
         return maxHeight.aquire(() ->
         {
             int maxHeight = 0;
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java b/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
index b9a04cde7..2571389ca 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
@@ -22,7 +22,6 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.data.DataProvider;
-
 import com.volmit.iris.util.interpolation.IrisInterpolation;
 import lombok.AllArgsConstructor;
 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) {
         double g = getCachedGenerator(xg).getHeight(x, z, seed);
         g = g < 0 ? 0 : g;
         g = g > 1 ? 1 : g;
-        if (xg.getData().getEngine().getDimension().getForceConvertTo320Height()) {
-           if (max > 320 || min > 320) {
-                double scaleFactor = 320.0 / Math.max(max, min);
-                min *= (int) scaleFactor;
-                max *= (int) scaleFactor;
-                if (min < 0) {
-                    min = 10;
-                }
-            }
-        }
+//        if (IrisSettings.get().getGenerator().forceConvertTo320Height) {
+//           if (max > 320 || min > 320) {
+//                double scaleFactor = 320.0 / Math.max(max, min);
+//                min *= (int) scaleFactor;
+//                max *= (int) scaleFactor;
+//                if (min < 0) {
+//
+//                }
+//            }
+//        }
         // todo This
 
         return IrisInterpolation.lerp(min, max, g);
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
index 97899593a..488171296 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -19,7 +19,6 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
@@ -211,8 +210,6 @@ public class IrisDimension extends IrisRegistrant {
     private IrisCarving carving = new IrisCarving();
     @Desc("Configuration of fluid bodies such as rivers & lakes")
     private IrisFluidBodies fluidBodies = new IrisFluidBodies();
-    @Desc("forceConvertTo320Height")
-    private Boolean forceConvertTo320Height = false;
     @Desc("The world environment")
     private Environment environment = Environment.NORMAL;
     @RegistryListResource(IrisRegion.class)