Completed 1.19.3 updated

LICENSE

@@ -0,0 +1 @@
+All rights reserved.

README.md

@@ -12,4 +12,4 @@
 
 -----------------
 
-© 2021 Glitchfiend. All rights reserved.
+© 2022 Glitchfiend. All rights reserved.

src/main/java/biomesoplenty/common/biome/BOPNetherBiomes.java

@@ -6,32 +6,31 @@
 
 import biomesoplenty.api.sound.BOPSounds;
 import biomesoplenty.common.worldgen.placement.BOPNetherPlacements;
+import net.minecraft.core.Holder;
 import net.minecraft.core.HolderGetter;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.data.worldgen.BiomeDefaultFeatures;
 import net.minecraft.data.worldgen.Carvers;
 import net.minecraft.data.worldgen.placement.NetherPlacements;
 import net.minecraft.data.worldgen.placement.OrePlacements;
 import net.minecraft.data.worldgen.placement.VegetationPlacements;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.sounds.Musics;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.biome.*;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;
-import net.minecraftforge.registries.RegistryObject;
 
 import static biomesoplenty.common.biome.BOPOverworldBiomes.calculateSkyColor;
 
 public class BOPNetherBiomes
 {
-    private static void addFeature(BiomeGenerationSettings.Builder builder, GenerationStep.Decoration step, RegistryObject<PlacedFeature> feature)
-    {
-        builder.addFeature(step, feature.getHolder().orElseThrow());
-    }
+    public static final Holder.Reference<SoundEvent> AMETHYST_BLOCK_CHIME = BuiltInRegistries.SOUND_EVENT.createIntrusiveHolder(SoundEvents.AMETHYST_BLOCK_CHIME);
 
     private static void addFeature(BiomeGenerationSettings.Builder builder, GenerationStep.Decoration step, ResourceKey<PlacedFeature> feature)
     {
@@ -60,7 +59,7 @@ public static Biome crystallineChasm(HolderGetter<PlacedFeature> placedFeatureGe
 
         return new Biome.BiomeBuilder()
                 .precipitation(Biome.Precipitation.NONE).temperature(2.0F).downfall(0.0F)
-                .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x59002C).skyColor(calculateSkyColor(2.0F)).ambientParticle(new AmbientParticleSettings(ParticleTypes.ELECTRIC_SPARK, 0.0008925F)).ambientLoopSound(SoundEvents.AMBIENT_CRIMSON_FOREST_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD, 6000, 8, 2.0D))/* TODO: .ambientAdditionsSound(new AmbientAdditionsSettings(SoundEvents.AMETHYST_BLOCK_CHIME, 0.0111D))*/.backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_CRYSTALLINE_CHASM.getHolder().get())).build())
+                .specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x59002C).skyColor(calculateSkyColor(2.0F)).ambientParticle(new AmbientParticleSettings(ParticleTypes.ELECTRIC_SPARK, 0.0008925F)).ambientLoopSound(SoundEvents.AMBIENT_CRIMSON_FOREST_LOOP).ambientMoodSound(new AmbientMoodSettings(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new AmbientAdditionsSettings(AMETHYST_BLOCK_CHIME, 0.0111D)).backgroundMusic(Musics.createGameMusic(BOPSounds.MUSIC_BIOME_CRYSTALLINE_CHASM.getHolder().get())).build())
                 .mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
 

src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java

@@ -6,6 +6,7 @@
 
 import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.common.util.biome.BiomeUtil;
