diff --git a/src/main/java/ru/betterend/registry/EndSounds.java b/src/main/java/ru/betterend/registry/EndSounds.java index 6107ecf8..3369d28f 100644 --- a/src/main/java/ru/betterend/registry/EndSounds.java +++ b/src/main/java/ru/betterend/registry/EndSounds.java @@ -6,15 +6,10 @@ import ru.betterend.BetterEnd; public class EndSounds { // Music - public static final SoundEvent MUSIC_FOGGY_MUSHROOMLAND = register("music", "foggy_mushroomland"); - 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 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"); - public static final SoundEvent MUSIC_AMBER_LAND = register("music", "amber_land"); - public static final SoundEvent MUSIC_SULPHUR_SPRINGS = register("music", "sulphur_springs"); + public static final SoundEvent MUSIC_FOREST = register("music", "forest"); + 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"); // Ambient public static final SoundEvent AMBIENT_FOGGY_MUSHROOMLAND = register("ambient", "foggy_mushroomland"); diff --git a/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java index c8aed8fd..6ee4cb36 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java +++ b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java @@ -14,7 +14,7 @@ public class BiomeAmberLand extends EndBiome { .setFogDensity(2.0F) .setPlantsColor(219, 115, 38) .setWaterAndFogColor(145, 108, 72) - .setMusic(EndSounds.MUSIC_AMBER_LAND) + .setMusic(EndSounds.MUSIC_FOREST) .setParticles(EndParticles.AMBER_SPHERE, 0.001F) .setSurface(EndBlocks.AMBER_MOSS) .addFeature(EndFeatures.AMBER_ORE) diff --git a/src/main/java/ru/betterend/world/biome/BiomeBlossomingSpires.java b/src/main/java/ru/betterend/world/biome/BiomeBlossomingSpires.java index dc615281..dbecf76a 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeBlossomingSpires.java +++ b/src/main/java/ru/betterend/world/biome/BiomeBlossomingSpires.java @@ -13,7 +13,7 @@ public class BiomeBlossomingSpires extends EndBiome { .setPlantsColor(122, 45, 122) .setCaves(false) .setSurface(EndBlocks.PINK_MOSS) - .setMusic(EndSounds.MUSIC_BLOSSOMING_SPIRES) + .setMusic(EndSounds.MUSIC_FOREST) .setLoop(EndSounds.AMBIENT_BLOSSOMING_SPIRES) .addFeature(EndFeatures.SPIRE) .addFeature(EndFeatures.FLOATING_SPIRE) diff --git a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java index 92db643e..86ce96cd 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java @@ -20,7 +20,7 @@ public class BiomeChorusForest extends EndBiome { .setSurface(EndBlocks.CHORUS_NYLIUM) .setParticles(ParticleTypes.PORTAL, 0.01F) .setLoop(EndSounds.AMBIENT_CHORUS_FOREST) - .setMusic(EndSounds.MUSIC_CHORUS_FOREST) + .setMusic(EndSounds.MUSIC_DARK) .addFeature(EndFeatures.VIOLECITE_LAYER) .addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.PYTHADENDRON_TREE) diff --git a/src/main/java/ru/betterend/world/biome/BiomeCrystalMountains.java b/src/main/java/ru/betterend/world/biome/BiomeCrystalMountains.java index aead7440..cd6c80f5 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeCrystalMountains.java +++ b/src/main/java/ru/betterend/world/biome/BiomeCrystalMountains.java @@ -11,7 +11,7 @@ public class BiomeCrystalMountains extends EndBiome { super(new BiomeDefinition("crystal_mountains") .setPlantsColor(255, 133, 211) .setSurface(EndBlocks.CRYSTAL_MOSS) - .setMusic(EndSounds.MUSIC_CRYSTAL_MOUNTAINS) + .setMusic(EndSounds.MUSIC_OPENSPACE) .addStructureFeature(EndStructures.MOUNTAIN) .addFeature(EndFeatures.ROUND_CAVE) .addFeature(EndFeatures.CRYSTAL_GRASS) diff --git a/src/main/java/ru/betterend/world/biome/BiomeDustWastelands.java b/src/main/java/ru/betterend/world/biome/BiomeDustWastelands.java index 4bd14725..c663cf09 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.MUSIC_DUST_WASTELANDS) + .setMusic(EndSounds.MUSIC_OPENSPACE) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 2)); } diff --git a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java index ec9adfa0..4158875e 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java +++ b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java @@ -19,7 +19,7 @@ public class BiomeFoggyMushroomland extends EndBiome { .setSurface(EndBlocks.END_MOSS, EndBlocks.END_MYCELIUM) .setParticles(EndParticles.GLOWING_SPHERE, 0.001F) .setLoop(EndSounds.AMBIENT_FOGGY_MUSHROOMLAND) - .setMusic(EndSounds.MUSIC_FOGGY_MUSHROOMLAND) + .setMusic(EndSounds.MUSIC_FOREST) .addStructureFeature(EndStructures.GIANT_MOSSY_GLOWSHROOM) .addFeature(EndFeatures.END_LAKE) .addFeature(EndFeatures.MOSSY_GLOWSHROOM) diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java index 24c77326..86ed7887 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java @@ -14,7 +14,7 @@ public class BiomeMegalake extends EndBiome { .setFogColor(178, 209, 248) .setWaterAndFogColor(96, 163, 255) .setFogDensity(1.75F) - .setMusic(EndSounds.MUSIC_MEGALAKE) + .setMusic(EndSounds.MUSIC_WATER) .setLoop(EndSounds.AMBIENT_MEGALAKE) .setSurface(EndBlocks.END_MOSS, EndBlocks.ENDSTONE_DUST) .addStructureFeature(EndStructures.MEGALAKE) diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java index 2f02fbad..2404e851 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java @@ -16,7 +16,7 @@ public class BiomeMegalakeGrove extends EndBiome { .setWaterAndFogColor(96, 163, 255) .setFogDensity(2.0F) .setParticles(EndParticles.GLOWING_SPHERE, 0.001F) - .setMusic(EndSounds.MUSIC_MEGALAKE) + .setMusic(EndSounds.MUSIC_WATER) .setLoop(EndSounds.AMBIENT_MEGALAKE_GROVE) .setSurface(EndBlocks.END_MOSS) .addStructureFeature(EndStructures.MEGALAKE) diff --git a/src/main/java/ru/betterend/world/biome/BiomePaintedMountains.java b/src/main/java/ru/betterend/world/biome/BiomePaintedMountains.java index 1aa00072..49aa5c47 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) .setCaves(false) .setWaterAndFogColor(192, 180, 131) - .setMusic(EndSounds.MUSIC_DUST_WASTELANDS) + .setMusic(EndSounds.MUSIC_OPENSPACE) .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 5681fc6e..a2d917a0 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -18,7 +18,7 @@ public class BiomeShadowForest extends EndBiome { .setSurface(EndBlocks.SHADOW_GRASS) .setParticles(ParticleTypes.MYCELIUM, 0.01F) .setLoop(EndSounds.AMBIENT_CHORUS_FOREST) - .setMusic(EndSounds.MUSIC_SHADOW_FOREST) + .setMusic(EndSounds.MUSIC_DARK) .addFeature(EndFeatures.VIOLECITE_LAYER) .addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.DRAGON_TREE) diff --git a/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java b/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java index 5ade846c..c2df018e 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java +++ b/src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java @@ -11,7 +11,7 @@ public class BiomeSulphurSprings extends EndBiome { public BiomeSulphurSprings() { super(new BiomeDefinition("sulphur_springs") .setSurface(SurfaceBuilders.SULPHURIC_SURFACE) - .setMusic(EndSounds.MUSIC_SULPHUR_SPRINGS) + .setMusic(EndSounds.MUSIC_OPENSPACE) .setLoop(EndSounds.AMBIENT_SULPHUR_SPRINGS) .setWaterColor(25, 90, 157) .setWaterFogColor(30, 65, 61) diff --git a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java index 1c62dd40..7017a173 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java +++ b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java @@ -2,6 +2,7 @@ package ru.betterend.world.biome; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndSounds; public class BiomeUmbrellaJungle extends EndBiome { public BiomeUmbrellaJungle() { @@ -10,6 +11,7 @@ public class BiomeUmbrellaJungle extends EndBiome { .setWaterAndFogColor(119, 198, 253) .setFoliageColor(27, 183, 194) .setFogDensity(2.3F) + .setMusic(EndSounds.MUSIC_FOREST) .setSurface(EndBlocks.JUNGLE_MOSS) .addFeature(EndFeatures.END_LAKE) .addFeature(EndFeatures.UMBRELLA_TREE) diff --git a/src/main/resources/assets/betterend/sounds.json b/src/main/resources/assets/betterend/sounds.json index 9c0ccf60..9ff2a241 100644 --- a/src/main/resources/assets/betterend/sounds.json +++ b/src/main/resources/assets/betterend/sounds.json @@ -1,5 +1,5 @@ { - "betterend.music.foggy_mushroomland": { + "betterend.music.forest": { "category": "music", "sounds": [ { @@ -11,102 +11,7 @@ "name": "betterend:music/dan_henig-nebular_focus", "volume": 0.2, "stream": false - } - ] - }, - "betterend.music.chorus_forest": { - "category": "music", - "sounds": [ - { - "name": "betterend:music/emmit_fenn-creep", - "volume": 0.2, - "stream": false }, - { - "name": "betterend:music/jesse_gallagher-the_anunnaki_return", - "volume": 0.2, - "stream": false - } - ] - }, - "betterend.music.crystal_mountains": { - "category": "music", - "sounds": [ - { - "name": "betterend:music/jesse_gallagher-spenta_mainyu", - "volume": 0.2, - "stream": false - }, - { - "name": "betterend:music/jesse_gallagher-obelisks", - "volume": 0.2, - "stream": false - } - ] - }, - "betterend.music.megalake": { - "category": "music", - "sounds": [ - { - "name": "betterend:music/jesse_gallagher-the_blue_pearl", - "volume": 0.2, - "stream": false - }, - { - "name": "betterend:music/jesse_gallagher-venkatesananda", - "volume": 0.2, - "stream": false - } - ] - }, - "betterend.music.dust_wastelands": { - "category": "music", - "sounds": [ - { - "name": "betterend:music/the-tides-ammil", - "volume": 0.2, - "stream": false - }, - { - "name": "betterend:music/vyen-amber", - "volume": 0.2, - "stream": false - } - ] - }, - "betterend.music.shadow_forest": { - "category": "music", - "sounds": [ - { - "name": "betterend:music/i_think_i_can_help_you-the_six_realms", - "volume": 0.2, - "stream": false - }, - { - "name": "betterend:music/jesse_gallagher-maestro_tlakaelel", - "volume": 0.2, - "stream": false - } - ] - }, - "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.music.amber_land": { - "category": "music", - "sounds": [ { "name": "betterend:music/bobby_richards-two_moons", "volume": 0.2, @@ -119,7 +24,57 @@ } ] }, - "betterend.music.sulphur_springs": { + "betterend.music.water": { + "category": "music", + "sounds": [ + { + "name": "betterend:music/jesse_gallagher-the_blue_pearl", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/jesse_gallagher-venkatesananda", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/the_tides-somnolent", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/benjamin_martins-verve", + "volume": 0.2, + "stream": false + } + ] + }, + "betterend.music.dark": { + "category": "music", + "sounds": [ + { + "name": "betterend:music/emmit_fenn-creep", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/jesse_gallagher-the_anunnaki_return", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/i_think_i_can_help_you-the_six_realms", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/jesse_gallagher-maestro_tlakaelel", + "volume": 0.2, + "stream": false + } + ] + }, + "betterend.music.openspace": { "category": "music", "sounds": [ { @@ -131,9 +86,19 @@ "name": "betterend:music/asher_fulero-elegy", "volume": 0.2, "stream": false + }, + { + "name": "betterend:music/the-tides-ammil", + "volume": 0.2, + "stream": false + }, + { + "name": "betterend:music/vyen-amber", + "volume": 0.2, + "stream": false } ] - }, + } "betterend.ambient.foggy_mushroomland": { "category": "ambient", diff --git a/src/main/resources/assets/betterend/sounds/music/jesse_gallagher-obelisks.ogg b/src/main/resources/assets/betterend/sounds/music/jesse_gallagher-obelisks.ogg deleted file mode 100644 index 13a48c1c..00000000 Binary files a/src/main/resources/assets/betterend/sounds/music/jesse_gallagher-obelisks.ogg and /dev/null differ diff --git a/src/main/resources/assets/betterend/sounds/music/jesse_gallagher-spenta_mainyu.ogg b/src/main/resources/assets/betterend/sounds/music/jesse_gallagher-spenta_mainyu.ogg deleted file mode 100644 index 4469ac22..00000000 Binary files a/src/main/resources/assets/betterend/sounds/music/jesse_gallagher-spenta_mainyu.ogg and /dev/null differ