From b652f4fbceb9f1a8de6e6c453dbe1342233470a5 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 17 May 2023 23:53:32 +0200 Subject: [PATCH] Moved `ADD_TESTS`-Field --- src/main/java/org/betterx/bclib/BCLib.java | 1 + .../java/org/betterx/datagen/bclib/BCLRegistrySupplier.java | 2 +- src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java | 3 +-- src/main/java/org/betterx/datagen/bclib/tests/TestBiomes.java | 3 +-- .../betterx/datagen/bclib/tests/TestConfiguredFeatures.java | 3 +-- .../org/betterx/datagen/bclib/tests/TestPlacedFeatures.java | 3 +-- .../java/org/betterx/datagen/bclib/tests/TestStructure.java | 3 +-- .../org/betterx/datagen/bclib/tests/TestWorldgenProvider.java | 4 ++-- 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/betterx/bclib/BCLib.java b/src/main/java/org/betterx/bclib/BCLib.java index d9b75d53..2ab66163 100644 --- a/src/main/java/org/betterx/bclib/BCLib.java +++ b/src/main/java/org/betterx/bclib/BCLib.java @@ -42,6 +42,7 @@ public class BCLib implements ModInitializer { public static final boolean RUNS_NULLSCAPE = FabricLoader.getInstance() .getModContainer("nullscape") .isPresent(); + public static final boolean ADD_TEST_DATA = true; private void onDatagen() { diff --git a/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java b/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java index 36acfd5f..acc5b41e 100644 --- a/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java +++ b/src/main/java/org/betterx/datagen/bclib/BCLRegistrySupplier.java @@ -49,7 +49,7 @@ public class BCLRegistrySupplier extends RegistrySupplier { ); registries.addUnfiltered(SurfaceRuleRegistry.SURFACE_RULES_REGISTRY, AssignedSurfaceRule.CODEC); - if (BCLibDatagen.ADD_TESTS) { + if (BCLib.ADD_TEST_DATA) { registries.add(Registries.STRUCTURE, Structure.DIRECT_CODEC, TestStructure::bootstrap); registries.add(Registries.STRUCTURE_SET, StructureSet.DIRECT_CODEC, TestStructure::bootstrapSet); 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 d1c49cdd..f32e0e50 100644 --- a/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java +++ b/src/main/java/org/betterx/datagen/bclib/BCLibDatagen.java @@ -15,7 +15,6 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; public class BCLibDatagen implements DataGeneratorEntrypoint { - public static final boolean ADD_TESTS = true; @Override public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) { @@ -23,7 +22,7 @@ public class BCLibDatagen implements DataGeneratorEntrypoint { final FabricDataGenerator.Pack pack = dataGenerator.createPack(); NullscapeBiomes.ensureStaticallyLoaded(); - if (ADD_TESTS) { + if (BCLib.ADD_TEST_DATA) { TestBiomes.ensureStaticallyLoaded(); pack.addProvider(TestWorldgenProvider::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 index 7a31fd87..7a9807a2 100644 --- a/src/main/java/org/betterx/datagen/bclib/tests/TestBiomes.java +++ b/src/main/java/org/betterx/datagen/bclib/tests/TestBiomes.java @@ -5,7 +5,6 @@ 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.datagen.bclib.BCLibDatagen; import org.betterx.worlds.together.WorldsTogether; import org.betterx.worlds.together.tag.v3.TagManager; @@ -107,7 +106,7 @@ public class TestBiomes extends TagDataProvider { } public static void bootstrap(BootstapContext bootstrapContext) { - if (BCLibDatagen.ADD_TESTS && BCLib.isDevEnvironment()) { + if (BCLib.ADD_TEST_DATA && BCLib.isDevEnvironment()) { BCLib.LOGGER.info("Bootstrap Biomes"); THE_YELLOW = THE_YELLOW.register(bootstrapContext); diff --git a/src/main/java/org/betterx/datagen/bclib/tests/TestConfiguredFeatures.java b/src/main/java/org/betterx/datagen/bclib/tests/TestConfiguredFeatures.java index e093a917..4ee6c0de 100644 --- a/src/main/java/org/betterx/datagen/bclib/tests/TestConfiguredFeatures.java +++ b/src/main/java/org/betterx/datagen/bclib/tests/TestConfiguredFeatures.java @@ -3,7 +3,6 @@ package org.betterx.datagen.bclib.tests; import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v3.levelgen.features.BCLConfigureFeature; import org.betterx.bclib.api.v3.levelgen.features.BCLFeatureBuilder; -import org.betterx.datagen.bclib.BCLibDatagen; import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; @@ -32,7 +31,7 @@ public class TestConfiguredFeatures { YELLOW_FEATURE.id )); - if (BCLibDatagen.ADD_TESTS && BCLib.isDevEnvironment()) { + if (BCLib.ADD_TEST_DATA && BCLib.isDevEnvironment()) { BCLib.LOGGER.info("Bootstrap CONFIGUREDFeatures" + holder); //YELLOW_FEATURE = YELLOW_FEATURE.register(bootstrapContext); BCLFeatureBuilder.registerUnbound(bootstrapContext); diff --git a/src/main/java/org/betterx/datagen/bclib/tests/TestPlacedFeatures.java b/src/main/java/org/betterx/datagen/bclib/tests/TestPlacedFeatures.java index 518b7d6d..dff3eee4 100644 --- a/src/main/java/org/betterx/datagen/bclib/tests/TestPlacedFeatures.java +++ b/src/main/java/org/betterx/datagen/bclib/tests/TestPlacedFeatures.java @@ -2,7 +2,6 @@ package org.betterx.datagen.bclib.tests; import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v3.levelgen.features.BCLFeature; -import org.betterx.datagen.bclib.BCLibDatagen; import net.minecraft.data.worldgen.BootstapContext; import net.minecraft.world.level.block.Blocks; @@ -26,7 +25,7 @@ public class TestPlacedFeatures { .build(); public static void bootstrap(BootstapContext bootstrapContext) { - if (BCLibDatagen.ADD_TESTS && BCLib.isDevEnvironment()) { + if (BCLib.ADD_TEST_DATA && BCLib.isDevEnvironment()) { BCLib.LOGGER.info("Bootstrap PLACEDFeatures"); YELLOW_PLACED = YELLOW_PLACED.register(bootstrapContext); } diff --git a/src/main/java/org/betterx/datagen/bclib/tests/TestStructure.java b/src/main/java/org/betterx/datagen/bclib/tests/TestStructure.java index 9dbe2f74..54e61994 100644 --- a/src/main/java/org/betterx/datagen/bclib/tests/TestStructure.java +++ b/src/main/java/org/betterx/datagen/bclib/tests/TestStructure.java @@ -5,7 +5,6 @@ import org.betterx.bclib.api.v2.levelgen.structures.BCLStructure; import org.betterx.bclib.api.v2.levelgen.structures.BCLStructureBuilder; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; -import org.betterx.datagen.bclib.BCLibDatagen; import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; @@ -162,7 +161,7 @@ public class TestStructure extends Structure { } public static void registerBase() { - if (BCLibDatagen.ADD_TESTS && BCLib.isDevEnvironment()) { + if (BCLib.ADD_TEST_DATA && BCLib.isDevEnvironment()) { Registry.register(BuiltInRegistries.STRUCTURE_PIECE, TestStructurePiece.KEY, TestStructurePiece.INSTANCE); } } diff --git a/src/main/java/org/betterx/datagen/bclib/tests/TestWorldgenProvider.java b/src/main/java/org/betterx/datagen/bclib/tests/TestWorldgenProvider.java index 88e56237..d0b77b2d 100644 --- a/src/main/java/org/betterx/datagen/bclib/tests/TestWorldgenProvider.java +++ b/src/main/java/org/betterx/datagen/bclib/tests/TestWorldgenProvider.java @@ -1,6 +1,6 @@ package org.betterx.datagen.bclib.tests; -import org.betterx.datagen.bclib.BCLibDatagen; +import org.betterx.bclib.BCLib; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; @@ -20,7 +20,7 @@ public class TestWorldgenProvider extends FabricDynamicRegistryProvider { @Override protected void configure(HolderLookup.Provider registries, Entries entries) { - if (BCLibDatagen.ADD_TESTS) { + if (BCLib.ADD_TEST_DATA) { entries.addAll(registries.lookupOrThrow(Registries.CONFIGURED_FEATURE)); entries.addAll(registries.lookupOrThrow(Registries.PLACED_FEATURE)); entries.addAll(registries.lookupOrThrow(Registries.BIOME));