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

Structures, texture changes

Browse source
This commit is contained in:
paulevsGitch 2020-10-12 00:24:26 +03:00
parent bd9d71206f
commit 846b14cf7c
21 changed files with 262 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/registry/FeatureRegistry.java
View file

@ -1,6 +1,7 @@
package ru.betterend.registry;
import ru.betterend.world.features.BlueVineFeature;
import ru.betterend.world.features.ChorusTreeFeature;
import ru.betterend.world.features.DoublePlantFeature;
import ru.betterend.world.features.EndFeature;
import ru.betterend.world.features.EndLakeFeature;
@ -11,6 +12,7 @@ import ru.betterend.world.features.VineFeature;
public class FeatureRegistry {
// Trees //
public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 3);
public static final EndFeature CHORUS_TREE = new EndFeature("chorus_tree", new ChorusTreeFeature(), 1);
// Plants //
public static final EndFeature UMBRELLA_MOSS = new EndFeature("umbrella_moss", new DoublePlantFeature(BlockRegistry.UMBRELLA_MOSS, BlockRegistry.UMBRELLA_MOSS_TALL, 5), 5);

10
src/main/java/ru/betterend/util/SplineHelper.java
View file

@ -41,6 +41,16 @@ public class SplineHelper {
}
}
public static void parableOffset(List<Vector3f> spline, float distance) {
int count = spline.size();
for (int i = 1; i < count; i++) {
Vector3f pos = spline.get(i);
float x = (float) i / (float) (count + 1);
float y = pos.getY() + x * x * distance;
pos.set(pos.getX(), y, pos.getZ());
}
}
public static SDF buildSDF(List<Vector3f> spline, float radius1, float radius2, Function<BlockPos, BlockState> placerFunction) {
int count = spline.size();
float max = count - 2;

4
src/main/java/ru/betterend/util/sdf/operator/SDFRotation.java
View file

@ -7,6 +7,10 @@ public class SDFRotation extends SDFUnary {
private static final Vector3f POS = new Vector3f();
private Quaternion rotation;
public SDFRotation setRotation() {
return this;
}
@Override
public float getDistance(float x, float y, float z) {
POS.set(x, y, z);

3
src/main/java/ru/betterend/world/biome/BiomeChorusForest.java
View file

@ -4,7 +4,6 @@ import net.minecraft.entity.EntityType;
import ru.betterend.registry.BlockRegistry;
import ru.betterend.registry.EntityRegistry;
import ru.betterend.registry.FeatureRegistry;
import ru.betterend.registry.StructureRegistry;
public class BiomeChorusForest extends EndBiome {
public BiomeChorusForest() {
@ -15,9 +14,9 @@ public class BiomeChorusForest extends EndBiome {
//.setParticles(ParticleRegistry.GLOWING_SPHERE, 0.001F)
//.setLoop(SoundRegistry.AMBIENT_FOGGY_MUSHROOMLAND)
//.setMusic(SoundRegistry.MUSIC_FOGGY_MUSHROOMLAND)
.addStructureFeature(StructureRegistry.GIANT_MOSSY_GLOWSHROOM)
.addFeature(FeatureRegistry.ENDER_ORE)
.addFeature(FeatureRegistry.RARE_END_LAKE)
.addFeature(FeatureRegistry.CHORUS_TREE)
.addFeature(FeatureRegistry.CHORUS_GRASS)
.addMobSpawn(EntityRegistry.END_SLIME, 5, 1, 2)
.addMobSpawn(EntityType.ENDERMAN, 50, 1, 4));

96
src/main/java/ru/betterend/world/features/ChorusTreeFeature.java Normal file
View file

@ -0,0 +1,96 @@
package ru.betterend.world.features;
import java.util.List;
import java.util.Random;
import java.util.function.Function;
import com.google.common.collect.Lists;
import net.minecraft.block.BlockState;
import net.minecraft.block.Material;
import net.minecraft.client.util.math.Vector3f;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.StructureWorldAccess;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import ru.betterend.registry.BlockRegistry;
import ru.betterend.registry.BlockTagRegistry;
import ru.betterend.util.MHelper;
import ru.betterend.util.SplineHelper;
import ru.betterend.util.sdf.SDF;
import ru.betterend.util.sdf.operator.SDFScale;
import ru.betterend.util.sdf.operator.SDFUnion;
public class ChorusTreeFeature extends DefaultFeature {
private static final Function<BlockState, Boolean> REPLACE;
@Override
public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) {
if (world.getBlockState(pos.down()).getBlock() != BlockRegistry.CHORUS_NYLIUM) return false;
float size = MHelper.randRange(10, 20, random);
List<List<Vector3f>> splines = Lists.newArrayList();
List<Vector3f> spline = SplineHelper.makeSpline(0, 0, 0, 0, size, 0, 4);
SplineHelper.offsetParts(spline, random, 0.7F, 0, 0.7F);
Vector3f last = spline.get(spline.size() - 1);
branch(splines, last.getX(), last.getY(), last.getZ(), size * 0.6F, MHelper.randRange(0, MHelper.PI2, random), random, MHelper.floor(Math.log(size) * 1.5F));
SDF function = SplineHelper.buildSDF(spline, 1.4F, 0.8F, (bpos) -> {
return BlockRegistry.CHORUS.bark.getDefaultState();
});
for (List<Vector3f> sp: splines) {
float width = 0.8F - (sp.get(0).getY() - size) / 40;
if (size > 0F) {
SDF funcSp = SplineHelper.buildSDF(sp, width, width, (bpos) -> {
return BlockRegistry.CHORUS.bark.getDefaultState();
});
function = new SDFUnion().setSourceA(function).setSourceB(funcSp);
}
}
function = new SDFScale().setScale(MHelper.randRange(1F, 2F, random)).setSource(function);
function.setReplaceFunction(REPLACE);
function.fillRecursive(world, pos);
return true;
}
private void branch(List<List<Vector3f>> splines, float x, float y, float z, float size, float angle, Random random, int depth) {
if (depth == 0) return;
float dx = (float) Math.cos(angle) * size * 0.3F;
float dz = (float) Math.sin(angle) * size * 0.3F;
float x1 = x + dx;
float z1 = z + dz;
float x2 = x - dx;
float z2 = z - dz;
List<Vector3f> spline = SplineHelper.makeSpline(x, y, z, x1, y, z1, 5);
SplineHelper.parableOffset(spline, size);
SplineHelper.offsetParts(spline, random, 0.3F, 0, 0.3F);
splines.add(spline);
Vector3f pos1 = spline.get(spline.size() - 1);
spline = SplineHelper.makeSpline(x, y, z, x2, y, z2, 5);
SplineHelper.parableOffset(spline, size);
SplineHelper.offsetParts(spline, random, 0.3F, 0, 0.3F);
splines.add(spline);
Vector3f pos2 = spline.get(spline.size() - 1);
branch(splines, pos1.getX(), pos1.getY(), pos1.getZ(), size * 0.8F, angle + (float) Math.PI * 0.5F, random, depth - 1);
branch(splines, pos2.getX(), pos2.getY(), pos2.getZ(), size * 0.8F, angle + (float) Math.PI * 0.5F, random, depth - 1);
}
static {
REPLACE = (state) -> {
if (state.isIn(BlockTagRegistry.END_GROUND)) {
return true;
}
if (state.getMaterial().equals(Material.PLANT)) {
return true;
}
return state.getMaterial().isReplaceable();
};
}
}