From 7a44b74b616a1b1a3324ae223d11242ba83354d6 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Wed, 28 Jul 2021 08:12:38 -0700
Subject: [PATCH] use binarycolumn in locator

---
 .../addons/feature/locator/locators/PatternLocator.java      | 3 ++-
 .../terra/addons/feature/locator/locators/RandomLocator.java | 3 ++-
 .../addons/feature/locator/locators/SurfaceLocator.java      | 5 ++---
 .../java/com/dfsek/terra/api/structure/feature/Locator.java  | 4 +---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java
index 3f71fe28b..ec76bdf1e 100644
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java
@@ -1,6 +1,7 @@
 package com.dfsek.terra.addons.feature.locator.locators;
 
 import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
+import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.Column;
@@ -18,7 +19,7 @@ public class PatternLocator implements Locator {
     }
 
     @Override
-    public List<Integer> getSuitableCoordinates(Column column) {
+    public BinaryColumn getSuitableCoordinates(Column column) {
         List<Integer> locations = new ArrayList<>();
 
         for(int y : search) {
diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java
index 792e5b88f..6bff33d82 100644
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java
@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.feature.locator.locators;
 
+import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.Column;
@@ -19,7 +20,7 @@ public class RandomLocator implements Locator {
     }
 
     @Override
-    public List<Integer> getSuitableCoordinates(Column column) {
+    public BinaryColumn getSuitableCoordinates(Column column) {
         long seed = column.getWorld().getSeed();
         seed = 31 * seed + column.getX();
         seed = 31 * seed + column.getZ();
diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java
index 8bcbde459..2555f2e03 100644
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java
@@ -2,13 +2,12 @@ package com.dfsek.terra.addons.feature.locator.locators;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
-import com.dfsek.terra.api.util.ConstantRange;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.Column;
 
 import java.util.Collections;
-import java.util.List;
 
 public class SurfaceLocator implements Locator {
     private final Range search;
@@ -21,7 +20,7 @@ public class SurfaceLocator implements Locator {
     }
 
     @Override
-    public List<Integer> getSuitableCoordinates(Column column) {
+    public BinaryColumn getSuitableCoordinates(Column column) {
         for(int y : search) {
             if(column.getBlock(y).matches(air) && !column.getBlock(y-1).matches(air)) {
                 return Collections.singletonList(y);
diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java
index c49ebd2f5..a16262be7 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java
@@ -2,8 +2,6 @@ package com.dfsek.terra.api.structure.feature;
 
 import com.dfsek.terra.api.world.Column;
 
-import java.util.List;
-
 public interface Locator {
-    List<Integer> getSuitableCoordinates(Column column);
+    BinaryColumn getSuitableCoordinates(Column column);
 }