From bb08368511d6e334402ea3901c69e7d6f1e47545 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Fri, 10 Jun 2022 03:40:04 +0200
Subject: [PATCH] [Fix] Biomes from Terrablender have no features

---
 .../api/v2/generator/BCLChunkGenerator.java   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java
index 235184bf..a553c0ee 100644
--- a/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java
+++ b/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java
@@ -76,26 +76,31 @@ public class BCLChunkGenerator extends NoiseBasedChunkGenerator {
 
             //terrablender is completley invalidating the feature imitialization
             //we redo it at this point, otherwise we will get blank biomes
-            if (this instanceof ChunkGeneratorAccessor acc) {
-                Function<Holder<Biome>, BiomeGenerationSettings> function = (Holder<Biome> hh) -> hh.value()
-                                                                                                    .getGenerationSettings();
-
-                acc.bcl_setFeaturesPerStep(Suppliers.memoize(() -> FeatureSorter.buildFeaturesPerStep(
-                        List.copyOf(biomeSource.possibleBiomes()),
-                        (hh) -> function.apply(hh).features(),
-                        true
-                )));
-            }
+            rebuildFeaturesPerStep(biomeSource);
         }
         System.out.println("Chunk Generator: " + this + " (biomeSource: " + biomeSource + ")");
     }
 
+    private void rebuildFeaturesPerStep(BiomeSource biomeSource) {
+        if (this instanceof ChunkGeneratorAccessor acc) {
+            Function<Holder<Biome>, BiomeGenerationSettings> function = (Holder<Biome> hh) -> hh.value()
+                                                                                                .getGenerationSettings();
+
+            acc.bcl_setFeaturesPerStep(Suppliers.memoize(() -> FeatureSorter.buildFeaturesPerStep(
+                    List.copyOf(biomeSource.possibleBiomes()),
+                    (hh) -> function.apply(hh).features(),
+                    true
+            )));
+        }
+    }
+
     public void restoreInitialBiomeSource() {
         if (initialBiomeSource != getBiomeSource()) {
             if (this instanceof ChunkGeneratorAccessor acc) {
                 BiomeSource bs = LevelGenUtil.getWorldSettings()
                                              .fixBiomeSource(initialBiomeSource, getBiomeSource().possibleBiomes());
                 acc.bcl_setBiomeSource(bs);
+                rebuildFeaturesPerStep(getBiomeSource());
             }
         }
     }