+import biomesoplenty.init.ModConfig;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
@@ -608,7 +609,7 @@ protected void addSurfaceBiome(Consumer<Pair<Climate.ParameterPoint, ResourceKey
 
     protected void addUndergroundBiome(Registry<Biome> biomeRegistry, Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> mapper, Climate.Parameter temperature, Climate.Parameter humidity, Climate.Parameter continentalness, Climate.Parameter erosion, Climate.Parameter weirdness, float offset, ResourceKey<Biome> biome)
     {
-        if (!BiomeUtil.isKeyRegistered(biomeRegistry, biome))
+        if (!ModConfig.isBiomeEnabled(biome))
             return;
 
         mapper.accept(Pair.of(Climate.parameters(temperature, humidity, continentalness, erosion, Climate.Parameter.span(0.2F, 0.9F), weirdness, offset), biome));

src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java

@@ -5,6 +5,7 @@
 package biomesoplenty.common.biome;
 
 import biomesoplenty.api.sound.BOPSounds;
+import biomesoplenty.common.worldgen.carver.BOPConfiguredCarvers;
 import biomesoplenty.common.worldgen.placement.BOPCavePlacements;
 import biomesoplenty.common.worldgen.placement.BOPMiscOverworldPlacements;
 import biomesoplenty.common.worldgen.placement.BOPVegetationPlacements;
@@ -27,7 +28,6 @@
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;
-import net.minecraftforge.registries.RegistryObject;
 
 import javax.annotation.Nullable;
 
@@ -77,11 +77,6 @@ private static Biome biomeWithColorOverridesAndParticles(Biome.Precipitation pre
     {
         return (new Biome.BiomeBuilder()).precipitation(precipitation).temperature(temperature).downfall(downfall).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(waterColor).waterFogColor(waterFogColor).fogColor(fogColor).grassColorOverride(grassColor).foliageColorOverride(foliageColor).skyColor(skyColor).ambientParticle(new AmbientParticleSettings(particleOptions, particleProbability)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).backgroundMusic(music).build()).mobSpawnSettings(spawnBuilder.build()).generationSettings(biomeBuilder.build()).build();
     }
-
-    private static void addFeature(BiomeGenerationSettings.Builder builder, GenerationStep.Decoration step, RegistryObject<PlacedFeature> feature)
-    {
-        builder.addFeature(step, feature.getHolder().orElseThrow());
-    }
 
     private static void addFeature(BiomeGenerationSettings.Builder builder, GenerationStep.Decoration step, ResourceKey<PlacedFeature> feature)
     {
@@ -921,7 +916,7 @@ public static Biome originValley(HolderGetter<PlacedFeature> placedFeatureGetter
 
         // Biome features
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
-        // TODO: biomeBuilder.addCarver(GenerationStep.Carving.AIR, BOPConfiguredCarvers.ORIGIN_CAVE.getHolder().orElseThrow());
+        biomeBuilder.addCarver(GenerationStep.Carving.AIR, BOPConfiguredCarvers.ORIGIN_CAVE);
         BiomeDefaultFeatures.addDefaultMonsterRoom(biomeBuilder);
         BiomeDefaultFeatures.addDefaultSprings(biomeBuilder);
         BiomeDefaultFeatures.addSurfaceFreezing(biomeBuilder);

src/main/java/biomesoplenty/common/datagen/DataGenerationHandler.java

@@ -7,6 +7,7 @@
 import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.common.util.worldgen.BOPFeatureUtils;
 import biomesoplenty.common.util.worldgen.BOPPlacementUtils;
+import biomesoplenty.common.worldgen.carver.BOPConfiguredCarvers;
 import biomesoplenty.common.worldgen.feature.*;
 import biomesoplenty.common.worldgen.placement.*;
 import biomesoplenty.core.BiomesOPlenty;
@@ -26,6 +27,7 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;
 import net.minecraftforge.common.data.ExistingFileHelper;
@@ -50,17 +52,20 @@ public static void onGatherData(GatherDataEvent event)
         ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
 
         HolderLookup.Provider lookupProvider = new RegistrySetBuilder()
+                .add(Registries.CONFIGURED_CARVER, (RegistrySetBuilder.RegistryBootstrap) BOPConfiguredCarvers::bootstrap)
                 .add(Registries.CONFIGURED_FEATURE, (RegistrySetBuilder.RegistryBootstrap) BOPFeatureUtils::bootstrap)
                 .add(Registries.PLACED_FEATURE, (RegistrySetBuilder.RegistryBootstrap) BOPPlacementUtils::bootstrap)
                 .add(Registries.BIOME, ModBiomes::bootstrapBiomes)
                 .buildPatch(RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY), VanillaRegistries.createLookup());
 
         RegistryOps<JsonElement> registryOps = RegistryOps.create(JsonOps.INSTANCE, lookupProvider);
 
+        Map<ResourceLocation, ConfiguredWorldCarver<?>> configuredWorldCarverMap = createMap(Registries.CONFIGURED_CARVER, lookupProvider, BOPConfiguredCarvers.class);
         Map<ResourceLocation, ConfiguredFeature<?, ?>> configuredFeatureMap = createMap(Registries.CONFIGURED_FEATURE, lookupProvider, BOPCaveFeatures.class, BOPMiscOverworldFeatures.class, BOPNetherFeatures.class, BOPTreeFeatures.class, BOPVegetationFeatures.class);
         Map<ResourceLocation, PlacedFeature> placedFeatureMap = createMap(Registries.PLACED_FEATURE, lookupProvider, BOPCavePlacements.class, BOPMiscOverworldPlacements.class, BOPNetherPlacements.class, BOPTreePlacements.class, BOPVegetationPlacements.class);
         Map<ResourceLocation, Biome> biomeMap = createMap(Registries.BIOME, lookupProvider, BOPBiomes.class);
 
+        generator.addProvider(event.includeServer(), JsonCodecProvider.forDatapackRegistry(generator, existingFileHelper, BiomesOPlenty.MOD_ID, registryOps, Registries.CONFIGURED_CARVER, configuredWorldCarverMap));
         generator.addProvider(event.includeServer(), JsonCodecProvider.forDatapackRegistry(generator, existingFileHelper, BiomesOPlenty.MOD_ID, registryOps, Registries.CONFIGURED_FEATURE, configuredFeatureMap));
         generator.addProvider(event.includeServer(), JsonCodecProvider.forDatapackRegistry(generator, existingFileHelper, BiomesOPlenty.MOD_ID, registryOps, Registries.PLACED_FEATURE, placedFeatureMap));
         generator.addProvider(event.includeServer(), JsonCodecProvider.forDatapackRegistry(generator, existingFileHelper, BiomesOPlenty.MOD_ID, registryOps, Registries.BIOME, biomeMap));

src/main/java/biomesoplenty/common/util/biome/BiomeUtil.java

@@ -4,6 +4,7 @@
  ******************************************************************************/
 package biomesoplenty.common.util.biome;
 
+import biomesoplenty.init.ModConfig;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
@@ -16,15 +17,13 @@ public static ResourceKey<Biome> biomeOrFallback(Registry<Biome> biomeRegistry,
     {
         for (ResourceKey<Biome> key : biomes)
         {
-            if (isKeyRegistered(biomeRegistry, key))
+            if (key == null)
+                continue;
+
+            if (ModConfig.isBiomeEnabled(key) || key.location().getNamespace().equals("minecraft"))
                 return key;
         }
 
         throw new RuntimeException("Failed to find fallback for biome!");
     }
-
-    public static boolean isKeyRegistered(Registry<Biome> registry, ResourceKey<Biome> key)
-    {
-        return key != null && registry.get(key) != null;
-    }
 }

src/main/java/biomesoplenty/common/worldgen/carver/BOPConfiguredCarvers.java

@@ -5,20 +5,33 @@
 package biomesoplenty.common.worldgen.carver;
 
 import biomesoplenty.core.BiomesOPlenty;
-import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
+import net.minecraft.core.HolderGetter;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.data.worldgen.BootstapContext;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.util.valueproviders.ConstantFloat;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.VerticalAnchor;
+import net.minecraft.world.level.levelgen.carver.CarverDebugSettings;
+import net.minecraft.world.level.levelgen.carver.CaveCarverConfiguration;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
-import net.minecraftforge.registries.RegistryObject;
-
-import java.util.function.Supplier;
+import net.minecraft.world.level.levelgen.heightproviders.BiasedToBottomHeight;
 
 public class BOPConfiguredCarvers
 {
-    // TODO: public static final RegistryObject<ConfiguredWorldCarver<CaveCarverConfiguration>> ORIGIN_CAVE = register("origin_cave", () -> BOPWorldCarvers.ORIGIN_CAVE.get().configured(new CaveCarverConfiguration(0.14285715F, BiasedToBottomHeight.of(VerticalAnchor.absolute(0), VerticalAnchor.absolute(127), 8), ConstantFloat.of(0.5F), VerticalAnchor.aboveBottom(10), CarverDebugSettings.of(false, Blocks.CRIMSON_BUTTON.defaultBlockState()), Registries.BLOCK.getOrCreateTag(BlockTags.OVERWORLD_CARVER_REPLACEABLES), ConstantFloat.of(1.0F), ConstantFloat.of(1.0F), ConstantFloat.of(-0.7F))));
+    public static final ResourceKey<ConfiguredWorldCarver<?>> ORIGIN_CAVE = createKey("origin_cave");
 
-    private static <WC extends CarverConfiguration> RegistryObject<ConfiguredWorldCarver<WC>> register(String key, Supplier<ConfiguredWorldCarver<WC>> carverSupplier)
+    public static void bootstrap(BootstapContext<ConfiguredWorldCarver<?>> context)
     {
-        return BiomesOPlenty.CONFIGURED_CARVER_REGISTER.register(key, carverSupplier);
+        HolderGetter<Block> blockGetter = context.lookup(Registries.BLOCK);
+        context.register(ORIGIN_CAVE, BOPWorldCarvers.ORIGIN_CAVE.get().configured(new CaveCarverConfiguration(0.14285715F, BiasedToBottomHeight.of(VerticalAnchor.absolute(0), VerticalAnchor.absolute(127), 8), ConstantFloat.of(0.5F), VerticalAnchor.aboveBottom(10), CarverDebugSettings.of(false, Blocks.CRIMSON_BUTTON.defaultBlockState()), blockGetter.getOrThrow(BlockTags.OVERWORLD_CARVER_REPLACEABLES), ConstantFloat.of(1.0F), ConstantFloat.of(1.0F), ConstantFloat.of(-0.7F))));
     }
 
-    public static void setup() {}
+    private static ResourceKey<ConfiguredWorldCarver<?>> createKey(String name)
+    {
+        return ResourceKey.create(Registries.CONFIGURED_CARVER, new ResourceLocation(BiomesOPlenty.MOD_ID, name));
+    }
 }

src/main/java/biomesoplenty/init/ModConfig.java

@@ -64,11 +64,14 @@ public static void setup()
 
     public static boolean isBiomeEnabled(ResourceKey<Biome> key)
     {
+        if (key == null || !key.location().getNamespace().equals(BiomesOPlenty.MOD_ID))
+            return false;
+
         String optionName = getBiomeConfigOptionName(key);
         Map<String, Boolean> biomeToggles = getBiomeToggles();
 
         // Add the biome toggle if it is missing
-        if (!biomeToggles.containsKey(optionName) && key.location().getNamespace().equals("biomesoplenty"))
+        if (!biomeToggles.containsKey(optionName))
         {
             addBiomeToggle(key);
         }

src/main/java/biomesoplenty/init/ModFeatures.java

@@ -4,7 +4,6 @@
  ******************************************************************************/
 package biomesoplenty.init;
 
-import biomesoplenty.common.worldgen.carver.BOPConfiguredCarvers;
 import biomesoplenty.common.worldgen.carver.BOPWorldCarvers;
 import biomesoplenty.common.worldgen.feature.BOPBaseFeatures;
 
@@ -19,6 +18,5 @@ public static void setup()
 
         // Carvers
         BOPWorldCarvers.setup();
-        BOPConfiguredCarvers.setup();
     }
 }