From a54f7d5e6df982488288f8810852237cdc02a725 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 4 Dec 2020 22:54:50 +0300 Subject: [PATCH] Flowers generation --- .../ru/betterend/registry/EndFeatures.java | 2 ++ .../world/biome/BiomeSulfurSprings.java | 7 +++-- .../world/features/HydraluxFeature.java | 25 ++++++++++++++++++ .../models/block/hydralux_flower_big_top.json | 8 +++--- .../textures/block/hydralux_flower_bud.png | Bin 1891 -> 2113 bytes 5 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 src/main/java/ru/betterend/world/features/HydraluxFeature.java diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index e081cf7a..87d88e83 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -18,6 +18,7 @@ import ru.betterend.world.features.EndFeature; import ru.betterend.world.features.EndLilyFeature; import ru.betterend.world.features.EndLotusFeature; import ru.betterend.world.features.EndLotusLeafFeature; +import ru.betterend.world.features.HydraluxFeature; import ru.betterend.world.features.SinglePlantFeature; import ru.betterend.world.features.UnderwaterPlantFeature; import ru.betterend.world.features.VineFeature; @@ -87,6 +88,7 @@ public class EndFeatures { public static final EndFeature END_LILY_RARE = new EndFeature("end_lily_rare", new EndLilyFeature(3), 4); public static final EndFeature END_LOTUS = new EndFeature("end_lotus", new EndLotusFeature(7), 5); public static final EndFeature END_LOTUS_LEAF = new EndFeature("end_lotus_leaf", new EndLotusLeafFeature(20), 25); + public static final EndFeature HYDRALUX = new EndFeature("hydralux", new HydraluxFeature(5), 5); // Terrain // public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 4); diff --git a/src/main/java/ru/betterend/world/biome/BiomeSulfurSprings.java b/src/main/java/ru/betterend/world/biome/BiomeSulfurSprings.java index 934e8828..776409df 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeSulfurSprings.java +++ b/src/main/java/ru/betterend/world/biome/BiomeSulfurSprings.java @@ -1,8 +1,6 @@ package ru.betterend.world.biome; import net.minecraft.entity.EntityType; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.carver.ConfiguredCarvers; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; import ru.betterend.world.surface.SurfaceBuilders; @@ -11,7 +9,8 @@ public class BiomeSulfurSprings extends EndBiome { public BiomeSulfurSprings() { super(new BiomeDefinition("sulfur_springs") .setSurface(SurfaceBuilders.SULPHURIC_SURFACE) - .setWaterAndFogColor(25, 90, 157) + .setWaterColor(25, 90, 157) + .setWaterFogColor(30, 65, 61) .setFogColor(207, 194, 62) .setFogDensity(1.5F) .setCaves(false) @@ -19,7 +18,7 @@ public class BiomeSulfurSprings extends EndBiome { .addFeature(EndFeatures.GEYSER) .addFeature(EndFeatures.SULPHURIC_LAKE) .addFeature(EndFeatures.SULPHURIC_CAVE) - .addCarver(GenerationStep.Carver.AIR, ConfiguredCarvers.CAVE) + .addFeature(EndFeatures.HYDRALUX) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); } } diff --git a/src/main/java/ru/betterend/world/features/HydraluxFeature.java b/src/main/java/ru/betterend/world/features/HydraluxFeature.java new file mode 100644 index 00000000..48f4e46f --- /dev/null +++ b/src/main/java/ru/betterend/world/features/HydraluxFeature.java @@ -0,0 +1,25 @@ +package ru.betterend.world.features; + +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.StructureWorldAccess; +import ru.betterend.blocks.BlockHydraluxSapling; +import ru.betterend.registry.EndBlocks; + +public class HydraluxFeature extends UnderwaterPlantScatter { + public HydraluxFeature(int radius) { + super(radius); + } + + @Override + public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { + BlockHydraluxSapling seed = (BlockHydraluxSapling) EndBlocks.HYDRALUX_SAPLING; + seed.grow(world, random, blockPos); + } + + @Override + protected int getChance() { + return 15; + } +} diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json index 24cc4a5f..4e15b836 100644 --- a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json @@ -19,8 +19,8 @@ }, { "__comment": "PlaneX9", - "from": [ 5.5, 3, 5.5 ], - "to": [ 5.501, 11, 13.5 ], + "from": [ 5.5, 2, 5.5 ], + "to": [ 5.501, 10, 13.5 ], "rotation": { "origin": [ 5.5, 3, 5.5 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { @@ -30,8 +30,8 @@ }, { "__comment": "PlaneX9", - "from": [ 10.5, 3, 5.5 ], - "to": [ 10.501, 11, 13.5 ], + "from": [ 10.5, 2, 5.5 ], + "to": [ 10.501, 10, 13.5 ], "rotation": { "origin": [ 10.5, 3, 5.5 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud.png b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud.png index 938ba1230a396e0c80c6229c6677f300f940279a..e208d9697dc2021488f4857ad33f23c34857e154 100644 GIT binary patch delta 342 zcmaFNcTix01ryuCjaCzw*o~}A4XljJCSPPygR}oJ1*oJM8l|P0o2Kd}rJ7jiTBMky z=_Z*NCF!On8CawmngFqZ(dHs%7pBS2Sj>o0J=uX(3T{Or>pBjLs9DPy7#Q6qi?eCf z2c0>5{3OF-#|NjEzvq#Ut7Vt=;MmY0(!}7gxx+#}hUv)u!hf2H%np8RjI5!BZS33Q z51BT{IQDSQaOh$=Vj+2N&!3h@LK_qV4s-5uaC7CzQ9dE6z+lu9A>P3J@#NfcjdcyI zN*+B67!{b72rOZY4iPe85G&o#&|JwZvcSNM`}t3=V4gL@j!Oy12V#q_6n@^!XE vO}2trH}^i3xp7-zug{TRe?Q5;IVr_ZWwkV`^T?GN1|aZs^>bP0l+XkKuu69a delta 238 zcmVDZ-ewQ5$pHMf3PQO0GmCTAEyZ_&Hw-a07*qoM6N<$f(wFMh5!Hn