From 78c85b5b8b4053d9d851b7ab3acf627db452bd95 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Mon, 20 Jun 2022 01:54:06 +0200
Subject: [PATCH] Void balancing

---
 .../api/v2/generator/BCLibEndBiomeSource.java | 24 +++++++++----------
 .../api/v2/levelgen/biomes/BiomeAPI.java      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java
index 2d1f4173..1f18c22e 100644
--- a/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java
+++ b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java
@@ -140,16 +140,16 @@ public class BCLibEndBiomeSource extends BCLBiomeSource {
                                 endLandBiomePicker.addBiome(bclBiome);
                             }
                         } else {
-                            if (!key.equals(Biomes.SMALL_END_ISLANDS)
-                                    && !key.equals(Biomes.THE_END)
-                                    &&
-                                    (BiomeAPI.wasRegisteredAsEndVoidBiome(key)
-                                            || BiomeAPI.wasRegisteredAsEndLandBiome(key)
-                                            || includeVoid.contains(key.toString())
-                                            || includeLand.contains(key.toString())
-                                    )
-                            )
+                            if (BiomeAPI.wasRegisteredAsEndLandBiome(key) || includeLand.contains(key.toString())) {
                                 endLandBiomePicker.addBiome(bclBiome);
+                                endVoidBiomePicker.addBiome(bclBiome);
+                            }
+                            if (!key.equals(Biomes.SMALL_END_ISLANDS) && !key.equals(Biomes.THE_END)
+                                    && (BiomeAPI.wasRegisteredAsEndVoidBiome(key) || includeVoid.contains(key.toString()))
+                            ) {
+                                endVoidBiomePicker.addBiome(bclBiome);
+                            }
+
                         }
                     }
                 }
@@ -352,8 +352,8 @@ public class BCLibEndBiomeSource extends BCLBiomeSource {
                 return mapLand.getBiome(posX, biomeY << 2, posZ).biome;
             } else {
                 return d < -0.21875
-                        ? (generateEndVoids ? mapVoid : mapLand).getBiome(posX, biomeY << 2, posZ).biome
-                        : this.barrens;
+                        ? mapVoid.getBiome(posX, biomeY << 2, posZ).biome
+                        : generateEndVoids ? this.barrens : mapVoid.getBiome(posX, biomeY << 2, posZ).biome;
             }
         } else {
             pos.setLocation(biomeX, biomeZ);
@@ -362,7 +362,7 @@ public class BCLibEndBiomeSource extends BCLBiomeSource {
             } else {
                 return dist <= farEndBiomes
                         ? barrens
-                        : (generateEndVoids ? mapVoid : mapLand).getBiome(posX, biomeY << 2, posZ).biome;
+                        : mapVoid.getBiome(posX, biomeY << 2, posZ).biome;
             }
         }
 
diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java
index f712f762..d0825424 100644
--- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java
+++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java
@@ -283,7 +283,7 @@ public class BiomeAPI {
      * @return {@link BCLBiome}
      */
     public static BCLBiome registerEndVoidBiome(BCLBiome biome) {
-        registerBiome(biome, BiomeType.END_VOID);
+        registerBiome(biome, BiomeType.BCL_END_VOID);
 
         float weight = biome.getGenChance();
         ResourceKey<Biome> key = getBiomeKey(biome.getBiome());