From b01f9885c20d1d831be4c600647a80c455d80507 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Mon, 19 Jun 2023 22:35:58 +0200
Subject: [PATCH] [Change] Nullscape void barrens are added using an optional
 Biome Tag

---
 .../datagen/bclib/BCLRegistrySupplier.java    |  2 +-
 .../betterx/datagen/bclib/BCLibDatagen.java   |  3 +-
 .../bclib/integrations/NullscapeBiomes.java   | 42 ++++---------------
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java b/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java
index acc5b41e..7138170e 100644
--- a/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java
+++ b/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java
@@ -60,7 +60,7 @@ public class BCLRegistrySupplier extends RegistrySupplier {
             registries.add(Registries.PLACED_FEATURE, PlacedFeature.DIRECT_CODEC, TestPlacedFeatures::bootstrap);
             registries.add(Registries.BIOME, Biome.DIRECT_CODEC, TestBiomes::bootstrap);
         } else {
-            registries.addBootstrapOnly(Registries.BIOME, Biome.DIRECT_CODEC, BiomeDatagenProvider::bootstrap);
+            registries.add(Registries.BIOME, Biome.DIRECT_CODEC, BiomeDatagenProvider::bootstrap);
         }
 
         registries.add(
diff --git a/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java b/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java
index d24e65ef..f8401ae1 100644
--- a/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java
+++ b/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java
@@ -8,6 +8,7 @@ import org.betterx.datagen.bclib.preset.WorldPresetDataProvider;
 import org.betterx.datagen.bclib.tests.TestBiomes;
 import org.betterx.datagen.bclib.tests.TestWorldgenProvider;
 import org.betterx.datagen.bclib.worldgen.BCLibRegistriesDataProvider;
+import org.betterx.datagen.bclib.worldgen.BiomeDatagenProvider;
 
 import net.minecraft.core.RegistrySetBuilder;
 
@@ -29,7 +30,7 @@ public class BCLibDatagen implements DataGeneratorEntrypoint {
             pack.addProvider(TestBiomes::new);
             RecipeDataProvider.createTestRecipes();
         } else {
-            pack.addProvider(NullscapeBiomes::new);
+            pack.addProvider(BiomeDatagenProvider::new);
         }
 
         pack.addProvider(RecipeDataProvider::new);
diff --git a/src/main/java/org/betterx/datagen/bclib/integrations/NullscapeBiomes.java b/src/main/java/org/betterx/datagen/bclib/integrations/NullscapeBiomes.java
index 99b9f569..a1580446 100644
--- a/src/main/java/org/betterx/datagen/bclib/integrations/NullscapeBiomes.java
+++ b/src/main/java/org/betterx/datagen/bclib/integrations/NullscapeBiomes.java
@@ -1,43 +1,17 @@
 package org.betterx.datagen.bclib.integrations;
 
-import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome;
-import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry;
-import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI;
-import org.betterx.bclib.api.v3.datagen.TagDataProvider;
+import org.betterx.worlds.together.tag.v3.CommonBiomeTags;
 import org.betterx.worlds.together.tag.v3.TagManager;
 
-import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-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.List;
-import java.util.concurrent.CompletableFuture;
-
-public class NullscapeBiomes extends TagDataProvider<Biome> {
-
-    /**
-     * Constructs a new {@link FabricTagProvider} with the default computed path.
-     *
-     * <p>Common implementations of this class are provided.
-     *
-     * @param output           the {@link FabricDataOutput} instance
-     * @param registriesFuture the backing registry for the tag type
-     */
-    public NullscapeBiomes(
-            FabricDataOutput output,
-            CompletableFuture<HolderLookup.Provider> registriesFuture
-    ) {
-        super(TagManager.BIOMES, List.of("nullscape"), output, registriesFuture);
-    }
-
 
+public class NullscapeBiomes {
     public static void ensureStaticallyLoaded() {
-        BCLBiomeRegistry.register(new BCLBiome(
-                new ResourceLocation("nullscape", "void_barrens"),
-                BiomeAPI.BiomeType.END_VOID
-        ));
+        TagManager.BIOMES.addOptional(
+                CommonBiomeTags.IS_SMALL_END_ISLAND,
+                ResourceKey.create(Registries.BIOME, new ResourceLocation("nullscape", "void_barrens"))
+        );
     }
 }