From dd33998cf80fdb0fba6be038d8787bb7bcc43bd8 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Wed, 11 Nov 2020 02:54:40 -0700
Subject: [PATCH] Fix slope palette interaction with Elevation

---
 .../terra/config/genconfig/biome/BiomeConfig.java   |  6 ------
 .../dfsek/terra/generation/TerraChunkGenerator.java | 13 ++++++-------
 .../biomes/mountain/arid_mountains.yml              |  3 +--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/dfsek/terra/config/genconfig/biome/BiomeConfig.java b/src/main/java/com/dfsek/terra/config/genconfig/biome/BiomeConfig.java
index 5ea218007..93351d802 100644
--- a/src/main/java/com/dfsek/terra/config/genconfig/biome/BiomeConfig.java
+++ b/src/main/java/com/dfsek/terra/config/genconfig/biome/BiomeConfig.java
@@ -41,7 +41,6 @@ public class BiomeConfig extends TerraConfig {
     private final Palette<BlockData> slant;
     private final double ySlantOffsetTop;
     private final double ySlantOffsetBottom;
-    private final double xzSlantOffset;
 
     private String eq;
 
@@ -136,7 +135,6 @@ public class BiomeConfig extends TerraConfig {
         } else slant = null;
         ySlantOffsetTop = getDouble("slant.y-offset.top", 0.25);
         ySlantOffsetBottom = getDouble("slant.y-offset.bottom", 0.25);
-        xzSlantOffset = getDouble("slant.x-z-offset", 1);
 
         //Make sure equation is non-null
         if(eq == null || eq.equals(""))
@@ -208,10 +206,6 @@ public class BiomeConfig extends TerraConfig {
         return ySlantOffsetBottom;
     }
 
-    public double getXZSlantOffset() {
-        return xzSlantOffset;
-    }
-
     @Override
     public String toString() {
         return "Biome with ID " + getID() + " and noise equation " + eq;
diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java
index 4ceded741..08cbcc0f2 100644
--- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java
+++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java
@@ -83,16 +83,15 @@ public class TerraChunkGenerator extends GaeaChunkGenerator {
     private static Palette<BlockData> getPalette(int x, int y, int z, BiomeConfig c, ChunkInterpolator interpolator, ElevationInterpolator elevationInterpolator) {
         Palette<BlockData> slant = c.getSlant();
         if(slant != null) {
-            double xzOffset = c.getXZSlantOffset();
-            boolean north = interpolator.getNoise(x, y + elevationInterpolator.getElevation(x, (int) (z + xzOffset)), z + xzOffset) > 0;
-            boolean south = interpolator.getNoise(x, y + elevationInterpolator.getElevation(x, (int) (z - xzOffset)), z - xzOffset) > 0;
-            boolean east = interpolator.getNoise(x + xzOffset, y + elevationInterpolator.getElevation((int) (x + xzOffset), z), z) > 0;
-            boolean west = interpolator.getNoise(x - xzOffset, y + elevationInterpolator.getElevation((int) (x - xzOffset), z), z) > 0;
+            boolean north = interpolator.getNoise(x, y - elevationInterpolator.getElevation(x, z + 1), z + 1) > 0;
+            boolean south = interpolator.getNoise(x, y - elevationInterpolator.getElevation(x, z - 1), z - 1) > 0;
+            boolean east = interpolator.getNoise(x + 1, y - elevationInterpolator.getElevation(x + 1, z), z) > 0;
+            boolean west = interpolator.getNoise(x - 1, y - elevationInterpolator.getElevation(x - 1, z), z) > 0;
 
             double ySlantOffsetTop = c.getYSlantOffsetTop();
             double ySlantOffsetBottom = c.getYSlantOffsetBottom();
-            boolean top = interpolator.getNoise(x, y + ySlantOffsetTop + elevationInterpolator.getElevation(x, z), z) > 0;
-            boolean bottom = interpolator.getNoise(x, y - ySlantOffsetBottom + elevationInterpolator.getElevation(x, z), z) > 0;
+            boolean top = interpolator.getNoise(x, y + ySlantOffsetTop - elevationInterpolator.getElevation(x, z), z) > 0;
+            boolean bottom = interpolator.getNoise(x, y - ySlantOffsetBottom - elevationInterpolator.getElevation(x, z), z) > 0;
 
             if((top && bottom) && (north || south || east || west) && (!(north && south && east && west))) return slant;
         }
diff --git a/src/main/resources/default-config/biomes/mountain/arid_mountains.yml b/src/main/resources/default-config/biomes/mountain/arid_mountains.yml
index d06a42d0d..ee981d8de 100644
--- a/src/main/resources/default-config/biomes/mountain/arid_mountains.yml
+++ b/src/main/resources/default-config/biomes/mountain/arid_mountains.yml
@@ -18,9 +18,8 @@ prevent-smooth: true
 slant:
   palette: STONE
   y-offset:
-    top: 1
+    top: 0.25
     bottom: 0.25
-  x-z-offset: 1
 
 flora:
   chance: 40