From bd139a8edcdc5da0d030a8d51d0ae422c076c7f4 Mon Sep 17 00:00:00 2001
From: Astrash <astrash@protonmail.com>
Date: Sat, 30 Jul 2022 12:08:21 +1000
Subject: [PATCH] BooleanOperator -> RelationalOperator

---
 .../LayeredChunkGeneratorAddon.java           |  6 +++---
 .../SamplerLayerPredicateTemplate.java        |  4 ++--
 .../SamplerListLayerPredicateTemplate.java    |  4 ++--
 .../predicate/SamplerLayerPredicate.java      |  8 ++++----
 .../predicate/SamplerListLayerPredicate.java  |  8 ++++----
 ...nOperator.java => RelationalOperator.java} | 19 +++++++++++--------
 .../util/DoubleBiPredicate.java               |  6 ++++++
 7 files changed, 32 insertions(+), 23 deletions(-)
 rename common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/{BooleanOperator.java => RelationalOperator.java} (52%)
 create mode 100644 common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/util/DoubleBiPredicate.java

diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/LayeredChunkGeneratorAddon.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/LayeredChunkGeneratorAddon.java
index b2bf49e76..4a22c4024 100644
--- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/LayeredChunkGeneratorAddon.java
+++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/LayeredChunkGeneratorAddon.java
@@ -38,7 +38,7 @@ import com.dfsek.terra.addons.chunkgenerator.config.sampler.SimpleLayerSamplerTe
 import com.dfsek.terra.addons.chunkgenerator.generation.LayeredChunkGenerator;
 import com.dfsek.terra.addons.chunkgenerator.layer.palette.BiomeDefinedLayerPalette;
 import com.dfsek.terra.addons.chunkgenerator.layer.sampler.BiomeDefinedLayerSampler;
-import com.dfsek.terra.addons.chunkgenerator.math.BooleanOperator;
+import com.dfsek.terra.addons.chunkgenerator.math.RelationalOperator;
 import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
 import com.dfsek.terra.addons.chunkgenerator.util.InstanceWrapper;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
