diff --git a/src/main/java/ru/betterend/registry/EndSounds.java b/src/main/java/ru/betterend/registry/EndSounds.java index 7110cd17..a91c77fd 100644 --- a/src/main/java/ru/betterend/registry/EndSounds.java +++ b/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"); diff --git a/src/main/java/ru/betterend/world/biome/cave/EmptyAuroraCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EmptyAuroraCaveBiome.java index 93fb0624..eb5d1120 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EmptyAuroraCaveBiome.java +++ b/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); diff --git a/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java index 4976fed1..9ed57309 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java +++ b/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") - .setFogDensity(2.0F) - .setMusic(EndSounds.MUSIC_FOREST)); - + super(new BiomeDefinition("empty_end_cave").setFogDensity(2.0F)); this.addFloorFeature(EndFeatures.END_STONE_STALAGMITE, 1); this.addCeilFeature(EndFeatures.END_STONE_STALACTITE, 1); } diff --git a/src/main/java/ru/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java index ed5ed762..3e262482 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java +++ b/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); diff --git a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java index 3f25a5bb..a90c8dfd 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java +++ b/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; } diff --git a/src/main/java/ru/betterend/world/biome/cave/JadeCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/JadeCaveBiome.java index d399695d..f50d2bcc 100644 --- a/src/main/java/ru/betterend/world/biome/cave/JadeCaveBiome.java +++ b/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(); diff --git a/src/main/java/ru/betterend/world/biome/cave/LushAuroraCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/LushAuroraCaveBiome.java index 52ff7f1b..d8c3c1e2 100644 --- a/src/main/java/ru/betterend/world/biome/cave/LushAuroraCaveBiome.java +++ b/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)); diff --git a/src/main/java/ru/betterend/world/biome/cave/LushSmaragdantCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/LushSmaragdantCaveBiome.java index c9a40749..0997c6fa 100644 --- a/src/main/java/ru/betterend/world/biome/cave/LushSmaragdantCaveBiome.java +++ b/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)); diff --git a/src/main/resources/assets/betterend/sounds.json b/src/main/resources/assets/betterend/sounds.json index 03913530..5fedf213 100644 --- a/src/main/resources/assets/betterend/sounds.json +++ b/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", diff --git a/src/main/resources/assets/betterend/sounds/ambient/caves.ogg b/src/main/resources/assets/betterend/sounds/ambient/caves.ogg new file mode 100644 index 00000000..e68412e4 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/ambient/caves.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/music/corbyn_kites-orbit.ogg b/src/main/resources/assets/betterend/sounds/music/corbyn_kites-orbit.ogg new file mode 100644 index 00000000..6bc10162 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/music/corbyn_kites-orbit.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/music/emmit_fenn-wander.ogg b/src/main/resources/assets/betterend/sounds/music/emmit_fenn-wander.ogg new file mode 100644 index 00000000..8827bce7 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/music/emmit_fenn-wander.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/music/futuremono-moonrise.ogg b/src/main/resources/assets/betterend/sounds/music/futuremono-moonrise.ogg new file mode 100644 index 00000000..32f9257c Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/music/futuremono-moonrise.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/music/godmode-future_rennaisance.ogg b/src/main/resources/assets/betterend/sounds/music/godmode-future_rennaisance.ogg new file mode 100644 index 00000000..9936c3a1 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/music/godmode-future_rennaisance.ogg differ