End caves ambience and music

src/main/java/ru/betterend/registry/EndSounds.java

@@ -10,6 +10,7 @@ public class EndSounds {
 	public static final SoundEvent MUSIC_WATER = register("music", "water");
 	public static final SoundEvent MUSIC_DARK = register("music", "dark");
 	public static final SoundEvent MUSIC_OPENSPACE = register("music", "openspace");
+	public static final SoundEvent MUSIC_CAVES = register("music", "caves");
 	
 	// Ambient
 	public static final SoundEvent AMBIENT_FOGGY_MUSHROOMLAND = register("ambient", "foggy_mushroomland");
@@ -21,6 +22,7 @@ public class EndSounds {
 	public static final SoundEvent AMBIENT_SULPHUR_SPRINGS = register("ambient", "sulphur_springs");
 	public static final SoundEvent AMBIENT_UMBRELLA_JUNGLE = register("ambient", "umbrella_jungle");
 	public static final SoundEvent AMBIENT_GLOWING_GRASSLANDS = register("ambient", "glowing_grasslands");
+	public static final SoundEvent AMBIENT_CAVES = register("ambient", "caves");
 	
 	// Entity
 	public static final SoundEvent ENTITY_DRAGONFLY = register("entity", "dragonfly");

src/main/java/ru/betterend/world/biome/cave/EmptyAuroraCaveBiome.java

@@ -2,7 +2,6 @@ package ru.betterend.world.biome.cave;
 
 import ru.betterend.registry.EndFeatures;
 import ru.betterend.registry.EndParticles;
-import ru.betterend.registry.EndSounds;
 import ru.betterend.world.biome.BiomeDefinition;
 
 public class EmptyAuroraCaveBiome extends EndCaveBiome {
@@ -12,7 +11,6 @@ public class EmptyAuroraCaveBiome extends EndCaveBiome {
 				.setFogDensity(2.0F)
 				.setPlantsColor(108, 25, 46)
 				.setWaterAndFogColor(186, 77, 237)
-				.setMusic(EndSounds.MUSIC_FOREST)
 				.setParticles(EndParticles.GLOWING_SPHERE, 0.001F));
 		
 		this.addFloorFeature(EndFeatures.BIG_AURORA_CRYSTAL, 1);

src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java

@@ -1,15 +1,11 @@
 package ru.betterend.world.biome.cave;
 
 import ru.betterend.registry.EndFeatures;
-import ru.betterend.registry.EndSounds;
 import ru.betterend.world.biome.BiomeDefinition;
 
 public class EmptyEndCaveBiome extends EndCaveBiome {
 	public EmptyEndCaveBiome() {
-		super(new BiomeDefinition("empty_end_cave")
+		super(new BiomeDefinition("empty_end_cave").setFogDensity(2.0F));
-				.setFogDensity(2.0F)
-				.setMusic(EndSounds.MUSIC_FOREST));
-		
 		this.addFloorFeature(EndFeatures.END_STONE_STALAGMITE, 1);
 		this.addCeilFeature(EndFeatures.END_STONE_STALACTITE, 1);
 	}

src/main/java/ru/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java

@@ -2,7 +2,6 @@ package ru.betterend.world.biome.cave;
 
 import ru.betterend.registry.EndFeatures;
 import ru.betterend.registry.EndParticles;
-import ru.betterend.registry.EndSounds;
 import ru.betterend.world.biome.BiomeDefinition;
 
 public class EmptySmaragdantCaveBiome extends EndCaveBiome {
@@ -12,7 +11,6 @@ public class EmptySmaragdantCaveBiome extends EndCaveBiome {
 				.setFogDensity(2.0F)
 				.setPlantsColor(0, 131, 145)
 				.setWaterAndFogColor(31, 167, 212)
-				.setMusic(EndSounds.MUSIC_FOREST)
 				.setParticles(EndParticles.SMARAGDANT, 0.001F));
 		
 		this.addFloorFeature(EndFeatures.SMARAGDANT_CRYSTAL, 1);

src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java

@@ -7,6 +7,7 @@ import net.minecraft.world.entity.ai.behavior.WeightedList;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import ru.betterend.registry.EndBiomes;
+import ru.betterend.registry.EndSounds;
 import ru.betterend.world.biome.BiomeDefinition;
 import ru.betterend.world.biome.EndBiome;
 import ru.betterend.world.features.EndFeature;
@@ -26,6 +27,8 @@ public class EndCaveBiome extends EndBiome {
 			new CaveChunkPopulatorFeature(() -> (EndCaveBiome) EndBiomes.getBiome(definition.getID()))
 		);
 		definition.addFeature(feature).setCaveBiome();
+		definition.setMusic(EndSounds.MUSIC_CAVES);
+		definition.setLoop(EndSounds.AMBIENT_CAVES);
 		return definition;
 	}
 	

src/main/java/ru/betterend/world/biome/cave/JadeCaveBiome.java

@@ -5,7 +5,6 @@ import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
-import ru.betterend.registry.EndSounds;
 import ru.betterend.world.biome.BiomeDefinition;
 
 public class JadeCaveBiome extends EndCaveBiome {
@@ -18,7 +17,6 @@ public class JadeCaveBiome extends EndCaveBiome {
 			.setFogColor(118, 150, 112)
 			.setFogDensity(2.0F)
 			.setWaterAndFogColor(95, 223, 255)
-			.setMusic(EndSounds.MUSIC_FOREST)
 		);
 		JADE[0] = EndBlocks.VIRID_JADESTONE.stone.defaultBlockState();
 		JADE[1] = EndBlocks.AZURE_JADESTONE.stone.defaultBlockState();

src/main/java/ru/betterend/world/biome/cave/LushAuroraCaveBiome.java

@@ -7,7 +7,6 @@ import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 import ru.betterend.registry.EndParticles;
-import ru.betterend.registry.EndSounds;
 import ru.betterend.world.biome.BiomeDefinition;
 
 public class LushAuroraCaveBiome extends EndCaveBiome {
@@ -17,7 +16,6 @@ public class LushAuroraCaveBiome extends EndCaveBiome {
 				.setFogDensity(2.0F)
 				.setPlantsColor(108, 25, 46)
 				.setWaterAndFogColor(186, 77, 237)
-				.setMusic(EndSounds.MUSIC_FOREST)
 				.setParticles(EndParticles.GLOWING_SPHERE, 0.001F)
 				.setSurface(EndBlocks.CAVE_MOSS));
 		

src/main/java/ru/betterend/world/biome/cave/LushSmaragdantCaveBiome.java

@@ -3,7 +3,6 @@ package ru.betterend.world.biome.cave;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 import ru.betterend.registry.EndParticles;
-import ru.betterend.registry.EndSounds;
 import ru.betterend.world.biome.BiomeDefinition;
 
 public class LushSmaragdantCaveBiome extends EndCaveBiome {
@@ -13,7 +12,6 @@ public class LushSmaragdantCaveBiome extends EndCaveBiome {
 				.setFogDensity(2.0F)
 				.setPlantsColor(0, 131, 145)
 				.setWaterAndFogColor(31, 167, 212)
-				.setMusic(EndSounds.MUSIC_FOREST)
 				.setParticles(EndParticles.SMARAGDANT, 0.001F)
 				.setSurface(EndBlocks.CAVE_MOSS));
 		

src/main/resources/assets/betterend/sounds.json

@@ -99,6 +99,31 @@
 			}
 		]
 	},
+	"betterend.music.caves": {
+		"category": "music",
+		"sounds": [
+			{
+				"name": "betterend:music/godmode-future_rennaisance",
+				"volume": 0.1,
+				"stream": false
+			},
+			{
+				"name": "betterend:music/futuremono-moonrise",
+				"volume": 0.1,
+				"stream": false
+			},
+			{
+				"name": "betterend:music/emmit_fenn-wander",
+				"volume": 0.1,
+				"stream": false
+			},
+			{
+				"name": "betterend:music/corbyn_kites-orbit",
+				"volume": 0.1,
+				"stream": false
+			}
+		]
+	},
 	
 	"betterend.ambient.foggy_mushroomland": {
 		"category": "ambient",
@@ -184,6 +209,16 @@
 			}
 		]
 	},
+	"betterend.ambient.caves": {
+		"category": "ambient",
+		"sounds": [
+			{
+				"name": "betterend:ambient/caves",
+				"volume": 1.0,
+				"stream": false
+			}
+		]
+	},
 	
 	"betterend.entity.dragonfly": {
 		"category": "entity",