diff --git a/src/main/java/ru/betterend/registry/EndSounds.java b/src/main/java/ru/betterend/registry/EndSounds.java index da427e20..c86c136f 100644 --- a/src/main/java/ru/betterend/registry/EndSounds.java +++ b/src/main/java/ru/betterend/registry/EndSounds.java @@ -10,8 +10,9 @@ public class EndSounds { public static final SoundEvent MUSIC_CHORUS_FOREST = register("music", "chorus_forest"); public static final SoundEvent MUSIC_CRYSTAL_MOUNTAINS = register("music", "crystal_mountains"); public static final SoundEvent MUSIC_MEGALAKE = register("music", "megalake"); - public static final SoundEvent DUST_WASTELANDS = register("music", "dust_wastelands"); - public static final SoundEvent SHADOW_FOREST = register("music", "shadow_forest"); + public static final SoundEvent MUSIC_DUST_WASTELANDS = register("music", "dust_wastelands"); + public static final SoundEvent MUSIC_SHADOW_FOREST = register("music", "shadow_forest"); + public static final SoundEvent MUSIC_BLOSSOMING_SPIRES = register("music", "blossoming_spires"); // Ambient public static final SoundEvent AMBIENT_FOGGY_MUSHROOMLAND = register("ambient", "foggy_mushroomland"); @@ -19,6 +20,7 @@ public class EndSounds { public static final SoundEvent AMBIENT_MEGALAKE = register("ambient", "megalake"); public static final SoundEvent AMBIENT_DUST_WASTELANDS = register("ambient", "dust_wastelands"); public static final SoundEvent AMBIENT_MEGALAKE_GROVE = register("ambient", "megalake_grove"); + public static final SoundEvent AMBIENT_BLOSSOMING_SPIRES = register("ambient", "blossoming_spires"); // Entity public static final SoundEvent ENTITY_DRAGONFLY = register("entity", "dragonfly"); diff --git a/src/main/java/ru/betterend/world/biome/BiomeDustWastelands.java b/src/main/java/ru/betterend/world/biome/BiomeDustWastelands.java index 45377d52..e55ff709 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeDustWastelands.java +++ b/src/main/java/ru/betterend/world/biome/BiomeDustWastelands.java @@ -16,7 +16,7 @@ public class BiomeDustWastelands extends EndBiome { .setSurface(EndBlocks.ENDSTONE_DUST) .setParticles(ParticleTypes.WHITE_ASH, 0.01F) .setLoop(EndSounds.AMBIENT_DUST_WASTELANDS) - .setMusic(EndSounds.DUST_WASTELANDS) + .setMusic(EndSounds.MUSIC_DUST_WASTELANDS) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 2)); } diff --git a/src/main/java/ru/betterend/world/biome/BiomePaintedMountains.java b/src/main/java/ru/betterend/world/biome/BiomePaintedMountains.java index 9451c7f3..d21773f7 100644 --- a/src/main/java/ru/betterend/world/biome/BiomePaintedMountains.java +++ b/src/main/java/ru/betterend/world/biome/BiomePaintedMountains.java @@ -13,7 +13,7 @@ public class BiomePaintedMountains extends EndBiome { .setFogDensity(2) .setWaterColor(192, 180, 131) .setWaterFogColor(192, 180, 131) - .setMusic(EndSounds.DUST_WASTELANDS) + .setMusic(EndSounds.MUSIC_DUST_WASTELANDS) .setLoop(EndSounds.AMBIENT_DUST_WASTELANDS) .setSurface(EndBlocks.ENDSTONE_DUST) .setParticles(ParticleTypes.WHITE_ASH, 0.01F) diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java index 9fa1adbe..4ffe5998 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -19,7 +19,7 @@ public class BiomeShadowForest extends EndBiome { .setSurface(EndBlocks.SHADOW_GRASS) .setParticles(ParticleTypes.MYCELIUM, 0.01F) .setLoop(EndSounds.AMBIENT_CHORUS_FOREST) - .setMusic(EndSounds.SHADOW_FOREST) + .setMusic(EndSounds.MUSIC_SHADOW_FOREST) .addFeature(EndFeatures.VIOLECITE_LAYER) .addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.DRAGON_TREE) diff --git a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java index a5a34a9c..4193031c 100644 --- a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java +++ b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java @@ -3,6 +3,7 @@ package ru.betterend.world.biome; import net.minecraft.entity.EntityType; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndSounds; public class BlossomingSpires extends EndBiome { public BlossomingSpires() { @@ -11,6 +12,8 @@ public class BlossomingSpires extends EndBiome { .setFogDensity(2.0F) .setPlantsColor(122, 45, 122) .setSurface(EndBlocks.PINK_MOSS) + .setMusic(EndSounds.MUSIC_BLOSSOMING_SPIRES) + .setLoop(EndSounds.AMBIENT_BLOSSOMING_SPIRES) .addFeature(EndFeatures.SPIRE) .addFeature(EndFeatures.FLOATING_SPIRE) .addFeature(EndFeatures.TENANEA) diff --git a/src/main/resources/assets/betterend/sounds.json b/src/main/resources/assets/betterend/sounds.json index a64e8f7d..da079d5c 100644 --- a/src/main/resources/assets/betterend/sounds.json +++ b/src/main/resources/assets/betterend/sounds.json @@ -89,6 +89,21 @@ } ] }, + "betterend.music.blossoming_spires": { + "category": "music", + "sounds": [ + { + "name": "betterend:music/benjamin_martins-verve", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/the_tides-somnolent", + "volume": 0.2, + "stream": false + } + ] + }, "betterend.ambient.foggy_mushroomland": { "category": "ambient", @@ -135,6 +150,15 @@ } ] }, + "betterend.ambient.blossoming_spires": { + "category": "ambient", + "sounds": [ + { + "name": "betterend:ambient/blossoming_spires", + "stream": false + } + ] + }, "betterend.entity.dragonfly": { "category": "entity", diff --git a/src/main/resources/assets/betterend/sounds/ambient/blossoming_spires.ogg b/src/main/resources/assets/betterend/sounds/ambient/blossoming_spires.ogg new file mode 100644 index 00000000..4d8addaf Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/ambient/blossoming_spires.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/music/benjamin_martins-verve.ogg b/src/main/resources/assets/betterend/sounds/music/benjamin_martins-verve.ogg new file mode 100644 index 00000000..36dbfea3 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/music/benjamin_martins-verve.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/music/the_tides-somnolent.ogg b/src/main/resources/assets/betterend/sounds/music/the_tides-somnolent.ogg new file mode 100644 index 00000000..aec2df5e Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/music/the_tides-somnolent.ogg differ