From 13c9e93d312d42a68b65aa47d7910cefb4b6f307 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 24 Feb 2025 15:15:25 +0700 Subject: [PATCH] Move black hole spawn chance to placedfeature --- src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt | 3 ++- .../dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt index f40c0c6c9..ad8c630ef 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt @@ -65,7 +65,7 @@ fun registerConfiguredFeatures(context: BootstrapContext context.register(ConfiguredFeatures.BLACK_HOLE, ConfiguredFeature( MWorldGenFeatures.BLACK_HOLE_PLACER, - BlackHolePlacerFeature.Config(0.001f, Decimal("0.25"), Decimal(1)))) + BlackHolePlacerFeature.Config(Decimal("0.25"), Decimal(1)))) } private object PlacedFeatures { @@ -152,6 +152,7 @@ fun registerPlacedFeatures(context: BootstrapContext) { context.register(PlacedFeatures.BLACK_HOLE, PlacedFeature( blackHole, listOf( + RarityFilter.onAverageOnceEvery(1000), InSquarePlacement.spread(), HeightRangePlacement.uniform(VerticalAnchor.absolute(64), VerticalAnchor.absolute(128)) ) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt index 4c0056db6..102d3eccf 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt @@ -15,13 +15,12 @@ import ru.dbotthepony.mc.otm.registry.game.MBlocks object BlackHolePlacerFeature : Feature( RecordCodecBuilder.create { it.group( - Codec.floatRange(0.0F, 1.0F).fieldOf("chance").forGetter(Config::chance), DecimalCodec.fieldOf("matter_min").forGetter(Config::minMatter), DecimalCodec.fieldOf("matter_max").forGetter(Config::maxMatter) ).apply(it, ::Config) } ) { - data class Config(val chance: Float, val minMatter: Decimal, val maxMatter: Decimal) : FeatureConfiguration + data class Config(val minMatter: Decimal, val maxMatter: Decimal) : FeatureConfiguration override fun place(context: FeaturePlaceContext): Boolean { val random = context.random() @@ -30,7 +29,7 @@ object BlackHolePlacerFeature : Feature( val config = context.config() - if (level.getBlockState(pos).isAir && random.nextDouble() < config.chance.toDouble()) { + if (level.getBlockState(pos).isAir) { if (level.setBlock(pos, MBlocks.BLACK_HOLE.defaultBlockState(), 2)) { val entity = level.getBlockEntity(pos)