diff --git a/src/main/java/ru/betterend/registry/EndSounds.java b/src/main/java/ru/betterend/registry/EndSounds.java index 47f2eba0..6107ecf8 100644 --- a/src/main/java/ru/betterend/registry/EndSounds.java +++ b/src/main/java/ru/betterend/registry/EndSounds.java @@ -14,6 +14,7 @@ public class EndSounds { public static final SoundEvent MUSIC_SHADOW_FOREST = register("music", "shadow_forest"); public static final SoundEvent MUSIC_BLOSSOMING_SPIRES = register("music", "blossoming_spires"); public static final SoundEvent MUSIC_AMBER_LAND = register("music", "amber_land"); + public static final SoundEvent MUSIC_SULPHUR_SPRINGS = register("music", "sulphur_springs"); // Ambient public static final SoundEvent AMBIENT_FOGGY_MUSHROOMLAND = register("ambient", "foggy_mushroomland"); @@ -22,6 +23,7 @@ public class EndSounds { 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"); + public static final SoundEvent AMBIENT_SULPHUR_SPRINGS = register("ambient", "sulphur_springs"); // Entity public static final SoundEvent ENTITY_DRAGONFLY = register("entity", "dragonfly"); diff --git a/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java b/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java index 7e9cfcea..5ade846c 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java +++ b/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java @@ -4,12 +4,15 @@ import net.minecraft.entity.EntityType; import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; +import ru.betterend.registry.EndSounds; import ru.betterend.world.surface.SurfaceBuilders; public class BiomeSulphurSprings extends EndBiome { public BiomeSulphurSprings() { super(new BiomeDefinition("sulphur_springs") .setSurface(SurfaceBuilders.SULPHURIC_SURFACE) + .setMusic(EndSounds.MUSIC_SULPHUR_SPRINGS) + .setLoop(EndSounds.AMBIENT_SULPHUR_SPRINGS) .setWaterColor(25, 90, 157) .setWaterFogColor(30, 65, 61) .setFogColor(207, 194, 62) @@ -18,7 +21,6 @@ public class BiomeSulphurSprings extends EndBiome { .setParticles(EndParticles.SULPHUR_PARTICLE, 0.001F) .addFeature(EndFeatures.GEYSER) .addFeature(EndFeatures.SURFACE_VENT) - //.addFeature(EndFeatures.SULPHUR_HILL) .addFeature(EndFeatures.SULPHURIC_LAKE) .addFeature(EndFeatures.SULPHURIC_CAVE) .addFeature(EndFeatures.HYDRALUX) diff --git a/src/main/resources/assets/betterend/sounds.json b/src/main/resources/assets/betterend/sounds.json index b85414e2..9c0ccf60 100644 --- a/src/main/resources/assets/betterend/sounds.json +++ b/src/main/resources/assets/betterend/sounds.json @@ -119,6 +119,21 @@ } ] }, + "betterend.music.sulphur_springs": { + "category": "music", + "sounds": [ + { + "name": "betterend:music/godmode-melancholia", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/asher_fulero-elegy", + "volume": 0.2, + "stream": false + } + ] + }, "betterend.ambient.foggy_mushroomland": { "category": "ambient", @@ -174,6 +189,16 @@ } ] }, + "betterend.ambient.sulphur_springs": { + "category": "ambient", + "sounds": [ + { + "name": "betterend:ambient/sulphur_springs", + "volume": 0.3, + "stream": false + } + ] + }, "betterend.entity.dragonfly": { "category": "entity", diff --git a/src/main/resources/assets/betterend/sounds/ambient/sulphur_springs.ogg b/src/main/resources/assets/betterend/sounds/ambient/sulphur_springs.ogg new file mode 100644 index 00000000..e606ff18 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/ambient/sulphur_springs.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/music/asher_fulero-elegy.ogg b/src/main/resources/assets/betterend/sounds/music/asher_fulero-elegy.ogg new file mode 100644 index 00000000..c0dea341 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/music/asher_fulero-elegy.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/music/godmode-melancholia.ogg b/src/main/resources/assets/betterend/sounds/music/godmode-melancholia.ogg new file mode 100644 index 00000000..a3952b3a Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/music/godmode-melancholia.ogg differ