MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Start migration

Browse source
This commit is contained in:
Aleksey 2021-04-08 21:55:07 +03:00
parent 6630ce0cab
commit 47ed597358
491 changed files with 12045 additions and 11953 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/ru/betterend/world/surface/DoubleBlockSurfaceBuilder.java
View file

@ -2,10 +2,10 @@ package ru.betterend.world.surface;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.core.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilder;
@ -18,35 +18,38 @@ public class DoubleBlockSurfaceBuilder extends SurfaceBuilder<TernarySurfaceConf
private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(4141);
private TernarySurfaceConfig config1;
private TernarySurfaceConfig config2;
private DoubleBlockSurfaceBuilder() {
super(TernarySurfaceConfig.CODEC);
}
public DoubleBlockSurfaceBuilder setBlock1(Block block) {
BlockState stone = Blocks.END_STONE.getDefaultState();
config1 = new TernarySurfaceConfig(block.getDefaultState(), stone, stone);
BlockState stone = Blocks.END_STONE.defaultBlockState();
config1 = new TernarySurfaceConfig(block.defaultBlockState(), stone, stone);
return this;
}
public DoubleBlockSurfaceBuilder setBlock2(Block block) {
BlockState stone = Blocks.END_STONE.getDefaultState();
config2 = new TernarySurfaceConfig(block.getDefaultState(), stone, stone);
BlockState stone = Blocks.END_STONE.defaultBlockState();
config2 = new TernarySurfaceConfig(block.defaultBlockState(), stone, stone);
return this;
}
@Override
public void generate(Random random, Chunk chunk, Biome biome, int x, int z, int height, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, TernarySurfaceConfig surfaceBlocks) {
public void generate(Random random, Chunk chunk, Biome biome, int x, int z, int height, double noise,
BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed,
TernarySurfaceConfig surfaceBlocks) {
noise = NOISE.eval(x * 0.1, z * 0.1) + MHelper.randRange(-0.4, 0.4, random);
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, noise > 0 ? config1 : config2);
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel,
seed, noise > 0 ? config1 : config2);
}
public static DoubleBlockSurfaceBuilder register(String name) {
return Registry.register(Registry.SURFACE_BUILDER, name, new DoubleBlockSurfaceBuilder());
}
public ConfiguredSurfaceBuilder<TernarySurfaceConfig> configured() {
BlockState stone = Blocks.END_STONE.getDefaultState();
BlockState stone = Blocks.END_STONE.defaultBlockState();
return this.withConfig(new TernarySurfaceConfig(config1.getTopMaterial(), stone, stone));
}
}

36
src/main/java/ru/betterend/world/surface/SulphuricSurfaceBuilder.java
View file

@ -2,8 +2,8 @@ package ru.betterend.world.surface;
import java.util.Random;
import net.minecraft.block.BlockState;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.core.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
@ -13,28 +13,32 @@ import ru.betterend.util.MHelper;
public class SulphuricSurfaceBuilder extends SurfaceBuilder<TernarySurfaceConfig> {
private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(5123);
public SulphuricSurfaceBuilder() {
super(TernarySurfaceConfig.CODEC);
}
@Override
public void generate(Random random, Chunk chunk, Biome biome, int x, int z, int height, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, TernarySurfaceConfig surfaceBlocks) {
double value = NOISE.eval(x * 0.03, z * 0.03) + NOISE.eval(x * 0.1, z * 0.1) * 0.3 + MHelper.randRange(-0.1, 0.1, MHelper.RANDOM);
public void generate(Random random, Chunk chunk, Biome biome, int x, int z, int height, double noise,
BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed,
TernarySurfaceConfig surfaceBlocks) {
double value = NOISE.eval(x * 0.03, z * 0.03) + NOISE.eval(x * 0.1, z * 0.1) * 0.3
+ MHelper.randRange(-0.1, 0.1, MHelper.RANDOM);
if (value < -0.6) {
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilders.DEFAULT_END_CONFIG);
}
else if (value < -0.3) {
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilders.FLAVOLITE_CONFIG);
}
else if (value < 0.5) {
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilders.SULFURIC_ROCK_CONFIG);
}
else {
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilders.BRIMSTONE_CONFIG);
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid,
seaLevel, seed, SurfaceBuilders.DEFAULT_END_CONFIG);
} else if (value < -0.3) {
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid,
seaLevel, seed, SurfaceBuilders.FLAVOLITE_CONFIG);
} else if (value < 0.5) {
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid,
seaLevel, seed, SurfaceBuilders.SULFURIC_ROCK_CONFIG);
} else {
SurfaceBuilder.DEFAULT.generate(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid,
seaLevel, seed, SurfaceBuilders.BRIMSTONE_CONFIG);
}
}
public static SulphuricSurfaceBuilder register(String name) {
return Registry.register(Registry.SURFACE_BUILDER, name, new SulphuricSurfaceBuilder());
}

27
src/main/java/ru/betterend/world/surface/SurfaceBuilders.java
View file

@ -1,9 +1,9 @@
package ru.betterend.world.surface;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.core.Registry;
import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
import net.minecraft.world.gen.surfacebuilder.TernarySurfaceConfig;
import ru.betterend.registry.EndBlocks;
@ -13,17 +13,20 @@ public class SurfaceBuilders {
public static final TernarySurfaceConfig FLAVOLITE_CONFIG = makeSimpleConfig(EndBlocks.FLAVOLITE.stone);
public static final TernarySurfaceConfig BRIMSTONE_CONFIG = makeSimpleConfig(EndBlocks.BRIMSTONE);
public static final TernarySurfaceConfig SULFURIC_ROCK_CONFIG = makeSimpleConfig(EndBlocks.SULPHURIC_ROCK.stone);
public static final SurfaceBuilder<TernarySurfaceConfig> SULPHURIC_SURFACE = register("sulphuric_surface", new SulphuricSurfaceBuilder());
private static SurfaceBuilder<TernarySurfaceConfig> register(String name, SurfaceBuilder<TernarySurfaceConfig> builder) {
public static final SurfaceBuilder<TernarySurfaceConfig> SULPHURIC_SURFACE = register("sulphuric_surface",
new SulphuricSurfaceBuilder());
private static SurfaceBuilder<TernarySurfaceConfig> register(String name,
SurfaceBuilder<TernarySurfaceConfig> builder) {
return Registry.register(Registry.SURFACE_BUILDER, name, builder);
}
private static TernarySurfaceConfig makeSimpleConfig(Block block) {
BlockState state = block.getDefaultState();
BlockState state = block.defaultBlockState();
return new TernarySurfaceConfig(state, state, state);
}
public static void register() {}
public static void register() {
}
}