diff --git a/src/main/java/ru/betterend/blocks/BlockVentBubbleColumn.java b/src/main/java/ru/betterend/blocks/BlockVentBubbleColumn.java index dd22d3c4..62c25244 100644 --- a/src/main/java/ru/betterend/blocks/BlockVentBubbleColumn.java +++ b/src/main/java/ru/betterend/blocks/BlockVentBubbleColumn.java @@ -76,10 +76,12 @@ public class BlockVentBubbleColumn extends BlockBaseNotFull implements FluidDrai @Environment(EnvType.CLIENT) public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { - double px = pos.getX() + random.nextDouble(); - double py = pos.getY() + random.nextDouble(); - double pz = pos.getZ() + random.nextDouble(); - world.addImportantParticle(ParticleTypes.BUBBLE_COLUMN_UP, px, py, pz, 0, 0.04, 0); + if (random.nextInt(4) == 0) { + double px = pos.getX() + random.nextDouble(); + double py = pos.getY() + random.nextDouble(); + double pz = pos.getZ() + random.nextDouble(); + world.addImportantParticle(ParticleTypes.BUBBLE_COLUMN_UP, px, py, pz, 0, 0.04, 0); + } if (random.nextInt(200) == 0) { world.playSound(pos.getX(), pos.getY(), pos.getZ(), SoundEvents.BLOCK_BUBBLE_COLUMN_UPWARDS_AMBIENT, SoundCategory.BLOCKS, 0.2F + random.nextFloat() * 0.2F, 0.9F + random.nextFloat() * 0.15F, false); } diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index e4cdb239..5fd62b0c 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -202,6 +202,7 @@ public class EndBlocks { public static final Block CHARNIA_ORANGE = registerBlock("charnia_orange", new BlockCharnia()); public static final Block CHARNIA_LIGHT_BLUE = registerBlock("charnia_light_blue", new BlockCharnia()); public static final Block CHARNIA_CYAN = registerBlock("charnia_cyan", new BlockCharnia()); + public static final Block CHARNIA_GREEN = registerBlock("charnia_green", new BlockCharnia()); public static final Block END_LILY = registerBlockNI("end_lily", new BlockEndLily()); public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new BlockEndLilySeed()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index c1ce19b9..a8250524 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -107,7 +107,9 @@ public class EndFeatures { public static final EndFeature CHARNIA_CYAN = new EndFeature("charnia_cyan", new CharniaFeature(EndBlocks.CHARNIA_CYAN), 10); public static final EndFeature CHARNIA_LIGHT_BLUE = new EndFeature("charnia_light_blue", new CharniaFeature(EndBlocks.CHARNIA_LIGHT_BLUE), 10); public static final EndFeature CHARNIA_ORANGE = new EndFeature("charnia_orange", new CharniaFeature(EndBlocks.CHARNIA_ORANGE), 10); + public static final EndFeature CHARNIA_GREEN = new EndFeature("charnia_green", new CharniaFeature(EndBlocks.CHARNIA_GREEN), 10); public static final EndFeature MENGER_SPONGE = new EndFeature("menger_sponge", new MengerSpongeFeature(5), 1); + public static final EndFeature CHARNIA_RED_RARE = new EndFeature("charnia_red_rare", new CharniaFeature(EndBlocks.CHARNIA_RED), 2); // Terrain // public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 4); diff --git a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java index 9f9f85cf..92db643e 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java @@ -32,6 +32,7 @@ public class BiomeChorusForest extends EndBiome { .addFeature(EndFeatures.TAIL_MOSS) .addFeature(EndFeatures.TAIL_MOSS_WOOD) .addFeature(EndFeatures.CHARNIA_PURPLE) + .addFeature(EndFeatures.CHARNIA_RED_RARE) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EndEntities.END_SLIME, 5, 1, 2) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); diff --git a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java index ed9a0d88..ec9adfa0 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java +++ b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java @@ -33,6 +33,7 @@ public class BiomeFoggyMushroomland extends EndBiome { .addFeature(EndFeatures.BUBBLE_CORAL) .addFeature(EndFeatures.CHARNIA_CYAN) .addFeature(EndFeatures.CHARNIA_LIGHT_BLUE) + .addFeature(EndFeatures.CHARNIA_RED_RARE) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EndEntities.DRAGONFLY, 80, 2, 5) .addMobSpawn(EndEntities.END_FISH, 20, 2, 5) diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java index 3a8ede74..24c77326 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java @@ -26,6 +26,7 @@ public class BiomeMegalake extends EndBiome { .addFeature(EndFeatures.CREEPING_MOSS) .addFeature(EndFeatures.CHARNIA_CYAN) .addFeature(EndFeatures.CHARNIA_LIGHT_BLUE) + .addFeature(EndFeatures.CHARNIA_RED_RARE) .addFeature(EndFeatures.MENGER_SPONGE) .addMobSpawn(EndEntities.DRAGONFLY, 50, 1, 3) .addMobSpawn(EndEntities.END_FISH, 50, 3, 8) diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java index b9f195f5..2f02fbad 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java @@ -29,6 +29,7 @@ public class BiomeMegalakeGrove extends EndBiome { .addFeature(EndFeatures.CREEPING_MOSS) .addFeature(EndFeatures.CHARNIA_CYAN) .addFeature(EndFeatures.CHARNIA_LIGHT_BLUE) + .addFeature(EndFeatures.CHARNIA_RED_RARE) .addFeature(EndFeatures.MENGER_SPONGE) .addMobSpawn(EndEntities.DRAGONFLY, 20, 1, 3) .addMobSpawn(EndEntities.END_FISH, 20, 3, 8) diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java index b8ed59ce..5681fc6e 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -32,6 +32,7 @@ public class BiomeShadowForest extends EndBiome { .addFeature(EndFeatures.TAIL_MOSS) .addFeature(EndFeatures.TAIL_MOSS_WOOD) .addFeature(EndFeatures.CHARNIA_PURPLE) + .addFeature(EndFeatures.CHARNIA_RED_RARE) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EndEntities.SHADOW_WALKER, 80, 2, 4) .addMobSpawn(EntityType.ENDERMAN, 40, 1, 4) diff --git a/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java b/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java index 8b1421f6..ff9477f3 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java +++ b/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java @@ -20,8 +20,9 @@ public class BiomeSulphurSprings extends EndBiome { .addFeature(EndFeatures.SULPHURIC_LAKE) .addFeature(EndFeatures.SULPHURIC_CAVE) .addFeature(EndFeatures.HYDRALUX) + .addFeature(EndFeatures.CHARNIA_GREEN) .addFeature(EndFeatures.CHARNIA_ORANGE) - .addFeature(EndFeatures.CHARNIA_RED) + .addFeature(EndFeatures.CHARNIA_RED_RARE) .addMobSpawn(EndEntities.END_FISH, 50, 3, 8) .addMobSpawn(EndEntities.CUBOZOA, 50, 3, 8) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); diff --git a/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java b/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java index 412c3bae..a6438381 100644 --- a/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java @@ -18,6 +18,7 @@ import net.minecraft.world.gen.feature.DefaultFeatureConfig; import ru.betterend.blocks.BlockHydrothermalVent; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndTags; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; @@ -213,6 +214,13 @@ public class GeyserFeature extends DefaultFeature { } } + EndFeatures.SULPHURIC_LAKE.getFeature().generate(world, chunkGenerator, random, pos, null); + + double distance = radius1 * 1.7; + BlockPos start = pos.add(-distance, -halfHeight - 15 - distance, -distance); + BlockPos end = pos.add(distance, -halfHeight - 5 + distance, distance); + BlocksHelper.fixBlocks(world, start, end); + return true; } diff --git a/src/main/resources/assets/betterend/blockstates/charnia_green.json b/src/main/resources/assets/betterend/blockstates/charnia_green.json new file mode 100644 index 00000000..18414fac --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/charnia_green.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/charnia_green" }, + { "model": "betterend:block/charnia_green", "y": 90 }, + { "model": "betterend:block/charnia_green", "y": 180 }, + { "model": "betterend:block/charnia_green", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 8529fc57..866899e7 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -470,5 +470,8 @@ "block.betterend.dense_snow": "Dense Snow", "block.betterend.emerald_ice": "Emerald Ice", - "block.betterend.bulb_moss": "Bulb Moss" + "block.betterend.bulb_moss": "Bulb Moss", + + "block.betterend.charnia_green": "Charnia Green", + "block.betterend.vent_bubble_column": "Vent Bubble Column" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index ed2dc814..4379f36f 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -472,5 +472,8 @@ "block.betterend.dense_snow": "Плотный снег", "block.betterend.emerald_ice": "Изумрудный лёд", - "block.betterend.bulb_moss": "Луковичный мох" + "block.betterend.bulb_moss": "Луковичный мох", + + "block.betterend.charnia_green": "Зелёная чарния", + "block.betterend.vent_bubble_column": "Колонна пузырьков гейзера" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/charnia_green.json b/src/main/resources/assets/betterend/models/block/charnia_green.json new file mode 100644 index 00000000..0809331a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/charnia_green.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/charnia", + "textures": { + "texture": "betterend:block/charnia_green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/charnia_green.json b/src/main/resources/assets/betterend/models/item/charnia_green.json new file mode 100644 index 00000000..237b7f2d --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/charnia_green.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/charnia_green" + } +}