@@ -95,8 +95,8 @@ public class LayeredChunkGeneratorAddon implements AddonInitializer {
                 .register(addon, ConfigPackPreLoadEvent.class)
                 .priority(1000)
                 .then(event -> {
-                    event.getPack().applyLoader(BooleanOperator.class,
-                                                (type, o, loader, depthTracker) -> BooleanOperator.valueOf((String) o));
+                    event.getPack().applyLoader(RelationalOperator.class,
+                                                (type, o, loader, depthTracker) -> RelationalOperator.valueOf((String) o));
     
                     CheckedRegistry<Supplier<ObjectTemplate<PointSet>>> pointSetTypeRegistry = event.getPack().getOrCreateRegistry(
                             POINT_SET_TYPE_TOKEN);
diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/SamplerLayerPredicateTemplate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/SamplerLayerPredicateTemplate.java
index c9be75370..4477acaed 100644
--- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/SamplerLayerPredicateTemplate.java
+++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/SamplerLayerPredicateTemplate.java
@@ -7,7 +7,7 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import com.dfsek.terra.addons.chunkgenerator.api.LayerPredicate;
 import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
 import com.dfsek.terra.addons.chunkgenerator.layer.predicate.SamplerLayerPredicate;
-import com.dfsek.terra.addons.chunkgenerator.math.BooleanOperator;
+import com.dfsek.terra.addons.chunkgenerator.math.RelationalOperator;
 import com.dfsek.terra.addons.chunkgenerator.util.InstanceWrapper;
 import com.dfsek.terra.api.config.meta.Meta;
 
@@ -23,7 +23,7 @@ public class SamplerLayerPredicateTemplate implements ObjectTemplate<LayerPredic
     
     @Value("operator")
     @Default
-    private BooleanOperator operator = BooleanOperator.GreaterThan;
+    private RelationalOperator operator = RelationalOperator.GreaterThan;
     
     @Override
     public LayerPredicate get() {
diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/SamplerListLayerPredicateTemplate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/SamplerListLayerPredicateTemplate.java
index 9c8ba31f9..06f814f73 100644
--- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/SamplerListLayerPredicateTemplate.java
+++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/SamplerListLayerPredicateTemplate.java
@@ -6,7 +6,7 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.addons.chunkgenerator.api.LayerPredicate;
 import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
-import com.dfsek.terra.addons.chunkgenerator.math.BooleanOperator;
+import com.dfsek.terra.addons.chunkgenerator.math.RelationalOperator;
 import com.dfsek.terra.addons.chunkgenerator.layer.predicate.SamplerListLayerPredicate;
 import com.dfsek.terra.addons.chunkgenerator.util.InstanceWrapper;
 import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
@@ -27,7 +27,7 @@ public class SamplerListLayerPredicateTemplate implements ObjectTemplate<LayerPr
     
     @Value("operator")
     @Default
-    private BooleanOperator defaultOperator = BooleanOperator.GreaterThan;
+    private RelationalOperator defaultOperator = RelationalOperator.GreaterThan;
     
     @Override
     public LayerPredicate get() {
diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerLayerPredicate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerLayerPredicate.java
index 8143da580..7a5a5d33a 100644
--- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerLayerPredicate.java
+++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerLayerPredicate.java
@@ -2,7 +2,7 @@ package com.dfsek.terra.addons.chunkgenerator.layer.predicate;
 
 import com.dfsek.terra.addons.chunkgenerator.api.LayerPredicate;
 import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
-import com.dfsek.terra.addons.chunkgenerator.math.BooleanOperator;
+import com.dfsek.terra.addons.chunkgenerator.math.RelationalOperator;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.info.WorldProperties;
 
@@ -13,9 +13,9 @@ public class SamplerLayerPredicate implements LayerPredicate {
     
     private final double threshold;
     
-    private final BooleanOperator operator;
+    private final RelationalOperator operator;
     
-    public SamplerLayerPredicate(LayerSampler sampler, BooleanOperator operator, double threshold) {
+    public SamplerLayerPredicate(LayerSampler sampler, RelationalOperator operator, double threshold) {
         this.sampler = sampler;
         this.operator = operator;
         this.threshold = threshold;
@@ -23,7 +23,7 @@ public class SamplerLayerPredicate implements LayerPredicate {
     
     @Override
     public boolean test(int x, int y, int z, WorldProperties worldProperties, BiomeProvider biomeProvider) {
-        return operator.evaluate(sampler.sample(x, y, z, worldProperties, biomeProvider), threshold);
+        return operator.test(sampler.sample(x, y, z, worldProperties, biomeProvider), threshold);
     }
     
 }
diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java
index b34be1bcf..a0796be8c 100644
--- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java
+++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java
@@ -2,7 +2,7 @@ package com.dfsek.terra.addons.chunkgenerator.layer.predicate;
 
 import com.dfsek.terra.addons.chunkgenerator.api.LayerPredicate;
 import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
-import com.dfsek.terra.addons.chunkgenerator.math.BooleanOperator;
+import com.dfsek.terra.addons.chunkgenerator.math.RelationalOperator;
 import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
 import com.dfsek.terra.api.util.vector.Vector3Int;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@@ -12,11 +12,11 @@ import com.dfsek.terra.api.world.info.WorldProperties;
 public class SamplerListLayerPredicate implements LayerPredicate {
     
     private final Vector3Int[] points;
-    private final BooleanOperator operator;
+    private final RelationalOperator operator;
     private final LayerSampler sampler;
     private final double threshold;
     
-    public SamplerListLayerPredicate(LayerSampler sampler, double threshold, BooleanOperator operator, PointSet points) {
+    public SamplerListLayerPredicate(LayerSampler sampler, double threshold, RelationalOperator operator, PointSet points) {
         this.sampler = sampler;
         this.threshold = threshold;
         this.operator = operator;
@@ -26,7 +26,7 @@ public class SamplerListLayerPredicate implements LayerPredicate {
     @Override
     public boolean test(int x, int y, int z, WorldProperties worldProperties, BiomeProvider biomeProvider) {
         for (Vector3Int point : points) {
-            if (operator.evaluate(sampler.sample(x + point.getX(), y + point.getY(), z + point.getZ(), worldProperties, biomeProvider), threshold)) return true;
+            if (operator.test(sampler.sample(x + point.getX(), y + point.getY(), z + point.getZ(), worldProperties, biomeProvider), threshold)) return true;
         }
         return false;
     }
diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/BooleanOperator.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/RelationalOperator.java
similarity index 52%
rename from common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/BooleanOperator.java
rename to common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/RelationalOperator.java
index 7c013ac76..a36b526bc 100644
--- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/BooleanOperator.java
+++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/RelationalOperator.java
@@ -1,42 +1,45 @@
 package com.dfsek.terra.addons.chunkgenerator.math;
 
-public enum BooleanOperator {
+import com.dfsek.terra.addons.chunkgenerator.util.DoubleBiPredicate;
+
+
+public enum RelationalOperator implements DoubleBiPredicate {
     GreaterThan {
         @Override
-        public boolean evaluate(double a, double b) {
+        public boolean test(double a, double b) {
             return a > b;
         }
     },
     GreaterThanOrEqual {
         @Override
-        public boolean evaluate(double a, double b) {
+        public boolean test(double a, double b) {
             return a >= b;
         }
     },
     LessThan {
         @Override
-        public boolean evaluate(double a, double b) {
+        public boolean test(double a, double b) {
             return a < b;
         }
     },
     LessThanOrEqual {
         @Override
-        public boolean evaluate(double a, double b) {
+        public boolean test(double a, double b) {
             return a <= b;
         }
     },
     Equals {
         @Override
-        public boolean evaluate(double a, double b) {
+        public boolean test(double a, double b) {
             return a == b;
         }
     },
     NotEquals {
         @Override
-        public boolean evaluate(double a, double b) {
+        public boolean test(double a, double b) {
             return a != b;
         }
     };
     
-    public abstract boolean evaluate(double a, double b);
+    public abstract boolean test(double a, double b);
 }
diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/util/DoubleBiPredicate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/util/DoubleBiPredicate.java
new file mode 100644
index 000000000..948a0fc32
--- /dev/null
+++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/util/DoubleBiPredicate.java
@@ -0,0 +1,6 @@
+package com.dfsek.terra.addons.chunkgenerator.util;
+
+@FunctionalInterface
+public interface DoubleBiPredicate {
+    boolean test(double a, double b);
+}