From 466e1365842cdbe162c2c485f6dbdc55a419de0c Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Wed, 7 Jun 2023 21:48:43 +0200
Subject: [PATCH] Improved handling of BCLBiomeRegistry on Datagen

---
 .../betterend/EndRegistrySupplier.java        |  3 ++-
 .../worldgen/EndBiomesDataProvider.java       | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/betterx/datagen/betterend/EndRegistrySupplier.java b/src/main/java/org/betterx/datagen/betterend/EndRegistrySupplier.java
index e0a2cd02..ed96c8e9 100644
--- a/src/main/java/org/betterx/datagen/betterend/EndRegistrySupplier.java
+++ b/src/main/java/org/betterx/datagen/betterend/EndRegistrySupplier.java
@@ -64,7 +64,8 @@ public class EndRegistrySupplier extends RegistrySupplier {
                 ),
                 new RegistryInfo<>(
                         BCLBiomeRegistry.BCL_BIOMES_REGISTRY,
-                        BiomeData.CODEC
+                        BiomeData.CODEC,
+                        EndBiomesDataProvider::bootstrapBCL
                 )
         );
     }
diff --git a/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java b/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java
index 02138f65..84bf4232 100644
--- a/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java
+++ b/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java
@@ -1,5 +1,6 @@
 package org.betterx.datagen.betterend.worldgen;
 
+import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome;
 import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder;
 import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry;
 import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI.BiomeType;
@@ -19,10 +20,13 @@ import net.minecraft.world.level.biome.Biome;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 public class EndBiomesDataProvider extends TagDataProvider<Biome> {
+    private static final Set<BCLBiome> BIOMES = new HashSet<>();
     // Better End Land
     private static final EndBiome FOGGY_MUSHROOMLAND = registerBiome(new FoggyMushroomlandBiome(), BiomeType.END_LAND);
     private static final EndBiome CHORUS_FOREST = registerBiome(new ChorusForestBiome(), BiomeType.END_LAND);
@@ -71,7 +75,15 @@ public class EndBiomesDataProvider extends TagDataProvider<Biome> {
     public static void bootstrap(BootstapContext<Biome> ctx) {
         BCLBiomeBuilder.registerUnbound(ctx);
         EndRegistrySupplier.INSTANCE.MAIN_LOCK.release();
-        BetterEnd.LOGGER.info("Registered BCLBiomes: " + BCLBiomeRegistry.BUILTIN_BCL_BIOMES.size() + ", " + BCLBiomeRegistry.registryOrNull());
+        BetterEnd.LOGGER.info("Registered Biomes");
+    }
+
+    public static void bootstrapBCL(BootstapContext<BCLBiome> ctx) {
+        for (var biome : BIOMES) {
+            ctx.register(biome.getBCLBiomeKey(), biome);
+
+        }
+        BetterEnd.LOGGER.info("Registered BCLBiomes: " + BCLBiomeRegistry.BUILTIN_BCL_BIOMES.size());
     }
 
     public static void ensureStaticallyLoaded() {
@@ -93,7 +105,9 @@ public class EndBiomesDataProvider extends TagDataProvider<Biome> {
      * @return registered {@link EndBiome}
      */
     public static EndBiome registerSubBiome(EndBiome.Config biomeConfig, EndBiome parent) {
-        return EndBiome.createSubBiome(biomeConfig, parent);
+        final EndBiome biome = EndBiome.createSubBiome(biomeConfig, parent);
+        BIOMES.add(biome);
+        return biome;
     }
 
     /**
@@ -105,10 +119,13 @@ public class EndBiomesDataProvider extends TagDataProvider<Biome> {
      */
     public static EndBiome registerBiome(EndBiome.Config biomeConfig, BiomeType type) {
         final EndBiome biome = EndBiome.create(biomeConfig, type);
+        BIOMES.add(biome);
         return biome;
     }
 
     public static EndCaveBiome registerCaveBiome(EndCaveBiome.Config biomeConfig) {
-        return EndCaveBiome.create(biomeConfig);
+        final EndCaveBiome biome = EndCaveBiome.create(biomeConfig);
+        BIOMES.add(biome);
+        return biome;
     }
 }