diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java index 1280ed52..4c333f8e 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java @@ -91,7 +91,7 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, if (BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel( Enchantments.SILK_TOUCH, tool - ) > 0) { + ) > 0) { return Collections.singletonList(new ItemStack(leaveBlock)); } int fortune = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BLOCK_FORTUNE, tool); diff --git a/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresetSettings.java b/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresetSettings.java index 85853772..b771553e 100644 --- a/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresetSettings.java +++ b/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresetSettings.java @@ -9,6 +9,7 @@ import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.dimension.BuiltinDimensionTypes; import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.dimension.LevelStem; +import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; import net.minecraft.world.level.levelgen.WorldGenSettings; import com.mojang.serialization.Codec; @@ -104,6 +105,25 @@ public class BCLWorldPresetSettings extends WorldPresetSettings { return biomeSource; } + public Holder fixNoiseSettings(Holder settings, + BiomeSource biomeSource) { + NoiseGeneratorSettings old = settings.value(); + NoiseGeneratorSettings noise = new NoiseGeneratorSettings(old.noiseSettings(), + old.defaultBlock(), + old.defaultFluid(), + old.noiseRouter(), + old.surfaceRule(), + old.spawnTarget(), + old.seaLevel(), + old.disableMobGeneration(), + old.aquifersEnabled(), + old.oreVeinsEnabled(), + old.useLegacyRandomSource()); + + + return Holder.direct(noise); + } + /** * Datapacks can change the world's generator. This Method will ensure, that the Generators contain @@ -144,11 +164,12 @@ public class BCLWorldPresetSettings extends WorldPresetSettings { if (chunkGenerator instanceof ChunkGeneratorAccessor generator) { if (chunkGenerator instanceof NoiseGeneratorSettingsProvider noiseProvider) { final Set> biomes = chunkGenerator.getBiomeSource().possibleBiomes(); - + final BiomeSource bs = fixBiomeSource(referenceGenerator.getBiomeSource(), biomes); referenceGenerator = new BCLChunkGenerator(generator.bclib_getStructureSetsRegistry(), noiseProvider.bclib_getNoises(), - fixBiomeSource(referenceGenerator.getBiomeSource(), biomes), - noiseProvider.bclib_getNoiseGeneratorSettingHolders()); + bs, + fixNoiseSettings(noiseProvider.bclib_getNoiseGeneratorSettingHolders(), bs) + ); } }