From 131c4692bc261d2d2522fa7c368d0b4392e9c849 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor@hotmail.com>
Date: Fri, 17 Feb 2023 11:25:10 +0100
Subject: [PATCH] Remove DEFER from InferredType

Unused
---
 src/main/java/com/volmit/iris/engine/IrisComplex.java       | 1 -
 .../java/com/volmit/iris/engine/object/InferredType.java    | 5 +----
 src/main/java/com/volmit/iris/engine/object/IrisBiome.java  | 5 -----
 .../java/com/volmit/iris/engine/object/IrisSpawner.java     | 6 +++---
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java
index 39397bf53..989aa0ef9 100644
--- a/src/main/java/com/volmit/iris/engine/IrisComplex.java
+++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java
@@ -220,7 +220,6 @@ public class IrisComplex implements DataProvider {
                 return seaBiomeStream;
             case SHORE:
                 return shoreBiomeStream;
-            case DEFER:
             default:
                 break;
         }
diff --git a/src/main/java/com/volmit/iris/engine/object/InferredType.java b/src/main/java/com/volmit/iris/engine/object/InferredType.java
index e4a8a6139..37439bb4d 100644
--- a/src/main/java/com/volmit/iris/engine/object/InferredType.java
+++ b/src/main/java/com/volmit/iris/engine/object/InferredType.java
@@ -32,8 +32,5 @@ public enum InferredType {
     SEA,
 
     @Desc("Represents any cave biome type")
-    CAVE,
-
-    @Desc("Defers the type to whatever another biome type that already exists is.")
-    DEFER
+    CAVE
 }
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
index f02982c36..c08d3fa11 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
@@ -484,11 +484,6 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         });
     }
 
-    public IrisBiome infer(InferredType t, InferredType type) {
-        setInferredType(t.equals(InferredType.DEFER) ? type : t);
-        return this;
-    }
-
     public KList<BlockData> generateSeaLayers(double wx, double wz, RNG random, int maxDepth, IrisData rdata) {
         KList<BlockData> data = new KList<>();
 
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisSpawner.java b/src/main/java/com/volmit/iris/engine/object/IrisSpawner.java
index 6e2c9faff..6d2359895 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisSpawner.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisSpawner.java
@@ -76,17 +76,17 @@ public class IrisSpawner extends IrisRegistrant {
     public boolean isValid(IrisBiome biome) {
         return switch (group) {
             case NORMAL -> switch (biome.getInferredType()) {
-                case SHORE, SEA, CAVE, DEFER -> false;
+                case SHORE, SEA, CAVE -> false;
                 case LAND -> true;
             };
             case CAVE -> true;
             case UNDERWATER -> switch (biome.getInferredType()) {
-                case SHORE, LAND, CAVE, DEFER -> false;
+                case SHORE, LAND, CAVE -> false;
                 case SEA -> true;
             };
             case BEACH -> switch (biome.getInferredType()) {
                 case SHORE -> true;
-                case LAND, CAVE, SEA, DEFER -> false;
+                case LAND, CAVE, SEA -> false;
             };
         };
     }