From 49ac5770b0dd7a90f0727da232ca56e2fb3c6607 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 12 Sep 2023 17:45:00 +0200 Subject: [PATCH] Removed test biomes --- .../datagen/bclib/BCLRegistrySupplier.java | 2 - .../betterx/datagen/bclib/BCLibDatagen.java | 4 - .../datagen/bclib/tests/TestBiomes.java | 122 ------------------ 3 files changed, 128 deletions(-) delete mode 100644 src/main/java/org/betterx/datagen/bclib/tests/TestBiomes.java diff --git a/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java b/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java index 2fefa16a..b40815f9 100644 --- a/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java +++ b/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java @@ -4,7 +4,6 @@ import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeData; import org.betterx.bclib.api.v3.datagen.RegistrySupplier; -import org.betterx.datagen.bclib.tests.TestBiomes; import org.betterx.datagen.bclib.tests.TestConfiguredFeatures; import org.betterx.datagen.bclib.tests.TestPlacedFeatures; import org.betterx.datagen.bclib.tests.TestStructure; @@ -51,7 +50,6 @@ public class BCLRegistrySupplier extends RegistrySupplier { TestConfiguredFeatures::bootstrap ); registries.add(Registries.PLACED_FEATURE, PlacedFeature.DIRECT_CODEC, TestPlacedFeatures::bootstrap); - registries.add(Registries.BIOME, Biome.DIRECT_CODEC, TestBiomes::bootstrap); } else { registries.add(Registries.BIOME, Biome.DIRECT_CODEC, BiomeDatagenProvider::bootstrap); } diff --git a/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java b/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java index 7ce8a408..d739eab5 100644 --- a/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java +++ b/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java @@ -4,7 +4,6 @@ import org.betterx.bclib.BCLib; import org.betterx.datagen.bclib.advancement.BCLAdvancementDataProvider; import org.betterx.datagen.bclib.advancement.RecipeDataProvider; import org.betterx.datagen.bclib.integrations.NullscapeBiomes; -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; @@ -25,10 +24,7 @@ public class BCLibDatagen implements DataGeneratorEntrypoint { NullscapeBiomes.ensureStaticallyLoaded(); if (BCLib.ADD_TEST_DATA) { - TestBiomes.ensureStaticallyLoaded(); - pack.addProvider(TestWorldgenProvider::new); - pack.addProvider(TestBiomes::new); RecipeDataProvider.createTestRecipes(); } else { pack.addProvider(BiomeDatagenProvider::new); diff --git a/src/main/java/org/betterx/datagen/bclib/tests/TestBiomes.java b/src/main/java/org/betterx/datagen/bclib/tests/TestBiomes.java deleted file mode 100644 index 7a9807a2..00000000 --- a/src/main/java/org/betterx/datagen/bclib/tests/TestBiomes.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.betterx.datagen.bclib.tests; - -import org.betterx.bclib.BCLib; -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.BCLBiomeContainer; -import org.betterx.bclib.api.v3.datagen.TagDataProvider; -import org.betterx.worlds.together.WorldsTogether; -import org.betterx.worlds.together.tag.v3.TagManager; - -import net.minecraft.core.HolderLookup; -import net.minecraft.data.worldgen.BootstapContext; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.block.Blocks; - -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 TestBiomes extends TagDataProvider { - static BCLBiomeContainer THE_YELLOW = BCLBiomeBuilder - .start(BCLib.makeID("the_yellow")) - .hasPrecipitation(false) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0xFFFF00) - .waterColor(0x777700) - .waterFogColor(0xFFFF00) - .skyColor(0xAAAA00) - .feature(TestPlacedFeatures.YELLOW_PLACED) - .addNetherClimateParamater(-1, 1) - .surface(Blocks.YELLOW_CONCRETE) - .endLandBiome() - .build(); - - static BCLBiomeContainer THE_BLUE = BCLBiomeBuilder - .start(BCLib.makeID("the_blue")) - .hasPrecipitation(false) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0x0000FF) - .waterColor(0x000077) - .waterFogColor(0x0000FF) - .skyColor(0x0000AA) - .addNetherClimateParamater(-1, 1) - .surface(Blocks.LIGHT_BLUE_CONCRETE) - .structure(TestStructure.TEST.biomeTag) - .endLandBiome() - .build(); - - static BCLBiomeContainer THE_GRAY = BCLBiomeBuilder - .start(BCLib.makeID("the_gray")) - .hasPrecipitation(false) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0xFFFFFF) - .waterColor(0x777777) - .waterFogColor(0xFFFFFF) - .skyColor(0xAAAAAA) - .addNetherClimateParamater(-1, 1) - .surface(Blocks.GRAY_CONCRETE) - .endVoidBiome() - .build(); - static BCLBiomeContainer THE_ORANGE = BCLBiomeBuilder - .start(BCLib.makeID("the_orange")) - .hasPrecipitation(false) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0xFF7700) - .waterColor(0x773300) - .waterFogColor(0xFF7700) - .skyColor(0xAA7700) - .addNetherClimateParamater(-1, 1.1f) - .surface(Blocks.ORANGE_CONCRETE) - .netherBiome() - .build(); - static BCLBiomeContainer THE_PURPLE = BCLBiomeBuilder - .start(BCLib.makeID("the_purple")) - .hasPrecipitation(false) - .temperature(1.0f) - .wetness(1.0f) - .fogColor(0xFF00FF) - .waterColor(0x770077) - .waterFogColor(0xFF00FF) - .skyColor(0xAA00AA) - .addNetherClimateParamater(-1.1f, 1) - .surface(Blocks.PURPLE_CONCRETE) - .netherBiome() - .build(); - - /** - * Constructs a new {@link FabricTagProvider} with the default computed path. - * - *

Common implementations of this class are provided. - * - * @param output the {@link FabricDataOutput} instance - * @param registriesFuture the backing registry for the tag type - */ - public TestBiomes( - FabricDataOutput output, - CompletableFuture registriesFuture - ) { - super(TagManager.BIOMES, List.of(BCLib.MOD_ID, WorldsTogether.MOD_ID, "c"), output, registriesFuture); - } - - public static void bootstrap(BootstapContext bootstrapContext) { - if (BCLib.ADD_TEST_DATA && BCLib.isDevEnvironment()) { - BCLib.LOGGER.info("Bootstrap Biomes"); - - THE_YELLOW = THE_YELLOW.register(bootstrapContext); - THE_BLUE = THE_BLUE.register(bootstrapContext); - THE_GRAY = THE_GRAY.register(bootstrapContext); - THE_ORANGE = THE_ORANGE.register(bootstrapContext); - THE_PURPLE = THE_PURPLE.register(bootstrapContext); - } - } - - public static void ensureStaticallyLoaded() { - } -}