Lantern woods enhancements

src/main/java/ru/betterend/registry/EndFeatures.java

@@ -36,6 +36,7 @@ import ru.betterend.world.features.VineFeature;
 import ru.betterend.world.features.WallPlantFeature;
 import ru.betterend.world.features.WallPlantOnLogFeature;
 import ru.betterend.world.features.bushes.BushFeature;
+import ru.betterend.world.features.bushes.BushWithOuterFeature;
 import ru.betterend.world.features.bushes.LargeAmaranitaFeature;
 import ru.betterend.world.features.bushes.Lumecorn;
 import ru.betterend.world.features.bushes.TenaneaBushFeature;
@@ -87,6 +88,7 @@ public class EndFeatures {
 	public static final EndFeature TENANEA_BUSH = new EndFeature("tenanea_bush", new TenaneaBushFeature(), 10);
 	public static final EndFeature LUMECORN = new EndFeature("lumecorn", new Lumecorn(), 5);
 	public static final EndFeature LARGE_AMARANITA = new EndFeature("large_amaranita", new LargeAmaranitaFeature(), 5);
+	public static final EndFeature LUCERNIA_BUSH = new EndFeature("lucernia_bush", new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, EndBlocks.LUCERNIA_OUTER_LEAVES, EndBlocks.LUCERNIA.bark), 10);
 	
 	// Plants //
 	public static final EndFeature UMBRELLA_MOSS = new EndFeature("umbrella_moss", new DoublePlantFeature(EndBlocks.UMBRELLA_MOSS, EndBlocks.UMBRELLA_MOSS_TALL, 5), 5);

src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java

@@ -4,6 +4,7 @@ import net.minecraft.entity.EntityType;
 import net.minecraft.world.gen.feature.ConfiguredStructureFeatures;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
