From 4c1e8273f6c6323e4532d6e4a63d33143842193e Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 1 Dec 2021 01:12:20 +0100 Subject: [PATCH] Fixed some more compile issues --- src/main/java/ru/bclib/BCLib.java | 2 - src/main/java/ru/bclib/api/TagAPI.java | 1 + .../ru/bclib/api/datafixer/DataFixerAPI.java | 6 +- .../blockentities/BaseBarrelBlockEntity.java | 2 +- .../java/ru/bclib/blocks/BaseLeavesBlock.java | 8 +-- .../java/ru/bclib/blocks/BaseSignBlock.java | 2 +- .../blocks/FeatureSaplingBlockCommon.java | 1 + .../ru/bclib/integration/ModIntegration.java | 5 +- .../mixin/common/WorldGenRegionMixin.java | 2 +- .../java/ru/bclib/world/biomes/BCLBiome.java | 4 +- .../ru/bclib/world/biomes/BCLBiomeDef.java | 43 ++++-------- .../world/features/NBTStructureFeature.java | 1 - .../world/generator/BCLibEndBiomeSource.java | 4 +- .../generator/BCLibNetherBiomeSource.java | 3 +- .../ru/bclib/world/generator/BiomeMap.java | 3 +- .../world/surface/BCLSurfaceBuilders.java | 20 ------ .../surface/DoubleBlockSurfaceBuilder.java | 66 ------------------- 17 files changed, 39 insertions(+), 134 deletions(-) delete mode 100644 src/main/java/ru/bclib/world/surface/BCLSurfaceBuilders.java delete mode 100644 src/main/java/ru/bclib/world/surface/DoubleBlockSurfaceBuilder.java diff --git a/src/main/java/ru/bclib/BCLib.java b/src/main/java/ru/bclib/BCLib.java index 1e450f96..4478b912 100644 --- a/src/main/java/ru/bclib/BCLib.java +++ b/src/main/java/ru/bclib/BCLib.java @@ -20,7 +20,6 @@ import ru.bclib.util.Logger; import ru.bclib.world.generator.BCLibEndBiomeSource; import ru.bclib.world.generator.BCLibNetherBiomeSource; import ru.bclib.world.generator.GeneratorOptions; -import ru.bclib.world.surface.BCLSurfaceBuilders; import java.util.List; @@ -33,7 +32,6 @@ public class BCLib implements ModInitializer { BaseRegistry.register(); GeneratorOptions.init(); BaseBlockEntities.register(); - BCLSurfaceBuilders.register(); BCLibEndBiomeSource.register(); BCLibNetherBiomeSource.register(); TagAPI.init(); diff --git a/src/main/java/ru/bclib/api/TagAPI.java b/src/main/java/ru/bclib/api/TagAPI.java index f157dbfb..a9948037 100644 --- a/src/main/java/ru/bclib/api/TagAPI.java +++ b/src/main/java/ru/bclib/api/TagAPI.java @@ -3,6 +3,7 @@ package ru.bclib.api; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import net.fabricmc.fabric.api.tag.TagFactory; +import net.fabricmc.fabric.api.tag.TagRegistry; import net.fabricmc.fabric.impl.tag.extension.TagDelegate; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java b/src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java index 1a832f6f..c6f23694 100644 --- a/src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java +++ b/src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java @@ -35,6 +35,7 @@ import java.io.DataOutputStream; import java.io.EOFException; import java.io.File; import java.io.IOException; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -459,9 +460,10 @@ public class DataFixerAPI { private static void fixRegion(MigrationProfile data, State state, File file) { try { - LOGGER.info("Inspecting " + file); + Path path = file.toPath(); + LOGGER.info("Inspecting " + path); boolean[] changed = new boolean[1]; - RegionFile region = new RegionFile(file, file.getParentFile(), true); + RegionFile region = new RegionFile(path, path.getParent(), true); for (int x = 0; x < 32; x++) { for (int z = 0; z < 32; z++) { diff --git a/src/main/java/ru/bclib/blockentities/BaseBarrelBlockEntity.java b/src/main/java/ru/bclib/blockentities/BaseBarrelBlockEntity.java index 9965baf5..d4badf53 100644 --- a/src/main/java/ru/bclib/blockentities/BaseBarrelBlockEntity.java +++ b/src/main/java/ru/bclib/blockentities/BaseBarrelBlockEntity.java @@ -94,7 +94,7 @@ public class BaseBarrelBlockEntity extends RandomizableContainerBlockEntity { } private void scheduleUpdate() { - level.getBlockTicks().schedule(getBlockPos(), getBlockState().getBlock(), 5); + level.scheduleTick(getBlockPos(), getBlockState().getBlock(), 5); } public void tick() { diff --git a/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java b/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java index e0a72abf..3dd32197 100644 --- a/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java +++ b/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java @@ -29,13 +29,13 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, private static FabricBlockSettings makeLeaves(MaterialColor color) { return FabricBlockSettings.copyOf(Blocks.OAK_LEAVES) - .color(color) + .mapColor(color) .breakByTool(FabricToolTags.HOES) .breakByTool(FabricToolTags.SHEARS) .breakByHand(true) - .isValidSpawn((state, world, pos, type) -> false) - .isSuffocating((state, world, pos) -> false) - .isViewBlocking((state, world, pos) -> false); + .allowsSpawning((state, world, pos, type) -> false) + .suffocates((state, world, pos) -> false) + .blockVision((state, world, pos) -> false); } public BaseLeavesBlock(Block sapling, MaterialColor color, Consumer customizeProperties) { diff --git a/src/main/java/ru/bclib/blocks/BaseSignBlock.java b/src/main/java/ru/bclib/blocks/BaseSignBlock.java index 2d5cdffe..f8f4f9d8 100644 --- a/src/main/java/ru/bclib/blocks/BaseSignBlock.java +++ b/src/main/java/ru/bclib/blocks/BaseSignBlock.java @@ -105,7 +105,7 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, Cust @Override public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) { if (state.getValue(WATERLOGGED)) { - world.getFluidTicks().schedule(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); + world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); } if (!canSurvive(state, world, pos)) { return state.getValue(WATERLOGGED) ? state.getFluidState() diff --git a/src/main/java/ru/bclib/blocks/FeatureSaplingBlockCommon.java b/src/main/java/ru/bclib/blocks/FeatureSaplingBlockCommon.java index fcc7f3af..83d86edf 100644 --- a/src/main/java/ru/bclib/blocks/FeatureSaplingBlockCommon.java +++ b/src/main/java/ru/bclib/blocks/FeatureSaplingBlockCommon.java @@ -87,6 +87,7 @@ abstract class FeatureSaplingBlockCommon extends SaplingBlock implements RenderL @Override public void advanceTree(ServerLevel world, BlockPos pos, BlockState blockState, Random random) { FeaturePlaceContext context = new FeaturePlaceContext( + Optional.empty(), world, world.getChunkSource().getGenerator(), random, diff --git a/src/main/java/ru/bclib/integration/ModIntegration.java b/src/main/java/ru/bclib/integration/ModIntegration.java index 8597971f..1c26e8c7 100644 --- a/src/main/java/ru/bclib/integration/ModIntegration.java +++ b/src/main/java/ru/bclib/integration/ModIntegration.java @@ -17,6 +17,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; import ru.bclib.BCLib; import ru.bclib.world.features.BCLFeature; @@ -58,9 +59,9 @@ public abstract class ModIntegration { return FabricLoader.getInstance().isModLoaded(modID); } - public BCLFeature getFeature(String featureID, String configuredFeatureID, GenerationStep.Decoration featureStep) { + public BCLFeature getFeature(String featureID, String placedFeatureID, GenerationStep.Decoration featureStep) { Feature feature = Registry.FEATURE.get(getID(featureID)); - ConfiguredFeature featureConfigured = BuiltinRegistries.CONFIGURED_FEATURE.get(getID(configuredFeatureID)); + PlacedFeature featureConfigured = BuiltinRegistries.PLACED_FEATURE.get(getID(placedFeatureID)); return new BCLFeature(feature, featureConfigured, featureStep); } diff --git a/src/main/java/ru/bclib/mixin/common/WorldGenRegionMixin.java b/src/main/java/ru/bclib/mixin/common/WorldGenRegionMixin.java index 08cde84d..29a130c5 100644 --- a/src/main/java/ru/bclib/mixin/common/WorldGenRegionMixin.java +++ b/src/main/java/ru/bclib/mixin/common/WorldGenRegionMixin.java @@ -21,6 +21,6 @@ public class WorldGenRegionMixin { int x = blockPos.getX() >> 4; int z = blockPos.getZ() >> 4; WorldGenRegion region = (WorldGenRegion) (Object) this; - info.setReturnValue(Math.abs(x - center.x) < 2 && Math.abs(z - center.z) < 2); + info.setReturnValue(Math.abs(x - center.getPos().x) < 2 && Math.abs(z - center.getPos().z) < 2); } } diff --git a/src/main/java/ru/bclib/world/biomes/BCLBiome.java b/src/main/java/ru/bclib/world/biomes/BCLBiome.java index ebdf2a73..bf86b175 100644 --- a/src/main/java/ru/bclib/world/biomes/BCLBiome.java +++ b/src/main/java/ru/bclib/world/biomes/BCLBiome.java @@ -8,6 +8,7 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biomes; +import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import ru.bclib.config.Configs; import ru.bclib.util.JsonFactory; import ru.bclib.util.StructureHelper; @@ -152,8 +153,9 @@ public class BCLBiome { list.add(new StructureInfo(structure, offsetY, terrainMerge)); }); if (!list.isEmpty()) { - structuresFeature = BCLFeature.makeChansedFeature( + structuresFeature = BCLFeature.makeChancedFeature( new ResourceLocation(ns, nm + "_structures"), + Decoration.SURFACE_STRUCTURES, new ListFeature(list), 10 ); diff --git a/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java b/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java index f7f2a315..ac8731ae 100644 --- a/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java +++ b/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java @@ -21,22 +21,17 @@ import net.minecraft.world.level.biome.BiomeSpecialEffects.Builder; import net.minecraft.world.level.biome.MobSpawnSettings; import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.levelgen.GenerationStep.Carving; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.carver.CarverConfiguration; import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature; -import net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder; -import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder; -import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; import ru.bclib.config.IdConfig; import ru.bclib.config.PathConfig; import ru.bclib.util.ColorUtil; import ru.bclib.world.features.BCLFeature; import ru.bclib.world.structures.BCLStructureFeature; -import ru.bclib.world.surface.DoubleBlockSurfaceBuilder; import java.util.List; import java.util.Map; @@ -77,8 +72,6 @@ public class BCLBiomeDef { private float downfall = 0F; private int edgeSize = 32; - private ConfiguredSurfaceBuilder surface; - /** * Custom biome definition. Can be extended with new parameters. * @@ -153,24 +146,12 @@ public class BCLBiomeDef { } public BCLBiomeDef setSurface(Block block) { - setSurface(SurfaceBuilder.DEFAULT.configured(new SurfaceBuilderBaseConfiguration( - block.defaultBlockState(), - Blocks.END_STONE.defaultBlockState(), - Blocks.END_STONE.defaultBlockState() - ))); + return this; } public BCLBiomeDef setSurface(Block block1, Block block2) { - setSurface(DoubleBlockSurfaceBuilder.register("bclib_" + id.getPath() + "_surface") - .setBlock1(block1) - .setBlock2(block2) - .configured()); - return this; - } - - public BCLBiomeDef setSurface(ConfiguredSurfaceBuilder builder) { - this.surface = builder; + return this; } @@ -240,7 +221,7 @@ public class BCLBiomeDef { return this; } - public BCLBiomeDef addFeature(Decoration featureStep, ConfiguredFeature feature) { + public BCLBiomeDef addFeature(Decoration featureStep, PlacedFeature feature) { FeatureInfo info = new FeatureInfo(); info.featureStep = featureStep; info.feature = feature; @@ -346,8 +327,10 @@ public class BCLBiomeDef { spawnSettings.addSpawn(entry.type.getCategory(), entry); }); - generationSettings.surfaceBuilder(surface == null ? net.minecraft.data.worldgen.SurfaceBuilders.END : surface); - structures.forEach((structure) -> generationSettings.addStructureStart(structure)); + //generationSettings.surfaceBuilder(surface == null ? net.minecraft.data.worldgen.SurfaceBuilders.END : surface); + + //TODO: 1.18 Done elsewhere now + //structures.forEach((structure) -> generationSettings.addStructureStart(structure)); features.forEach((info) -> generationSettings.addFeature(info.featureStep, info.feature)); carvers.forEach((info) -> generationSettings.addCarver(info.carverStep, info.carver)); @@ -368,12 +351,12 @@ public class BCLBiomeDef { return new Biome.BiomeBuilder() .precipitation(precipitation) .biomeCategory(category) - .depth(depth) - .scale(0.2F) + //.depth(depth) + //.scale(0.2F) .temperature(temperature) .downfall(downfall) - .effects(effects.build()) - .spawnSettings(spawnSettings.build()) + .specialEffects(effects.build()) + .mobSpawnSettings(spawnSettings.build()) .generationSettings(generationSettings.build()) .build(); } @@ -387,7 +370,7 @@ public class BCLBiomeDef { private static final class FeatureInfo { Decoration featureStep; - ConfiguredFeature feature; + PlacedFeature feature; } private static final class CarverInfo { diff --git a/src/main/java/ru/bclib/world/features/NBTStructureFeature.java b/src/main/java/ru/bclib/world/features/NBTStructureFeature.java index 37aa0050..acaed3ec 100644 --- a/src/main/java/ru/bclib/world/features/NBTStructureFeature.java +++ b/src/main/java/ru/bclib/world/features/NBTStructureFeature.java @@ -18,7 +18,6 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; -import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration; import ru.bclib.api.BiomeAPI; import ru.bclib.api.TagAPI; import ru.bclib.util.BlocksHelper; diff --git a/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java b/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java index 97bd8e81..5a8ea37e 100644 --- a/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java +++ b/src/main/java/ru/bclib/world/generator/BCLibEndBiomeSource.java @@ -9,7 +9,9 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome.BiomeCategory; import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.Biomes; +import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.biome.TheEndBiomeSource; +import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.synth.SimplexNoise; import ru.bclib.BCLib; @@ -113,7 +115,7 @@ public class BCLibEndBiomeSource extends BiomeSource { } @Override - public Biome getBiomeForNoiseGen(int biomeX, int biomeY, int biomeZ) { + public Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ, Climate.Sampler sampler) { long i = (long) biomeX * (long) biomeX; long j = (long) biomeZ * (long) biomeZ; long check = GeneratorOptions.isFarEndBiomes() ? 65536L : 625L; diff --git a/src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java b/src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java index 754b8d7d..a11aa935 100644 --- a/src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java +++ b/src/main/java/ru/bclib/world/generator/BCLibNetherBiomeSource.java @@ -8,6 +8,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome.BiomeCategory; import net.minecraft.world.level.biome.BiomeSource; +import net.minecraft.world.level.biome.Climate; import ru.bclib.BCLib; import ru.bclib.api.BiomeAPI; import ru.bclib.config.ConfigKeeper.StringArrayEntry; @@ -91,7 +92,7 @@ public class BCLibNetherBiomeSource extends BiomeSource { } @Override - public Biome getBiomeForNoiseGen(int biomeX, int biomeY, int biomeZ) { + public Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ, Climate.Sampler var4) { if ((biomeX & 63) == 0 && (biomeZ & 63) == 0) { biomeMap.clearCache(); } diff --git a/src/main/java/ru/bclib/world/generator/BiomeMap.java b/src/main/java/ru/bclib/world/generator/BiomeMap.java index a244029c..078bac1f 100644 --- a/src/main/java/ru/bclib/world/generator/BiomeMap.java +++ b/src/main/java/ru/bclib/world/generator/BiomeMap.java @@ -2,6 +2,7 @@ package ru.bclib.world.generator; import com.google.common.collect.Maps; import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import ru.bclib.noise.OpenSimplexNoise; import ru.bclib.util.MHelper; @@ -75,7 +76,7 @@ public class BiomeMap { ChunkPos cpos = new ChunkPos(MHelper.floor(x / BiomeChunk.WIDTH), MHelper.floor(z / BiomeChunk.WIDTH)); BiomeChunk chunk = maps.get(cpos); if (chunk == null) { - RANDOM.setBaseChunkSeed(cpos.x, cpos.z); + RANDOM.setLargeFeatureWithSalt(0, cpos.x, cpos.z, 0); chunk = new BiomeChunk(this, RANDOM, picker); maps.put(cpos, chunk); } diff --git a/src/main/java/ru/bclib/world/surface/BCLSurfaceBuilders.java b/src/main/java/ru/bclib/world/surface/BCLSurfaceBuilders.java deleted file mode 100644 index 641eeace..00000000 --- a/src/main/java/ru/bclib/world/surface/BCLSurfaceBuilders.java +++ /dev/null @@ -1,20 +0,0 @@ -package ru.bclib.world.surface; - -import net.minecraft.core.Registry; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder; -import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration; - -public class BCLSurfaceBuilders { - public static SurfaceBuilder register(String name, SurfaceBuilder builder) { - return Registry.register(Registry.SURFACE_BUILDER, name, builder); - } - - public static SurfaceBuilderBaseConfiguration makeSimpleConfig(Block block) { - BlockState state = block.defaultBlockState(); - return new SurfaceBuilderBaseConfiguration(state, state, state); - } - - public static void register() {} -} diff --git a/src/main/java/ru/bclib/world/surface/DoubleBlockSurfaceBuilder.java b/src/main/java/ru/bclib/world/surface/DoubleBlockSurfaceBuilder.java deleted file mode 100644 index 434b1a39..00000000 --- a/src/main/java/ru/bclib/world/surface/DoubleBlockSurfaceBuilder.java +++ /dev/null @@ -1,66 +0,0 @@ -package ru.bclib.world.surface; - -import net.minecraft.core.Registry; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder; -import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder; -import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration; -import ru.bclib.noise.OpenSimplexNoise; -import ru.bclib.util.MHelper; - -import java.util.Random; - -public class DoubleBlockSurfaceBuilder extends SurfaceBuilder { - private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(4141); - private SurfaceBuilderBaseConfiguration config1; - private SurfaceBuilderBaseConfiguration config2; - - private DoubleBlockSurfaceBuilder() { - super(SurfaceBuilderBaseConfiguration.CODEC); - } - - public DoubleBlockSurfaceBuilder setBlock1(Block block) { - BlockState stone = Blocks.END_STONE.defaultBlockState(); - config1 = new SurfaceBuilderBaseConfiguration(block.defaultBlockState(), stone, stone); - return this; - } - - public DoubleBlockSurfaceBuilder setBlock2(Block block) { - BlockState stone = Blocks.END_STONE.defaultBlockState(); - config2 = new SurfaceBuilderBaseConfiguration(block.defaultBlockState(), stone, stone); - return this; - } - - public static DoubleBlockSurfaceBuilder register(String name) { - return Registry.register(Registry.SURFACE_BUILDER, name, new DoubleBlockSurfaceBuilder()); - } - - public ConfiguredSurfaceBuilder configured() { - BlockState stone = Blocks.END_STONE.defaultBlockState(); - return this.configured(new SurfaceBuilderBaseConfiguration(config1.getTopMaterial(), stone, stone)); - } - - @Override - public void apply(Random random, ChunkAccess chunkAccess, Biome biome, int x, int z, int height, double noise, BlockState defaultBlock, BlockState defaultFluid, int l, int m, long seed, SurfaceBuilderBaseConfiguration surfaceBuilderConfiguration) { - noise = NOISE.eval(x * 0.1, z * 0.1) + MHelper.randRange(-0.4, 0.4, random); - SurfaceBuilder.DEFAULT.apply( - random, - chunkAccess, - biome, - x, - z, - height, - noise, - defaultBlock, - defaultFluid, - l, - m, - seed, - noise > 0 ? config1 : config2 - ); - } -} \ No newline at end of file