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

Various smaller updates

Browse source
This commit is contained in:
Frank Bauer 2021-06-24 17:11:48 +02:00
parent fdd61262c5
commit 10a9a81725
64 changed files with 372 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/betterend/world/features/terrain/BigAuroraCrystalFeature.java
View file

@ -22,9 +22,9 @@ import ru.betterend.registry.EndBlocks;
public class BigAuroraCrystalFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final WorldGenLevel world = featureConfig.level();
int maxY = pos.getY() + BlocksHelper.upRay(world, pos, 16);
int minY = pos.getY() - BlocksHelper.downRay(world, pos, 16);

4
src/main/java/ru/betterend/world/features/terrain/DesertLakeFeature.java
View file

@ -27,9 +27,9 @@ public class DesertLakeFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos blockPos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final WorldGenLevel world = featureConfig.level();
double radius = MHelper.randRange(8.0, 15.0, random);
double depth = radius * 0.5 * MHelper.randRange(0.8, 1.2, random);
int dist = MHelper.floor(radius);

6
src/main/java/ru/betterend/world/features/terrain/EndLakeFeature.java
View file

@ -27,9 +27,9 @@ public class EndLakeFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
BlockPos blockPos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final Random random = featureConfig.random();
final BlockPos blockPos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
double radius = MHelper.randRange(10.0, 20.0, random);
double depth = radius * 0.5 * MHelper.randRange(0.8, 1.2, random);
int dist = MHelper.floor(radius);

4
src/main/java/ru/betterend/world/features/terrain/FallenPillarFeature.java
View file

