MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Music reorganization

Browse source
This commit is contained in:
paulevsGitch 2020-12-27 19:35:12 +03:00
parent d97d4e3953
commit aec4749e8c
16 changed files with 80 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/ru/betterend/registry/EndSounds.java
View file

@ -6,15 +6,10 @@ import ru.betterend.BetterEnd;
public class EndSounds { public class EndSounds {
// Music // Music
public static final SoundEvent MUSIC_FOGGY_MUSHROOMLAND = register("music", "foggy_mushroomland"); public static final SoundEvent MUSIC_FOREST = register("music", "forest");
public static final SoundEvent MUSIC_CHORUS_FOREST = register("music", "chorus_forest"); public static final SoundEvent MUSIC_WATER = register("music", "water");
public static final SoundEvent MUSIC_CRYSTAL_MOUNTAINS = register("music", "crystal_mountains"); public static final SoundEvent MUSIC_DARK = register("music", "dark");
public static final SoundEvent MUSIC_MEGALAKE = register("music", "megalake"); public static final SoundEvent MUSIC_OPENSPACE = register("music", "openspace");
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");
// Ambient // Ambient
public static final SoundEvent AMBIENT_FOGGY_MUSHROOMLAND = register("ambient", "foggy_mushroomland"); public static final SoundEvent AMBIENT_FOGGY_MUSHROOMLAND = register("ambient", "foggy_mushroomland");

2
src/main/java/ru/betterend/world/biome/BiomeAmberLand.java
View file

@ -14,7 +14,7 @@ public class BiomeAmberLand extends EndBiome {
.setFogDensity(2.0F) .setFogDensity(2.0F)
.setPlantsColor(219, 115, 38) .setPlantsColor(219, 115, 38)
.setWaterAndFogColor(145, 108, 72) .setWaterAndFogColor(145, 108, 72)
.setMusic(EndSounds.MUSIC_AMBER_LAND) .setMusic(EndSounds.MUSIC_FOREST)
.setParticles(EndParticles.AMBER_SPHERE, 0.001F) .setParticles(EndParticles.AMBER_SPHERE, 0.001F)
.setSurface(EndBlocks.AMBER_MOSS) .setSurface(EndBlocks.AMBER_MOSS)
.addFeature(EndFeatures.AMBER_ORE) .addFeature(EndFeatures.AMBER_ORE)

2
src/main/java/ru/betterend/world/biome/BiomeBlossomingSpires.java
View file

@ -13,7 +13,7 @@ public class BiomeBlossomingSpires extends EndBiome {
.setPlantsColor(122, 45, 122) .setPlantsColor(122, 45, 122)
.setCaves(false) .setCaves(false)
.setSurface(EndBlocks.PINK_MOSS) .setSurface(EndBlocks.PINK_MOSS)
.setMusic(EndSounds.MUSIC_BLOSSOMING_SPIRES) .setMusic(EndSounds.MUSIC_FOREST)
.setLoop(EndSounds.AMBIENT_BLOSSOMING_SPIRES) .setLoop(EndSounds.AMBIENT_BLOSSOMING_SPIRES)
.addFeature(EndFeatures.SPIRE) .addFeature(EndFeatures.SPIRE)
.addFeature(EndFeatures.FLOATING_SPIRE) .addFeature(EndFeatures.FLOATING_SPIRE)

2
src/main/java/ru/betterend/world/biome/BiomeChorusForest.java
View file

@ -20,7 +20,7 @@ public class BiomeChorusForest extends EndBiome {
.setSurface(EndBlocks.CHORUS_NYLIUM) .setSurface(EndBlocks.CHORUS_NYLIUM)
.setParticles(ParticleTypes.PORTAL, 0.01F) .setParticles(ParticleTypes.PORTAL, 0.01F)
.setLoop(EndSounds.AMBIENT_CHORUS_FOREST) .setLoop(EndSounds.AMBIENT_CHORUS_FOREST)
.setMusic(EndSounds.MUSIC_CHORUS_FOREST) .setMusic(EndSounds.MUSIC_DARK)
.addFeature(EndFeatures.VIOLECITE_LAYER) .addFeature(EndFeatures.VIOLECITE_LAYER)
.addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.END_LAKE_RARE)
.addFeature(EndFeatures.PYTHADENDRON_TREE) .addFeature(EndFeatures.PYTHADENDRON_TREE)

2
src/main/java/ru/betterend/world/biome/BiomeCrystalMountains.java
View file

@ -11,7 +11,7 @@ public class BiomeCrystalMountains extends EndBiome {
super(new BiomeDefinition("crystal_mountains") super(new BiomeDefinition("crystal_mountains")
.setPlantsColor(255, 133, 211) .setPlantsColor(255, 133, 211)
.setSurface(EndBlocks.CRYSTAL_MOSS) .setSurface(EndBlocks.CRYSTAL_MOSS)
.setMusic(EndSounds.MUSIC_CRYSTAL_MOUNTAINS) .setMusic(EndSounds.MUSIC_OPENSPACE)
.addStructureFeature(EndStructures.MOUNTAIN) .addStructureFeature(EndStructures.MOUNTAIN)
.addFeature(EndFeatures.ROUND_CAVE) .addFeature(EndFeatures.ROUND_CAVE)
.addFeature(EndFeatures.CRYSTAL_GRASS) .addFeature(EndFeatures.CRYSTAL_GRASS)

2
src/main/java/ru/betterend/world/biome/BiomeDustWastelands.java
View file

@ -16,7 +16,7 @@ public class BiomeDustWastelands extends EndBiome {
.setSurface(EndBlocks.ENDSTONE_DUST) .setSurface(EndBlocks.ENDSTONE_DUST)
.setParticles(ParticleTypes.WHITE_ASH, 0.01F) .setParticles(ParticleTypes.WHITE_ASH, 0.01F)
.setLoop(EndSounds.AMBIENT_DUST_WASTELANDS) .setLoop(EndSounds.AMBIENT_DUST_WASTELANDS)
.setMusic(EndSounds.MUSIC_DUST_WASTELANDS) .setMusic(EndSounds.MUSIC_OPENSPACE)
.addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addStructureFeature(ConfiguredStructureFeatures.END_CITY)
.addMobSpawn(EntityType.ENDERMAN, 50, 1, 2)); .addMobSpawn(EntityType.ENDERMAN, 50, 1, 2));
} }

2
src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java
View file

@ -19,7 +19,7 @@ public class BiomeFoggyMushroomland extends EndBiome {
.setSurface(EndBlocks.END_MOSS, EndBlocks.END_MYCELIUM) .setSurface(EndBlocks.END_MOSS, EndBlocks.END_MYCELIUM)
.setParticles(EndParticles.GLOWING_SPHERE, 0.001F) .setParticles(EndParticles.GLOWING_SPHERE, 0.001F)
.setLoop(EndSounds.AMBIENT_FOGGY_MUSHROOMLAND) .setLoop(EndSounds.AMBIENT_FOGGY_MUSHROOMLAND)
.setMusic(EndSounds.MUSIC_FOGGY_MUSHROOMLAND) .setMusic(EndSounds.MUSIC_FOREST)
.addStructureFeature(EndStructures.GIANT_MOSSY_GLOWSHROOM) .addStructureFeature(EndStructures.GIANT_MOSSY_GLOWSHROOM)
.addFeature(EndFeatures.END_LAKE) .addFeature(EndFeatures.END_LAKE)
.addFeature(EndFeatures.MOSSY_GLOWSHROOM) .addFeature(EndFeatures.MOSSY_GLOWSHROOM)

2
src/main/java/ru/betterend/world/biome/BiomeMegalake.java
View file

@ -14,7 +14,7 @@ public class BiomeMegalake extends EndBiome {
.setFogColor(178, 209, 248) .setFogColor(178, 209, 248)
.setWaterAndFogColor(96, 163, 255) .setWaterAndFogColor(96, 163, 255)
.setFogDensity(1.75F) .setFogDensity(1.75F)
.setMusic(EndSounds.MUSIC_MEGALAKE) .setMusic(EndSounds.MUSIC_WATER)
.setLoop(EndSounds.AMBIENT_MEGALAKE) .setLoop(EndSounds.AMBIENT_MEGALAKE)
.setSurface(EndBlocks.END_MOSS, EndBlocks.ENDSTONE_DUST) .setSurface(EndBlocks.END_MOSS, EndBlocks.ENDSTONE_DUST)
.addStructureFeature(EndStructures.MEGALAKE) .addStructureFeature(EndStructures.MEGALAKE)

2
src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java
View file

@ -16,7 +16,7 @@ public class BiomeMegalakeGrove extends EndBiome {
.setWaterAndFogColor(96, 163, 255) .setWaterAndFogColor(96, 163, 255)
.setFogDensity(2.0F) .setFogDensity(2.0F)
.setParticles(EndParticles.GLOWING_SPHERE, 0.001F) .setParticles(EndParticles.GLOWING_SPHERE, 0.001F)
.setMusic(EndSounds.MUSIC_MEGALAKE) .setMusic(EndSounds.MUSIC_WATER)
.setLoop(EndSounds.AMBIENT_MEGALAKE_GROVE) .setLoop(EndSounds.AMBIENT_MEGALAKE_GROVE)
.setSurface(EndBlocks.END_MOSS) .setSurface(EndBlocks.END_MOSS)
.addStructureFeature(EndStructures.MEGALAKE) .addStructureFeature(EndStructures.MEGALAKE)

2
src/main/java/ru/betterend/world/biome/BiomePaintedMountains.java
View file

@ -13,7 +13,7 @@ public class BiomePaintedMountains extends EndBiome {
.setFogDensity(2) .setFogDensity(2)
.setCaves(false) .setCaves(false)
.setWaterAndFogColor(192, 180, 131) .setWaterAndFogColor(192, 180, 131)
.setMusic(EndSounds.MUSIC_DUST_WASTELANDS) .setMusic(EndSounds.MUSIC_OPENSPACE)
.setLoop(EndSounds.AMBIENT_DUST_WASTELANDS) .setLoop(EndSounds.AMBIENT_DUST_WASTELANDS)
.setSurface(EndBlocks.ENDSTONE_DUST) .setSurface(EndBlocks.ENDSTONE_DUST)
.setParticles(ParticleTypes.WHITE_ASH, 0.01F) .setParticles(ParticleTypes.WHITE_ASH, 0.01F)

2
src/main/java/ru/betterend/world/biome/BiomeShadowForest.java
View file

@ -18,7 +18,7 @@ public class BiomeShadowForest extends EndBiome {
.setSurface(EndBlocks.SHADOW_GRASS) .setSurface(EndBlocks.SHADOW_GRASS)
.setParticles(ParticleTypes.MYCELIUM, 0.01F) .setParticles(ParticleTypes.MYCELIUM, 0.01F)
.setLoop(EndSounds.AMBIENT_CHORUS_FOREST) .setLoop(EndSounds.AMBIENT_CHORUS_FOREST)
.setMusic(EndSounds.MUSIC_SHADOW_FOREST) .setMusic(EndSounds.MUSIC_DARK)
.addFeature(EndFeatures.VIOLECITE_LAYER) .addFeature(EndFeatures.VIOLECITE_LAYER)
.addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.END_LAKE_RARE)
.addFeature(EndFeatures.DRAGON_TREE) .addFeature(EndFeatures.DRAGON_TREE)

2
src/main/java/ru/betterend/world/biome/BiomeSulphurSprings.java
View file

@ -11,7 +11,7 @@ public class BiomeSulphurSprings extends EndBiome {
public BiomeSulphurSprings() { public BiomeSulphurSprings() {
super(new BiomeDefinition("sulphur_springs") super(new BiomeDefinition("sulphur_springs")
.setSurface(SurfaceBuilders.SULPHURIC_SURFACE) .setSurface(SurfaceBuilders.SULPHURIC_SURFACE)
.setMusic(EndSounds.MUSIC_SULPHUR_SPRINGS) .setMusic(EndSounds.MUSIC_OPENSPACE)
.setLoop(EndSounds.AMBIENT_SULPHUR_SPRINGS) .setLoop(EndSounds.AMBIENT_SULPHUR_SPRINGS)
.setWaterColor(25, 90, 157) .setWaterColor(25, 90, 157)
.setWaterFogColor(30, 65, 61) .setWaterFogColor(30, 65, 61)

2
src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java
View file

@ -2,6 +2,7 @@ package ru.betterend.world.biome;
import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;
public class BiomeUmbrellaJungle extends EndBiome { public class BiomeUmbrellaJungle extends EndBiome {
public BiomeUmbrellaJungle() { public BiomeUmbrellaJungle() {
@ -10,6 +11,7 @@ public class BiomeUmbrellaJungle extends EndBiome {
.setWaterAndFogColor(119, 198, 253) .setWaterAndFogColor(119, 198, 253)
.setFoliageColor(27, 183, 194) .setFoliageColor(27, 183, 194)
.setFogDensity(2.3F) .setFogDensity(2.3F)
.setMusic(EndSounds.MUSIC_FOREST)
.setSurface(EndBlocks.JUNGLE_MOSS) .setSurface(EndBlocks.JUNGLE_MOSS)
.addFeature(EndFeatures.END_LAKE) .addFeature(EndFeatures.END_LAKE)
.addFeature(EndFeatures.UMBRELLA_TREE) .addFeature(EndFeatures.UMBRELLA_TREE)

161
src/main/resources/assets/betterend/sounds.json
View file

@ -1,5 +1,5 @@
{ {
"betterend.music.foggy_mushroomland": { "betterend.music.forest": {
"category": "music", "category": "music",
"sounds": [ "sounds": [
{ {
@ -11,102 +11,7 @@
"name": "betterend:music/dan_henig-nebular_focus", "name": "betterend:music/dan_henig-nebular_focus",
"volume": 0.2, "volume": 0.2,
"stream": false "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", "name": "betterend:music/bobby_richards-two_moons",
"volume": 0.2, "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", "category": "music",
"sounds": [ "sounds": [
{ {
@ -131,9 +86,19 @@
"name": "betterend:music/asher_fulero-elegy", "name": "betterend:music/asher_fulero-elegy",
"volume": 0.2, "volume": 0.2,
"stream": false "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": { "betterend.ambient.foggy_mushroomland": {
"category": "ambient", "category": "ambient",

BIN
src/main/resources/assets/betterend/sounds/music/jesse_gallagher-obelisks.ogg
View file

Binary file not shown.

BIN
src/main/resources/assets/betterend/sounds/music/jesse_gallagher-spenta_mainyu.ogg
View file

Binary file not shown.