+import ru.betterend.registry.EndParticles;
 import ru.betterend.registry.EndSounds;
 
 public class LanternWoodsBiome extends EndBiome {
@@ -15,11 +16,12 @@ public class LanternWoodsBiome extends EndBiome {
 				.setPlantsColor(237, 122, 66)
 				.setSurface(EndBlocks.RUTISCUS)
 				.setMusic(EndSounds.MUSIC_FOREST)
+				.setParticles(EndParticles.GLOWING_SPHERE, 0.0005F)
+				.addFeature(EndFeatures.END_LAKE_RARE)
 				.addFeature(EndFeatures.LUCERNIA)
+				.addFeature(EndFeatures.LUCERNIA_BUSH)
 				.addFeature(EndFeatures.FILALUX)
-				.addFeature(EndFeatures.ORANGO)
 				.addFeature(EndFeatures.AERIDIUM)
-				.addFeature(EndFeatures.LUTEBUS)
 				.addFeature(EndFeatures.LAMELLARIUM)
 				.addStructureFeature(ConfiguredStructureFeatures.END_CITY)
 				.addMobSpawn(EntityType.ENDERMAN, 50, 1, 2));

src/main/java/ru/betterend/world/features/bushes/BushWithOuterFeature.java

@@ -0,0 +1,100 @@
+package ru.betterend.world.features.bushes;
+
+import java.util.Random;
+import java.util.function.Function;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.block.Material;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.StructureWorldAccess;
+import net.minecraft.world.gen.chunk.ChunkGenerator;
+import net.minecraft.world.gen.feature.DefaultFeatureConfig;
+import ru.betterend.noise.OpenSimplexNoise;
+import ru.betterend.registry.EndTags;
+import ru.betterend.util.BlocksHelper;
+import ru.betterend.util.MHelper;
+import ru.betterend.util.sdf.SDF;
+import ru.betterend.util.sdf.operator.SDFDisplacement;
+import ru.betterend.util.sdf.operator.SDFScale3D;
+import ru.betterend.util.sdf.operator.SDFSubtraction;
+import ru.betterend.util.sdf.operator.SDFTranslate;
+import ru.betterend.util.sdf.primitive.SDFSphere;
+import ru.betterend.world.features.DefaultFeature;
+
+public class BushWithOuterFeature extends DefaultFeature {
+	private static final Direction[] DIRECTIONS = Direction.values();
+	private static final Function<BlockState, Boolean> REPLACE;
+	private final Block outer_leaves;
+	private final Block leaves;
+	private final Block stem;
+	
+	public BushWithOuterFeature(Block leaves, Block outer_leaves, Block stem) {
+		this.outer_leaves = outer_leaves;
+		this.leaves = leaves;
+		this.stem = stem;
+	}
+	
+	@Override
+	public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) {
+		if (!world.getBlockState(pos.down()).getBlock().isIn(EndTags.END_GROUND) && !world.getBlockState(pos.up()).getBlock().isIn(EndTags.END_GROUND)) return false;
+		
+		float radius = MHelper.randRange(1.8F, 3.5F, random);
+		OpenSimplexNoise noise = new OpenSimplexNoise(random.nextInt());
+		SDF sphere = new SDFSphere().setRadius(radius).setBlock(this.leaves);
+		sphere = new SDFScale3D().setScale(1, 0.5F, 1).setSource(sphere);
+		sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 3; }).setSource(sphere);
+		sphere = new SDFDisplacement().setFunction((vec) -> { return MHelper.randRange(-2F, 2F, random); }).setSource(sphere);
+		sphere = new SDFSubtraction().setSourceA(sphere).setSourceB(new SDFTranslate().setTranslate(0, -radius, 0).setSource(sphere));
+		sphere.setReplaceFunction(REPLACE);
+		sphere.addPostProcess((info) -> {
+			if (info.getState().getBlock() instanceof LeavesBlock) {
+				int distance = info.getPos().getManhattanDistance(pos);
+				if (distance < 7) {
+					return info.getState().with(LeavesBlock.DISTANCE, distance);
+				}
+				else {
+					return AIR;
+				}
+			}
+			return info.getState();
+		}).addPostProcess((info) -> {
+			if (info.getState().getBlock() instanceof LeavesBlock) {
+				MHelper.shuffle(DIRECTIONS, random);
+				for (Direction dir: DIRECTIONS) {
+					if (info.getState(dir).isAir()) {
+						info.setBlockPos(info.getPos().offset(dir), outer_leaves.getDefaultState().with(Properties.FACING, dir));
+					}
+				}
+			}
+			return info.getState();
+		});
+		sphere.fillRecursive(world, pos);
+		BlocksHelper.setWithoutUpdate(world, pos, stem);
+		for (Direction d: Direction.values()) {
+			BlockPos p = pos.offset(d);
+			if (world.isAir(p)) {
+				if (leaves instanceof LeavesBlock) {
+					BlocksHelper.setWithoutUpdate(world, p, leaves.getDefaultState().with(LeavesBlock.DISTANCE, 1));
+				}
+				else {
+					BlocksHelper.setWithoutUpdate(world, p, leaves.getDefaultState());
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	static {
+		REPLACE = (state) -> {
+			if (state.getMaterial().equals(Material.PLANT)) {
+				return true;
+			}
+			return state.getMaterial().isReplaceable();
+		};
+	}
+}

src/main/java/ru/betterend/world/features/bushes/CaveBushFeature.java

@@ -1,56 +0,0 @@
-package ru.betterend.world.features.bushes;
-
-import java.util.Random;
-import java.util.function.Function;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Material;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.StructureWorldAccess;
-import ru.betterend.noise.OpenSimplexNoise;
-import ru.betterend.registry.EndBlocks;
-import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
-import ru.betterend.util.sdf.SDF;
-import ru.betterend.util.sdf.operator.SDFDisplacement;
-import ru.betterend.util.sdf.operator.SDFScale3D;
-import ru.betterend.util.sdf.operator.SDFSubtraction;
-import ru.betterend.util.sdf.operator.SDFTranslate;
-import ru.betterend.util.sdf.primitive.SDFSphere;
-import ru.betterend.world.features.FullHeightScatterFeature;
-
-public class CaveBushFeature extends FullHeightScatterFeature {
-	public CaveBushFeature(int radius) {
-		super(radius);
-	}
-
-	private static final Function<BlockState, Boolean> REPLACE;
-
-	@Override
-	public boolean canGenerate(StructureWorldAccess world, Random random, BlockPos center, BlockPos blockPos, float radius) {
-		return world.getBlockState(blockPos.down()).isOf(EndBlocks.CAVE_MOSS);
-	}
-
-	@Override
-	public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) {
-		float radius = MHelper.randRange(0.8F, 2.5F, random);
-		OpenSimplexNoise noise = new OpenSimplexNoise(random.nextInt());
-		SDF sphere = new SDFSphere().setRadius(radius).setBlock(EndBlocks.CAVE_BUSH);
-		sphere = new SDFScale3D().setScale(MHelper.randRange(0.8F, 1.2F, random), MHelper.randRange(0.8F, 1.2F, random), MHelper.randRange(0.8F, 1.2F, random)).setSource(sphere);
-		sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 3; }).setSource(sphere);
-		sphere = new SDFDisplacement().setFunction((vec) -> { return random.nextFloat() * 3F - 1.5F; }).setSource(sphere);
-		sphere = new SDFSubtraction().setSourceA(sphere).setSourceB(new SDFTranslate().setTranslate(0, -radius, 0).setSource(sphere));
-		sphere.setReplaceFunction(REPLACE);
-		sphere.fillRecursive(world, blockPos);
-		BlocksHelper.setWithoutUpdate(world, blockPos, EndBlocks.CAVE_BUSH);
-	}
-	
-	static {
-		REPLACE = (state) -> {
-			if (state.getMaterial().equals(Material.PLANT)) {
-				return true;
-			}
-			return state.getMaterial().isReplaceable();
-		};
-	}
-}

src/main/java/ru/betterend/world/features/bushes/CaveBushFeatureCeil.java