@ -26,9 +26,9 @@ import ru.betterend.registry.EndBlocks;
public class FallenPillarFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final WorldGenLevel world = featureConfig.level();
pos = getPosOnSurface(world,
new BlockPos(pos.getX() + random.nextInt(16), pos.getY(), pos.getZ() + random.nextInt(16)));
if (!world.getBlockState(pos.below(5)).is(TagAPI.GEN_TERRAIN)) {

6
src/main/java/ru/betterend/world/features/terrain/FloatingSpireFeature.java
View file

@ -24,10 +24,10 @@ import ru.betterend.registry.EndFeatures;
public class FloatingSpireFeature extends SpireFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
ChunkGenerator chunkGenerator = featureConfig.chunkGenerator();
final WorldGenLevel world = featureConfig.level();
final ChunkGenerator chunkGenerator = featureConfig.chunkGenerator();
int minY = getYOnSurface(world, pos.getX(), pos.getZ());
int y = minY > 57 ? MHelper.floor(MHelper.randRange(minY, minY * 2, random) * 0.5F + 32)
: MHelper.randRange(64, 192, random);

4
src/main/java/ru/betterend/world/features/terrain/IceStarFeature.java
View file

@ -36,9 +36,9 @@ public class IceStarFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final WorldGenLevel world = featureConfig.level();
float size = MHelper.randRange(minSize, maxSize, random);
int count = MHelper.randRange(minCount, maxCount, random);
List<Vector3f> points = getFibonacciPoints(count);

4
src/main/java/ru/betterend/world/features/terrain/ObsidianBoulderFeature.java
View file

@ -23,9 +23,9 @@ import ru.betterend.registry.EndBlocks;
public class ObsidianBoulderFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final WorldGenLevel world = featureConfig.level();
pos = getPosOnSurface(world,
new BlockPos(pos.getX() + random.nextInt(16), pos.getY(), pos.getZ() + random.nextInt(16)));
if (!world.getBlockState(pos.below()).is(TagAPI.END_GROUND)) {

4
src/main/java/ru/betterend/world/features/terrain/ObsidianPillarBasementFeature.java
View file

@ -26,9 +26,9 @@ import java.util.Random;
public class ObsidianPillarBasementFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final WorldGenLevel world = featureConfig.level();
pos = getPosOnSurface(world, new BlockPos(pos.getX() + random.nextInt(16), pos.getY(), pos.getZ() + random.nextInt(16)));
if (!world.getBlockState(pos.below(5)).is(TagAPI.GEN_TERRAIN)) {
return false;

6
src/main/java/ru/betterend/world/features/terrain/OreLayerFeature.java
View file

@ -37,9 +37,9 @@ public class OreLayerFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final Random random = featureConfig.random();
final BlockPos pos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
float radius = this.radius * 0.5F;
int r = MHelper.floor(radius + 1);
int posX = MHelper.randRange(Math.max(r - 16, 0), Math.min(31 - r, 15), random) + pos.getX();

6
src/main/java/ru/betterend/world/features/terrain/SingleBlockFeature.java
View file

@ -23,9 +23,9 @@ public class SingleBlockFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final Random random = featureConfig.random();
final BlockPos pos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
if (!world.getBlockState(pos.below()).is(TagAPI.GEN_TERRAIN)) {
return false;
}

6
src/main/java/ru/betterend/world/features/terrain/SmaragdantCrystalFeature.java
View file

@ -19,9 +19,9 @@ import ru.betterend.registry.EndBlocks;
public class SmaragdantCrystalFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final Random random = featureConfig.random();
final BlockPos pos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
if (!world.getBlockState(pos.below()).is(TagAPI.GEN_TERRAIN)) {
return false;
}

6
src/main/java/ru/betterend/world/features/terrain/SpireFeature.java
View file

@ -34,10 +34,10 @@ public class SpireFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
ChunkGenerator chunkGenerator = featureConfig.chunkGenerator();
final WorldGenLevel world = featureConfig.level();
final ChunkGenerator chunkGenerator = featureConfig.chunkGenerator();
pos = getPosOnSurfaceWG(world, pos);
if (pos.getY() < 10 || !world.getBlockState(pos.below(3)).is(TagAPI.GEN_TERRAIN)
|| !world.getBlockState(pos.below(6)).is(TagAPI.GEN_TERRAIN)) {

6
src/main/java/ru/betterend/world/features/terrain/StalactiteFeature.java
View file

@ -30,9 +30,9 @@ public class StalactiteFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final Random random = featureConfig.random();
final BlockPos pos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
if (!isGround(world.getBlockState(ceiling ? pos.above() : pos.below()).getBlock())) {
return false;
}

4
src/main/java/ru/betterend/world/features/terrain/SulphurHillFeature.java
View file

@ -21,9 +21,9 @@ import ru.betterend.registry.EndBlocks;
public class SulphurHillFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final WorldGenLevel world = featureConfig.level();
pos = getPosOnSurfaceWG(world, pos);
if (pos.getY() < 57 || pos.getY() > 70) {
return false;

4
src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java
View file

@ -34,9 +34,9 @@ public class SulphuricCaveFeature extends DefaultFeature {
@Override
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
Random random = featureConfig.random();
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
WorldGenLevel world = featureConfig.level();
final WorldGenLevel world = featureConfig.level();
int radius = MHelper.randRange(10, 30, random);
int top = world.getHeight(Heightmap.Types.WORLD_SURFACE_WG, pos.getX(), pos.getZ());

15
src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java
View file

@ -1,17 +1,13 @@
package ru.betterend.world.features.terrain;
import java.util.Random;
import java.util.Set;
import com.google.common.collect.Sets;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.WorldGenLevel;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import net.minecraft.world.level.material.Fluids;
import ru.bclib.api.TagAPI;
@ -23,13 +19,18 @@ import ru.betterend.blocks.SulphurCrystalBlock;
import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBlocks;
import java.util.Random;
import java.util.Set;
public class SulphuricLakeFeature extends DefaultFeature {
private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(15152);
private static final MutableBlockPos POS = new MutableBlockPos();
@Override
public boolean place(WorldGenLevel world, ChunkGenerator chunkGenerator, Random random, BlockPos blockPos,
NoneFeatureConfiguration featureConfig) {
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
final Random random = featureConfig.random();
BlockPos blockPos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
blockPos = getPosOnSurfaceWG(world, blockPos);
if (blockPos.getY() < 57) {

12
src/main/java/ru/betterend/world/features/terrain/SurfaceVentFeature.java
View file

@ -1,12 +1,10 @@
package ru.betterend.world.features.terrain;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.world.level.WorldGenLevel;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import ru.bclib.api.TagAPI;
import ru.bclib.util.BlocksHelper;
@ -15,10 +13,14 @@ import ru.bclib.world.features.DefaultFeature;
import ru.betterend.blocks.HydrothermalVentBlock;
import ru.betterend.registry.EndBlocks;
import java.util.Random;
public class SurfaceVentFeature extends DefaultFeature {
@Override
public boolean place(WorldGenLevel world, ChunkGenerator chunkGenerator, Random random, BlockPos pos,
NoneFeatureConfiguration config) {
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
final Random random = featureConfig.random();
BlockPos pos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
pos = getPosOnSurface(world,
new BlockPos(pos.getX() + random.nextInt(16), pos.getY(), pos.getZ() + random.nextInt(16)));
if (!world.getBlockState(pos.below(3)).is(TagAPI.GEN_TERRAIN)) {

10
src/main/java/ru/betterend/world/features/terrain/caves/CaveChunkPopulatorFeature.java
View file

@ -14,6 +14,7 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkAccess;
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.feature.Feature;
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import ru.bclib.api.TagAPI;
import ru.bclib.util.BlocksHelper;
@ -29,7 +30,10 @@ public class CaveChunkPopulatorFeature extends DefaultFeature {
}
@Override
public boolean place(WorldGenLevel world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, NoneFeatureConfiguration config) {
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
final Random random = featureConfig.random();
final BlockPos pos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
Set<BlockPos> floorPositions = Sets.newHashSet();
Set<BlockPos> ceilPositions = Sets.newHashSet();
int sx = (pos.getX() >> 4) << 4;
@ -111,7 +115,7 @@ public class CaveChunkPopulatorFeature extends DefaultFeature {
if (density > 0 && random.nextFloat() <= density) {
Feature<?> feature = biome.getFloorFeature(random);
if (feature != null) {
feature.place(world, null, random, pos.above(), null);
feature.place(new FeaturePlaceContext<>(world, null, random, pos.above(), null));
}
}
});
@ -127,7 +131,7 @@ public class CaveChunkPopulatorFeature extends DefaultFeature {
if (density > 0 && random.nextFloat() <= density) {
Feature<?> feature = biome.getCeilFeature(random);
if (feature != null) {
feature.place(world, null, random, pos.below(), null);
feature.place(new FeaturePlaceContext<>(world, null, random, pos.below(), null));
}
}
});

20
src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java
View file

@ -1,12 +1,7 @@
package ru.betterend.world.features.terrain.caves;
import java.util.List;
import java.util.Random;
import java.util.Set;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Direction;
@ -15,9 +10,9 @@ import net.minecraft.world.level.WorldGenLevel;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.Heightmap;
import net.minecraft.world.level.levelgen.feature.Feature;
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import ru.bclib.api.BiomeAPI;
import ru.bclib.api.TagAPI;
@ -30,6 +25,10 @@ import ru.betterend.registry.EndBiomes;
import ru.betterend.util.BlockFixer;
import ru.betterend.world.biome.cave.EndCaveBiome;
import java.util.List;
import java.util.Random;
import java.util.Set;
public abstract class EndCaveFeature extends DefaultFeature {
protected static final BlockState CAVE_AIR = Blocks.CAVE_AIR.defaultBlockState();
protected static final BlockState END_STONE = Blocks.END_STONE.defaultBlockState();
@ -37,7 +36,10 @@ public abstract class EndCaveFeature extends DefaultFeature {
private static final Vec3i[] SPHERE;
@Override
public boolean place(WorldGenLevel world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, NoneFeatureConfiguration config) {
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
final Random random = featureConfig.random();
final BlockPos pos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
if (pos.getX() * pos.getX() + pos.getZ() * pos.getZ() <= 2500) {
return false;
}
@ -94,7 +96,7 @@ public abstract class EndCaveFeature extends DefaultFeature {
if (density > 0 && random.nextFloat() <= density) {
Feature<?> feature = biome.getFloorFeature(random);
if (feature != null) {
feature.place(world, null, random, pos.above(), null);
feature.place(new FeaturePlaceContext<>(world, null, random, pos.above(), null));
}
}
});
@ -110,7 +112,7 @@ public abstract class EndCaveFeature extends DefaultFeature {
if (density > 0 && random.nextFloat() <= density) {
Feature<?> feature = biome.getCeilFeature(random);
if (feature != null) {
feature.place(world, null, random, pos.below(), null);
feature.place(new FeaturePlaceContext<>(world, null, random, pos.below(), null));
}
}
});

22
src/main/java/ru/betterend/world/features/terrain/caves/TunelCaveFeature.java
View file

@ -1,13 +1,7 @@
package ru.betterend.world.features.terrain.caves;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.stream.IntStream;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Direction;
@ -17,9 +11,9 @@ import net.minecraft.world.level.biome.Biome;
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.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.Heightmap.Types;
import net.minecraft.world.level.levelgen.feature.Feature;
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import ru.bclib.api.BiomeAPI;
import ru.bclib.api.TagAPI;
@ -29,6 +23,11 @@ import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.EndBiomes;
import ru.betterend.world.biome.cave.EndCaveBiome;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.stream.IntStream;
public class TunelCaveFeature extends EndCaveFeature {
private Set<BlockPos> generate(WorldGenLevel world, BlockPos center, Random random) {
int cx = center.getX() >> 4;
@ -107,7 +106,10 @@ public class TunelCaveFeature extends EndCaveFeature {
}
@Override
public boolean place(WorldGenLevel world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, NoneFeatureConfiguration config) {
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> featureConfig) {
final Random random = featureConfig.random();
final BlockPos pos = featureConfig.origin();
final WorldGenLevel world = featureConfig.level();
if (pos.getX() * pos.getX() + pos.getZ() * pos.getZ() <= 2500) {
return false;
}
@ -189,7 +191,7 @@ public class TunelCaveFeature extends EndCaveFeature {
if (density > 0 && random.nextFloat() <= density) {
Feature<?> feature = biome.getFloorFeature(random);
if (feature != null) {
feature.place(world, null, random, pos.above(), null);
feature.place(new FeaturePlaceContext<>(world, null, random, pos.above(), null));
}
}
});
@ -206,7 +208,7 @@ public class TunelCaveFeature extends EndCaveFeature {
if (density > 0 && random.nextFloat() <= density) {
Feature<?> feature = biome.getCeilFeature(random);
if (feature != null) {
feature.place(world, null, random, pos.below(), null);
feature.place(new FeaturePlaceContext<>(world, null, random, pos.below(), null));
}
}
});