diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 77016e88..a36356b2 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -86,402 +86,116 @@ import java.util.function.Supplier; public class EndFeatures { // Trees // - public static final BCLFeature MOSSY_GLOWSHROOM = redisterVegetation( - "mossy_glowshroom", - new MossyGlowshroomFeature(), - 3 - ); - public static final BCLFeature PYTHADENDRON_TREE = redisterVegetation( - "pythadendron_tree", - new PythadendronTreeFeature(), - 2 - ); + public static final BCLFeature MOSSY_GLOWSHROOM = redisterVegetation("mossy_glowshroom", new MossyGlowshroomFeature(), 3); + public static final BCLFeature PYTHADENDRON_TREE = redisterVegetation("pythadendron_tree", new PythadendronTreeFeature(), 2); public static final BCLFeature LACUGROVE = redisterVegetation("lacugrove", new LacugroveFeature(), 4); public static final BCLFeature DRAGON_TREE = redisterVegetation("dragon_tree", new DragonTreeFeature(), 3); public static final BCLFeature TENANEA = redisterVegetation("tenanea", new TenaneaFeature(), 3); public static final BCLFeature HELIX_TREE = redisterVegetation("helix_tree", new HelixTreeFeature(), 2); public static final BCLFeature UMBRELLA_TREE = redisterVegetation("umbrella_tree", new UmbrellaTreeFeature(), 4); public static final BCLFeature JELLYSHROOM = redisterVegetation("jellyshroom", new JellyshroomFeature(), 3); - public static final BCLFeature GIGANTIC_AMARANITA = redisterVegetation( - "gigantic_amaranita", - new GiganticAmaranitaFeature(), - 1 - ); + public static final BCLFeature GIGANTIC_AMARANITA = redisterVegetation("gigantic_amaranita", new GiganticAmaranitaFeature(), 1); public static final BCLFeature LUCERNIA = redisterVegetation("lucernia", new LucerniaFeature(), 3); // Bushes // - public static final BCLFeature PYTHADENDRON_BUSH = redisterVegetation( - "pythadendron_bush", - new BushFeature(EndBlocks.PYTHADENDRON_LEAVES, EndBlocks.PYTHADENDRON.getBark()), - 4 - ); - public static final BCLFeature DRAGON_TREE_BUSH = redisterVegetation( - "dragon_tree_bush", - new BushFeature(EndBlocks.DRAGON_TREE_LEAVES, EndBlocks.DRAGON_TREE.getBark()), - 15 - ); + public static final BCLFeature PYTHADENDRON_BUSH = redisterVegetation("pythadendron_bush", new BushFeature(EndBlocks.PYTHADENDRON_LEAVES, EndBlocks.PYTHADENDRON.getBark()), 4); + public static final BCLFeature DRAGON_TREE_BUSH = redisterVegetation("dragon_tree_bush", new BushFeature(EndBlocks.DRAGON_TREE_LEAVES, EndBlocks.DRAGON_TREE.getBark()), 15); public static final BCLFeature TENANEA_BUSH = redisterVegetation("tenanea_bush", new TenaneaBushFeature(), 10); public static final BCLFeature LUMECORN = redisterVegetation("lumecorn", new Lumecorn(), 5); - public static final BCLFeature LARGE_AMARANITA = redisterVegetation( - "large_amaranita", - new LargeAmaranitaFeature(), - 5 - ); - public static final BCLFeature LUCERNIA_BUSH = redisterVegetation( - "lucernia_bush", - new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, EndBlocks.LUCERNIA_OUTER_LEAVES, EndBlocks.LUCERNIA.getBark()), - 10 - ); - public static final BCLFeature LUCERNIA_BUSH_RARE = redisterVegetation( - "lucernia_bush_rare", - new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, EndBlocks.LUCERNIA_OUTER_LEAVES, EndBlocks.LUCERNIA.getBark()), - 1 - ); + public static final BCLFeature LARGE_AMARANITA = redisterVegetation("large_amaranita", new LargeAmaranitaFeature(), 5); + public static final BCLFeature LUCERNIA_BUSH = redisterVegetation("lucernia_bush", new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, EndBlocks.LUCERNIA_OUTER_LEAVES, EndBlocks.LUCERNIA.getBark()), 10); + public static final BCLFeature LUCERNIA_BUSH_RARE = redisterVegetation("lucernia_bush_rare", new BushWithOuterFeature(EndBlocks.LUCERNIA_LEAVES, EndBlocks.LUCERNIA_OUTER_LEAVES, EndBlocks.LUCERNIA.getBark()), 1); public static final BCLFeature NEON_CACTUS = redisterVegetation("neon_cactus", new NeonCactusFeature(), 2); // Plants // - public static final BCLFeature UMBRELLA_MOSS = redisterVegetation( - "umbrella_moss", - new DoublePlantFeature(EndBlocks.UMBRELLA_MOSS, EndBlocks.UMBRELLA_MOSS_TALL, 5), - 5 - ); - public static final BCLFeature CREEPING_MOSS = redisterVegetation( - "creeping_moss", - new SinglePlantFeature(EndBlocks.CREEPING_MOSS, 5), - 5 - ); + public static final BCLFeature UMBRELLA_MOSS = redisterVegetation("umbrella_moss", new DoublePlantFeature(EndBlocks.UMBRELLA_MOSS, EndBlocks.UMBRELLA_MOSS_TALL, 5), 5); + public static final BCLFeature CREEPING_MOSS = redisterVegetation("creeping_moss", new SinglePlantFeature(EndBlocks.CREEPING_MOSS, 5), 5); public static final BCLFeature BLUE_VINE = redisterVegetation("blue_vine", new BlueVineFeature(), 1); - public static final BCLFeature CHORUS_GRASS = redisterVegetation( - "chorus_grass", - new SinglePlantFeature(EndBlocks.CHORUS_GRASS, 4), - 5 - ); - public static final BCLFeature CRYSTAL_GRASS = redisterVegetation( - "crystal_grass", - new SinglePlantFeature(EndBlocks.CRYSTAL_GRASS, 8, false), - 5 - ); - public static final BCLFeature SHADOW_PLANT = redisterVegetation( - "shadow_plant", - new SinglePlantFeature(EndBlocks.SHADOW_PLANT, 6), - 9 - ); - public static final BCLFeature MURKWEED = redisterVegetation( - "murkweed", - new SinglePlantFeature(EndBlocks.MURKWEED, 3), - 2 - ); - public static final BCLFeature NEEDLEGRASS = redisterVegetation( - "needlegrass", - new SinglePlantFeature(EndBlocks.NEEDLEGRASS, 3), - 2 - ); - public static final BCLFeature SHADOW_BERRY = redisterVegetation( - "shadow_berry", - new SinglePlantFeature(EndBlocks.SHADOW_BERRY, 2), - 1 - ); - public static final BCLFeature BUSHY_GRASS = redisterVegetation( - "bushy_grass", - new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 8, false), - 20 - ); - public static final BCLFeature BUSHY_GRASS_WG = redisterVegetation( - "bushy_grass_wg", - new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 5), - 10 - ); - public static final BCLFeature AMBER_GRASS = redisterVegetation( - "amber_grass", - new SinglePlantFeature(EndBlocks.AMBER_GRASS, 6), - 9 - ); + public static final BCLFeature CHORUS_GRASS = redisterVegetation("chorus_grass", new SinglePlantFeature(EndBlocks.CHORUS_GRASS, 4), 5); + public static final BCLFeature CRYSTAL_GRASS = redisterVegetation("crystal_grass", new SinglePlantFeature(EndBlocks.CRYSTAL_GRASS, 8, false), 5); + public static final BCLFeature SHADOW_PLANT = redisterVegetation("shadow_plant", new SinglePlantFeature(EndBlocks.SHADOW_PLANT, 6), 9); + public static final BCLFeature MURKWEED = redisterVegetation("murkweed", new SinglePlantFeature(EndBlocks.MURKWEED, 3), 2); + public static final BCLFeature NEEDLEGRASS = redisterVegetation("needlegrass", new SinglePlantFeature(EndBlocks.NEEDLEGRASS, 3), 2); + public static final BCLFeature SHADOW_BERRY = redisterVegetation("shadow_berry", new SinglePlantFeature(EndBlocks.SHADOW_BERRY, 2), 1); + public static final BCLFeature BUSHY_GRASS = redisterVegetation("bushy_grass", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 8, false), 20); + public static final BCLFeature BUSHY_GRASS_WG = redisterVegetation("bushy_grass_wg", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 5), 10); + public static final BCLFeature AMBER_GRASS = redisterVegetation("amber_grass", new SinglePlantFeature(EndBlocks.AMBER_GRASS, 6), 9); public static final BCLFeature LANCELEAF = redisterVegetation("lanceleaf", new LanceleafFeature(), 3); public static final BCLFeature GLOW_PILLAR = redisterVegetation("glow_pillar", new GlowPillarFeature(), 1); - public static final BCLFeature TWISTED_UMBRELLA_MOSS = redisterVegetation( - "twisted_umbrella_moss", - new DoublePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, EndBlocks.TWISTED_UMBRELLA_MOSS_TALL, 6), - 5 - ); - public static final BCLFeature JUNGLE_GRASS = redisterVegetation( - "jungle_grass", - new SinglePlantFeature(EndBlocks.JUNGLE_GRASS, 7, 3), - 8 - ); - public static final BCLFeature SMALL_JELLYSHROOM_FLOOR = redisterVegetation( - "small_jellyshroom_floor", - new SinglePlantFeature(EndBlocks.SMALL_JELLYSHROOM, 5, 5), - 4 - ); - public static final BCLFeature BLOSSOM_BERRY = redisterVegetation( - "blossom_berry", - new SinglePlantFeature(EndBlocks.BLOSSOM_BERRY, 3, 3), - 2 - ); - public static final BCLFeature BLOOMING_COOKSONIA = redisterVegetation( - "blooming_cooksonia", - new SinglePlantFeature(EndBlocks.BLOOMING_COOKSONIA, 5), - 5 - ); - public static final BCLFeature SALTEAGO = redisterVegetation( - "salteago", - new SinglePlantFeature(EndBlocks.SALTEAGO, 5), - 5 - ); - public static final BCLFeature VAIOLUSH_FERN = redisterVegetation( - "vaiolush_fern", - new SinglePlantFeature(EndBlocks.VAIOLUSH_FERN, 5), - 5 - ); - public static final BCLFeature FRACTURN = redisterVegetation( - "fracturn", - new SinglePlantFeature(EndBlocks.FRACTURN, 5), - 5 - ); - public static final BCLFeature UMBRELLA_MOSS_RARE = redisterVegetation( - "umbrella_moss_rare", - new SinglePlantFeature(EndBlocks.UMBRELLA_MOSS, 3), - 2 - ); - public static final BCLFeature CREEPING_MOSS_RARE = redisterVegetation( - "creeping_moss_rare", - new SinglePlantFeature(EndBlocks.CREEPING_MOSS, 3), - 2 - ); - public static final BCLFeature TWISTED_UMBRELLA_MOSS_RARE = redisterVegetation( - "twisted_umbrella_moss_rare", - new SinglePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, 3), - 2 - ); - public static final BCLFeature ORANGO = redisterVegetation( - "orango", - new SinglePlantFeature(EndBlocks.ORANGO, 5), - 6 - ); - public static final BCLFeature AERIDIUM = redisterVegetation( - "aeridium", - new SinglePlantFeature(EndBlocks.AERIDIUM, 5, 4), - 5 - ); - public static final BCLFeature LUTEBUS = redisterVegetation( - "lutebus", - new SinglePlantFeature(EndBlocks.LUTEBUS, 5, 2), - 5 - ); - public static final BCLFeature LAMELLARIUM = redisterVegetation( - "lamellarium", - new SinglePlantFeature(EndBlocks.LAMELLARIUM, 5), - 6 - ); - public static final BCLFeature SMALL_AMARANITA = redisterVegetation( - "small_amaranita", - new SinglePlantFeature(EndBlocks.SMALL_AMARANITA_MUSHROOM, 5, 5), - 4 - ); - public static final BCLFeature GLOBULAGUS = redisterVegetation( - "globulagus", - new SinglePlantFeature(EndBlocks.GLOBULAGUS, 5, 3), - 6 - ); - public static final BCLFeature CLAWFERN = redisterVegetation( - "clawfern", - new SinglePlantFeature(EndBlocks.CLAWFERN, 5, 4), - 5 - ); - public static final BCLFeature BOLUX_MUSHROOM = redisterVegetation( - "bolux_mushroom", - new SinglePlantFeature(EndBlocks.BOLUX_MUSHROOM, 5, 5), - 2 - ); - public static final BCLFeature CHORUS_MUSHROOM = redisterVegetation( - "chorus_mushroom", - new SinglePlantFeature(EndBlocks.CHORUS_MUSHROOM, 5, 5), - 1 - ); - public static final BCLFeature AMBER_ROOT = redisterVegetation( - "amber_root", - new SinglePlantFeature(EndBlocks.AMBER_ROOT, 5, 5), - 1 - ); + public static final BCLFeature TWISTED_UMBRELLA_MOSS = redisterVegetation("twisted_umbrella_moss", new DoublePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, EndBlocks.TWISTED_UMBRELLA_MOSS_TALL, 6), 5); + public static final BCLFeature JUNGLE_GRASS = redisterVegetation("jungle_grass", new SinglePlantFeature(EndBlocks.JUNGLE_GRASS, 7, 3), 8); + public static final BCLFeature SMALL_JELLYSHROOM_FLOOR = redisterVegetation("small_jellyshroom_floor", new SinglePlantFeature(EndBlocks.SMALL_JELLYSHROOM, 5, 5), 4); + public static final BCLFeature BLOSSOM_BERRY = redisterVegetation("blossom_berry", new SinglePlantFeature(EndBlocks.BLOSSOM_BERRY, 3, 3), 2); + public static final BCLFeature BLOOMING_COOKSONIA = redisterVegetation("blooming_cooksonia", new SinglePlantFeature(EndBlocks.BLOOMING_COOKSONIA, 5), 5); + public static final BCLFeature SALTEAGO = redisterVegetation("salteago", new SinglePlantFeature(EndBlocks.SALTEAGO, 5), 5); + public static final BCLFeature VAIOLUSH_FERN = redisterVegetation("vaiolush_fern", new SinglePlantFeature(EndBlocks.VAIOLUSH_FERN, 5), 5); + public static final BCLFeature FRACTURN = redisterVegetation("fracturn", new SinglePlantFeature(EndBlocks.FRACTURN, 5), 5); + public static final BCLFeature UMBRELLA_MOSS_RARE = redisterVegetation("umbrella_moss_rare", new SinglePlantFeature(EndBlocks.UMBRELLA_MOSS, 3), 2); + public static final BCLFeature CREEPING_MOSS_RARE = redisterVegetation("creeping_moss_rare", new SinglePlantFeature(EndBlocks.CREEPING_MOSS, 3), 2); + public static final BCLFeature TWISTED_UMBRELLA_MOSS_RARE = redisterVegetation("twisted_umbrella_moss_rare", new SinglePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, 3), 2); + public static final BCLFeature ORANGO = redisterVegetation("orango", new SinglePlantFeature(EndBlocks.ORANGO, 5), 6); + public static final BCLFeature AERIDIUM = redisterVegetation("aeridium", new SinglePlantFeature(EndBlocks.AERIDIUM, 5, 4), 5); + public static final BCLFeature LUTEBUS = redisterVegetation("lutebus", new SinglePlantFeature(EndBlocks.LUTEBUS, 5, 2), 5); + public static final BCLFeature LAMELLARIUM = redisterVegetation("lamellarium", new SinglePlantFeature(EndBlocks.LAMELLARIUM, 5), 6); + public static final BCLFeature SMALL_AMARANITA = redisterVegetation("small_amaranita", new SinglePlantFeature(EndBlocks.SMALL_AMARANITA_MUSHROOM, 5, 5), 4); + public static final BCLFeature GLOBULAGUS = redisterVegetation("globulagus", new SinglePlantFeature(EndBlocks.GLOBULAGUS, 5, 3), 6); + public static final BCLFeature CLAWFERN = redisterVegetation("clawfern", new SinglePlantFeature(EndBlocks.CLAWFERN, 5, 4), 5); + public static final BCLFeature BOLUX_MUSHROOM = redisterVegetation("bolux_mushroom", new SinglePlantFeature(EndBlocks.BOLUX_MUSHROOM, 5, 5), 2); + public static final BCLFeature CHORUS_MUSHROOM = redisterVegetation("chorus_mushroom", new SinglePlantFeature(EndBlocks.CHORUS_MUSHROOM, 5, 5), 1); + public static final BCLFeature AMBER_ROOT = redisterVegetation("amber_root", new SinglePlantFeature(EndBlocks.AMBER_ROOT, 5, 5), 1); //public static final BCLFeature PEARLBERRY = redisterVegetation("pearlberry", new SinglePlantFeature(EndBlocks.PEARLBERRY, 5, 5), 1); - public static final BCLFeature INFLEXIA = redisterVegetation("inflexia", new SinglePlantFeature(EndBlocks.INFLEXIA, 5, 3), 8); + public static final BCLFeature INFLEXIA = redisterVegetation("inflexia", new SinglePlantFeature(EndBlocks.INFLEXIA, 7, false, 3), 16); + public static final BCLFeature FLAMMALIX = redisterVegetation("flammalix", new SinglePlantFeature(EndBlocks.FLAMMALIX, 3, false, 7), 5); // Vines // - public static final BCLFeature DENSE_VINE = redisterVegetation( - "dense_vine", - new VineFeature(EndBlocks.DENSE_VINE, 24), - 3 - ); - public static final BCLFeature TWISTED_VINE = redisterVegetation( - "twisted_vine", - new VineFeature(EndBlocks.TWISTED_VINE, 24), - 3 - ); - public static final BCLFeature BULB_VINE = redisterVegetation( - "bulb_vine", - new VineFeature(EndBlocks.BULB_VINE, 24), - 5 - ); - public static final BCLFeature JUNGLE_VINE = redisterVegetation( - "jungle_vine", - new VineFeature(EndBlocks.JUNGLE_VINE, 24), - 5 - ); + public static final BCLFeature DENSE_VINE = redisterVegetation("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3); + public static final BCLFeature TWISTED_VINE = redisterVegetation("twisted_vine", new VineFeature(EndBlocks.TWISTED_VINE, 24), 3); + public static final BCLFeature BULB_VINE = redisterVegetation("bulb_vine", new VineFeature(EndBlocks.BULB_VINE, 24), 5); + public static final BCLFeature JUNGLE_VINE = redisterVegetation("jungle_vine", new VineFeature(EndBlocks.JUNGLE_VINE, 24), 5); // Ceil plants - public static final BCLFeature SMALL_JELLYSHROOM_CEIL = redisterVegetation( - "small_jellyshroom_ceil", - new SingleInvertedScatterFeature(EndBlocks.SMALL_JELLYSHROOM, 8), - 8 - ); + public static final BCLFeature SMALL_JELLYSHROOM_CEIL = redisterVegetation("small_jellyshroom_ceil", new SingleInvertedScatterFeature(EndBlocks.SMALL_JELLYSHROOM, 8), 8); // Wall Plants // - public static final BCLFeature PURPLE_POLYPORE = redisterVegetation( - "purple_polypore", - new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 3), - 5 - ); - public static final BCLFeature AURANT_POLYPORE = redisterVegetation( - "aurant_polypore", - new WallPlantOnLogFeature(EndBlocks.AURANT_POLYPORE, 3), - 5 - ); - public static final BCLFeature TAIL_MOSS = redisterVegetation( - "tail_moss", - new WallPlantFeature(EndBlocks.TAIL_MOSS, 3), - 15 - ); - public static final BCLFeature CYAN_MOSS = redisterVegetation( - "cyan_moss", - new WallPlantFeature(EndBlocks.CYAN_MOSS, 3), - 15 - ); - public static final BCLFeature TAIL_MOSS_WOOD = redisterVegetation( - "tail_moss_wood", - new WallPlantOnLogFeature(EndBlocks.TAIL_MOSS, 4), - 25 - ); - public static final BCLFeature CYAN_MOSS_WOOD = redisterVegetation( - "cyan_moss_wood", - new WallPlantOnLogFeature(EndBlocks.CYAN_MOSS, 4), - 25 - ); - public static final BCLFeature TWISTED_MOSS = redisterVegetation( - "twisted_moss", - new WallPlantFeature(EndBlocks.TWISTED_MOSS, 6), - 15 - ); - public static final BCLFeature TWISTED_MOSS_WOOD = redisterVegetation( - "twisted_moss_wood", - new WallPlantOnLogFeature(EndBlocks.TWISTED_MOSS, 6), - 25 - ); - public static final BCLFeature BULB_MOSS = redisterVegetation( - "bulb_moss", - new WallPlantFeature(EndBlocks.BULB_MOSS, 6), - 1 - ); - public static final BCLFeature BULB_MOSS_WOOD = redisterVegetation( - "bulb_moss_wood", - new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, 6), - 15 - ); - public static final BCLFeature SMALL_JELLYSHROOM_WALL = redisterVegetation( - "small_jellyshroom_wall", - new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, 4), - 4 - ); - public static final BCLFeature SMALL_JELLYSHROOM_WOOD = redisterVegetation( - "small_jellyshroom_wood", - new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 4), - 8 - ); - public static final BCLFeature JUNGLE_FERN_WOOD = redisterVegetation( - "jungle_fern_wood", - new WallPlantOnLogFeature(EndBlocks.JUNGLE_FERN, 3), - 12 - ); + public static final BCLFeature PURPLE_POLYPORE = redisterVegetation("purple_polypore", new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 3), 5); + public static final BCLFeature AURANT_POLYPORE = redisterVegetation("aurant_polypore", new WallPlantOnLogFeature(EndBlocks.AURANT_POLYPORE, 3), 5); + public static final BCLFeature TAIL_MOSS = redisterVegetation("tail_moss", new WallPlantFeature(EndBlocks.TAIL_MOSS, 3), 15); + public static final BCLFeature CYAN_MOSS = redisterVegetation("cyan_moss", new WallPlantFeature(EndBlocks.CYAN_MOSS, 3), 15); + public static final BCLFeature TAIL_MOSS_WOOD = redisterVegetation("tail_moss_wood", new WallPlantOnLogFeature(EndBlocks.TAIL_MOSS, 4), 25); + public static final BCLFeature CYAN_MOSS_WOOD = redisterVegetation("cyan_moss_wood", new WallPlantOnLogFeature(EndBlocks.CYAN_MOSS, 4), 25); + public static final BCLFeature TWISTED_MOSS = redisterVegetation("twisted_moss", new WallPlantFeature(EndBlocks.TWISTED_MOSS, 6), 15); + public static final BCLFeature TWISTED_MOSS_WOOD = redisterVegetation("twisted_moss_wood", new WallPlantOnLogFeature(EndBlocks.TWISTED_MOSS, 6), 25); + public static final BCLFeature BULB_MOSS = redisterVegetation("bulb_moss", new WallPlantFeature(EndBlocks.BULB_MOSS, 6), 1); + public static final BCLFeature BULB_MOSS_WOOD = redisterVegetation("bulb_moss_wood", new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, 6), 15); + public static final BCLFeature SMALL_JELLYSHROOM_WALL = redisterVegetation("small_jellyshroom_wall", new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 4); + public static final BCLFeature SMALL_JELLYSHROOM_WOOD = redisterVegetation("small_jellyshroom_wood", new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 8); + public static final BCLFeature JUNGLE_FERN_WOOD = redisterVegetation("jungle_fern_wood", new WallPlantOnLogFeature(EndBlocks.JUNGLE_FERN, 3), 12); public static final BCLFeature RUSCUS = redisterVegetation("ruscus", new WallPlantFeature(EndBlocks.RUSCUS, 6), 10); - public static final BCLFeature RUSCUS_WOOD = redisterVegetation( - "ruscus_wood", - new WallPlantOnLogFeature(EndBlocks.RUSCUS, 6), - 10 - ); + public static final BCLFeature RUSCUS_WOOD = redisterVegetation("ruscus_wood", new WallPlantOnLogFeature(EndBlocks.RUSCUS, 6), 10); // Sky plants public static final BCLFeature FILALUX = redisterVegetation("filalux", new FilaluxFeature(), 1); // Water // - public static final BCLFeature BUBBLE_CORAL = redisterVegetation( - "bubble_coral", - new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 6), - 10 - ); - public static final BCLFeature BUBBLE_CORAL_RARE = redisterVegetation( - "bubble_coral_rare", - new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 3), - 4 - ); + public static final BCLFeature BUBBLE_CORAL = redisterVegetation("bubble_coral", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 6), 10); + public static final BCLFeature BUBBLE_CORAL_RARE = redisterVegetation("bubble_coral_rare", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 3), 4); public static final BCLFeature END_LILY = redisterVegetation("end_lily", new EndLilyFeature(6), 10); public static final BCLFeature END_LILY_RARE = redisterVegetation("end_lily_rare", new EndLilyFeature(3), 4); public static final BCLFeature END_LOTUS = redisterVegetation("end_lotus", new EndLotusFeature(7), 5); - public static final BCLFeature END_LOTUS_LEAF = redisterVegetation( - "end_lotus_leaf", - new EndLotusLeafFeature(20), - 25 - ); + public static final BCLFeature END_LOTUS_LEAF = redisterVegetation("end_lotus_leaf", new EndLotusLeafFeature(20), 25); public static final BCLFeature HYDRALUX = redisterVegetation("hydralux", new HydraluxFeature(5), 5); - public static final BCLFeature POND_ANEMONE = redisterVegetation( - "pond_anemone", - new UnderwaterPlantFeature(EndBlocks.POND_ANEMONE, 6), - 10 - ); + public static final BCLFeature POND_ANEMONE = redisterVegetation("pond_anemone", new UnderwaterPlantFeature(EndBlocks.POND_ANEMONE, 6), 10); - public static final BCLFeature CHARNIA_RED = redisterVegetation( - "charnia_red", - new CharniaFeature(EndBlocks.CHARNIA_RED), - 10 - ); - public static final BCLFeature CHARNIA_PURPLE = redisterVegetation( - "charnia_purple", - new CharniaFeature(EndBlocks.CHARNIA_PURPLE), - 10 - ); - public static final BCLFeature CHARNIA_CYAN = redisterVegetation( - "charnia_cyan", - new CharniaFeature(EndBlocks.CHARNIA_CYAN), - 10 - ); - public static final BCLFeature CHARNIA_LIGHT_BLUE = redisterVegetation( - "charnia_light_blue", - new CharniaFeature(EndBlocks.CHARNIA_LIGHT_BLUE), - 10 - ); - public static final BCLFeature CHARNIA_ORANGE = redisterVegetation( - "charnia_orange", - new CharniaFeature(EndBlocks.CHARNIA_ORANGE), - 10 - ); - public static final BCLFeature CHARNIA_GREEN = redisterVegetation( - "charnia_green", - new CharniaFeature(EndBlocks.CHARNIA_GREEN), - 10 - ); + public static final BCLFeature CHARNIA_RED = redisterVegetation("charnia_red", new CharniaFeature(EndBlocks.CHARNIA_RED), 10); + public static final BCLFeature CHARNIA_PURPLE = redisterVegetation("charnia_purple", new CharniaFeature(EndBlocks.CHARNIA_PURPLE), 10); + public static final BCLFeature CHARNIA_CYAN = redisterVegetation("charnia_cyan", new CharniaFeature(EndBlocks.CHARNIA_CYAN), 10); + public static final BCLFeature CHARNIA_LIGHT_BLUE = redisterVegetation("charnia_light_blue", new CharniaFeature(EndBlocks.CHARNIA_LIGHT_BLUE), 10); + public static final BCLFeature CHARNIA_ORANGE = redisterVegetation("charnia_orange", new CharniaFeature(EndBlocks.CHARNIA_ORANGE), 10); + public static final BCLFeature CHARNIA_GREEN = redisterVegetation("charnia_green", new CharniaFeature(EndBlocks.CHARNIA_GREEN), 10); public static final BCLFeature MENGER_SPONGE = redisterVegetation("menger_sponge", new MengerSpongeFeature(5), 1); - public static final BCLFeature CHARNIA_RED_RARE = redisterVegetation( - "charnia_red_rare", - new CharniaFeature(EndBlocks.CHARNIA_RED), - 2 - ); - public static final BCLFeature BIOME_ISLAND = BCLFeature.makeFeatureConfigured( - BetterEnd.makeID("overworld_island"), - new BiomeIslandFeature() - ); - public static final BCLFeature FLAMAEA = redisterVegetation( - "flamaea", - new SinglePlantFeature(EndBlocks.FLAMAEA, 12, false, 5), - 20 - ); + public static final BCLFeature CHARNIA_RED_RARE = redisterVegetation("charnia_red_rare", new CharniaFeature(EndBlocks.CHARNIA_RED),2); + public static final BCLFeature BIOME_ISLAND = BCLFeature.makeFeatureConfigured(BetterEnd.makeID("overworld_island"), new BiomeIslandFeature()); + public static final BCLFeature FLAMAEA = redisterVegetation("flamaea", new SinglePlantFeature(EndBlocks.FLAMAEA, 12, false, 5), 20); // Terrain // public static final BCLFeature END_LAKE = registerLake("end_lake", new EndLakeFeature(), 4); @@ -493,34 +207,15 @@ public class EndFeatures { public static final BCLFeature FLOATING_SPIRE = registerRawGen("floating_spire", new FloatingSpireFeature(), 8); public static final BCLFeature GEYSER = registerRawGen("geyser", new GeyserFeature(), 8); public static final BCLFeature SULPHURIC_LAKE = registerLake("sulphuric_lake", new SulphuricLakeFeature(), 8); - public static final BCLFeature SULPHURIC_CAVE = BCLFeature.makeCountRawFeature( - BetterEnd.makeID("sulphuric_cave"), - new SulphuricCaveFeature(), - 2 - ); + public static final BCLFeature SULPHURIC_CAVE = BCLFeature.makeCountRawFeature(BetterEnd.makeID("sulphuric_cave"), new SulphuricCaveFeature(), 2); public static final BCLFeature ICE_STAR = registerRawGen("ice_star", new IceStarFeature(5, 15, 10, 25), 15); - public static final BCLFeature ICE_STAR_SMALL = registerRawGen( - "ice_star_small", - new IceStarFeature(3, 5, 7, 12), - 8 - ); + public static final BCLFeature ICE_STAR_SMALL = registerRawGen("ice_star_small", new IceStarFeature(3, 5, 7, 12), 8); public static final BCLFeature SURFACE_VENT = registerChanced("surface_vent", new SurfaceVentFeature(), 4); public static final BCLFeature SULPHUR_HILL = registerChanced("sulphur_hill", new SulphurHillFeature(), 8); - public static final BCLFeature OBSIDIAN_PILLAR_BASEMENT = registerChanced( - "obsidian_pillar_basement", - new ObsidianPillarBasementFeature(), - 8 - ); - public static final BCLFeature OBSIDIAN_BOULDER = registerChanced( - "obsidian_boulder", - new ObsidianBoulderFeature(), - 10 - ); + public static final BCLFeature OBSIDIAN_PILLAR_BASEMENT = registerChanced("obsidian_pillar_basement", new ObsidianPillarBasementFeature(), 8); + public static final BCLFeature OBSIDIAN_BOULDER = registerChanced("obsidian_boulder", new ObsidianBoulderFeature(), 10); public static final BCLFeature FALLEN_PILLAR = registerChanced("fallen_pillar", new FallenPillarFeature(), 20); - public static final BCLFeature TUNEL_CAVE = BCLFeature.makeChunkFeature( - BetterEnd.makeID("tunel_cave"), - new TunelCaveFeature() - ); + public static final BCLFeature TUNEL_CAVE = BCLFeature.makeChunkFeature(BetterEnd.makeID("tunel_cave"), new TunelCaveFeature()); public static final BCLFeature UMBRALITH_ARCH = registerChanced( "umbralith_arch", new ArchFeature( diff --git a/src/main/java/ru/betterend/registry/EndSounds.java b/src/main/java/ru/betterend/registry/EndSounds.java index d733db69..354d11a0 100644 --- a/src/main/java/ru/betterend/registry/EndSounds.java +++ b/src/main/java/ru/betterend/registry/EndSounds.java @@ -24,6 +24,7 @@ public class EndSounds { public static final SoundEvent AMBIENT_GLOWING_GRASSLANDS = register("ambient", "glowing_grasslands"); public static final SoundEvent AMBIENT_CAVES = register("ambient", "caves"); public static final SoundEvent AMBIENT_AMBER_LAND = register("ambient", "amber_land"); + public static final SoundEvent UMBRA_VALLEY = register("ambient", "umbra_valley"); // Entity public static final SoundEvent ENTITY_DRAGONFLY = register("entity", "dragonfly"); diff --git a/src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java b/src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java index 49fec9c4..0b9ef6c3 100644 --- a/src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java +++ b/src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java @@ -3,6 +3,8 @@ package ru.betterend.world.biome.land; import ru.bclib.world.biomes.BCLBiomeDef; import ru.betterend.BetterEnd; import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndParticles; +import ru.betterend.registry.EndSounds; import ru.betterend.world.biome.EndBiome; import ru.betterend.world.surface.SurfaceBuilders; @@ -13,9 +15,13 @@ public class UmbraValleyBiome extends EndBiome { .setPlantsColor(200, 200, 200) .setWaterAndFogColor(69, 104, 134) .setSurface(SurfaceBuilders.UMBRA_SURFACE.configured(SurfaceBuilders.DEFAULT_END_CONFIG)) + .setParticles(EndParticles.AMBER_SPHERE, 0.0001F) + .setLoop(EndSounds.UMBRA_VALLEY) + .setMusic(EndSounds.MUSIC_DARK) .addFeature(EndFeatures.UMBRALITH_ARCH) .addFeature(EndFeatures.THIN_UMBRALITH_ARCH) .addFeature(EndFeatures.INFLEXIA) + .addFeature(EndFeatures.FLAMMALIX) ); } } diff --git a/src/main/resources/assets/betterend/sounds.json b/src/main/resources/assets/betterend/sounds.json index d202610d..d44fd81c 100644 --- a/src/main/resources/assets/betterend/sounds.json +++ b/src/main/resources/assets/betterend/sounds.json @@ -228,6 +228,15 @@ } ] }, + "betterend.ambient.umbra_valley": { + "category": "ambient", + "sounds": [ + { + "name": "betterend:ambient/umbra_valley", + "stream": true + } + ] + }, "betterend.entity.dragonfly": { "category": "entity", diff --git a/src/main/resources/assets/betterend/sounds/ambient/umbra_valley.ogg b/src/main/resources/assets/betterend/sounds/ambient/umbra_valley.ogg new file mode 100644 index 00000000..24c47c41 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/ambient/umbra_valley.ogg differ