@@ -1,59 +0,0 @@
-package ru.betterend.world.features.bushes;
-
-import java.util.Random;
-import java.util.function.Function;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Material;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.StructureWorldAccess;
-import ru.betterend.noise.OpenSimplexNoise;
-import ru.betterend.registry.EndBlocks;
-import ru.betterend.registry.EndTags;
-import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
-import ru.betterend.util.sdf.SDF;
-import ru.betterend.util.sdf.operator.SDFDisplacement;
-import ru.betterend.util.sdf.operator.SDFScale3D;
-import ru.betterend.util.sdf.operator.SDFSubtraction;
-import ru.betterend.util.sdf.operator.SDFTranslate;
-import ru.betterend.util.sdf.primitive.SDFSphere;
-import ru.betterend.world.features.InvertedScatterFeature;
-
-public class CaveBushFeatureCeil extends InvertedScatterFeature {
-	public CaveBushFeatureCeil(int radius) {
-		super(radius);
-	}
-
-	private static final Function<BlockState, Boolean> REPLACE;
-
-	@Override
-	public boolean canGenerate(StructureWorldAccess world, Random random, BlockPos center, BlockPos blockPos, float radius) {
-		return world.isAir(blockPos.down())
-				&& world.getBlockState(blockPos.up()).isIn(EndTags.GEN_TERRAIN)
-				&& world.getBlockState(blockPos.down(BlocksHelper.downRay(world, blockPos.down(), 64) + 2)).isIn(EndTags.GEN_TERRAIN);
-	}
-
-	@Override
-	public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) {
-		float radius = MHelper.randRange(1.0F, 3.2F, random);
-		OpenSimplexNoise noise = new OpenSimplexNoise(random.nextInt());
-		SDF sphere = new SDFSphere().setRadius(radius).setBlock(EndBlocks.CAVE_BUSH);
-		sphere = new SDFScale3D().setScale(MHelper.randRange(0.8F, 1.2F, random), MHelper.randRange(0.8F, 1.2F, random), MHelper.randRange(0.8F, 1.2F, random)).setSource(sphere);
-		sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 3; }).setSource(sphere);
-		sphere = new SDFDisplacement().setFunction((vec) -> { return random.nextFloat() * 3F - 1.5F; }).setSource(sphere);
-		sphere = new SDFSubtraction().setSourceA(sphere).setSourceB(new SDFTranslate().setTranslate(0, -radius, 0).setSource(sphere));
-		sphere.setReplaceFunction(REPLACE);
-		sphere.fillRecursive(world, blockPos.down());
-		BlocksHelper.setWithoutUpdate(world, blockPos.down(), EndBlocks.CAVE_BUSH);
-	}
-	
-	static {
-		REPLACE = (state) -> {
-			if (state.getMaterial().equals(Material.PLANT)) {
-				return true;
-			}
-			return state.getMaterial().isReplaceable();
-		};
-	}
-}

src/main/resources/assets/betterend/blockstates/rutiscus.json

@@ -0,0 +1,14 @@
+{
+	"variants": {
+		"": [
+			{ "model": "betterend:block/rutiscus_1" },
+			{ "model": "betterend:block/rutiscus_1", "y": 90 },
+			{ "model": "betterend:block/rutiscus_1", "y": 180 },
+			{ "model": "betterend:block/rutiscus_1", "y": 270 },
+			{ "model": "betterend:block/rutiscus_2" },
+			{ "model": "betterend:block/rutiscus_2", "y": 90 },
+			{ "model": "betterend:block/rutiscus_2", "y": 180 },
+			{ "model": "betterend:block/rutiscus_2", "y": 270 }
+		]
+	}
+}

src/main/resources/assets/betterend/models/block/rutiscus_1.json

@@ -0,0 +1,12 @@
+{
+	"parent": "block/cube",
+	"textures": {
+		"down": "block/end_stone",
+		"east": "betterend:block/rutiscus_side_1",
+		"north": "betterend:block/rutiscus_side_1",
+		"particle": "betterend:block/rutiscus_side_1",
+		"south": "betterend:block/rutiscus_side_1",
+		"up": "betterend:block/rutiscus_top_1",
+		"west": "betterend:block/rutiscus_side_1"
+	}
+}

src/main/resources/assets/betterend/models/block/rutiscus_2.json

@@ -0,0 +1,12 @@
+{
+	"parent": "block/cube",
+	"textures": {
+		"down": "block/end_stone",
+		"east": "betterend:block/rutiscus_side_2",
+		"north": "betterend:block/rutiscus_side_2",
+		"particle": "betterend:block/rutiscus_side_2",
+		"south": "betterend:block/rutiscus_side_2",
+		"up": "betterend:block/rutiscus_top_2",
+		"west": "betterend:block/rutiscus_side_2"
+	}
+}

src/main/resources/assets/betterend/models/item/rutiscus.json

@@ -0,0 +1,3 @@
+{
+	"parent": "betterend:block/rutiscus_1"
+}