Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

🔥 The music

Browse source
This commit is contained in:
Kino 2016-12-20 20:42:54 -05:00
parent 471acee721
commit 40c1b8f71e
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/legacy/aether/client/audio/AetherMusicHandler.java
View file

@ -36,9 +36,9 @@ public class AetherMusicHandler
{ {
if (this.mc.thePlayer != null) if (this.mc.thePlayer != null)
{ {
if (event.getSound().getSoundLocation() == this.mc.getAmbientMusicType().getMusicLocation().getSoundName() && this.mc.thePlayer.dimension == AetherConfig.getAetherDimensionID()) if (this.mc.thePlayer.dimension == AetherConfig.getAetherDimensionID())
{ {
if (!this.isAetherSongPlaying(event.getSound())) if (event.getSound().getSoundLocation() == this.mc.getAmbientMusicType().getMusicLocation().getSoundName() && !this.isAetherSongPlaying(event.getSound()))
{ {
int songNum = this.random.nextInt(4); int songNum = this.random.nextInt(4);
@ -46,13 +46,15 @@ public class AetherMusicHandler
return; return;
} }
else
{
event.setResultSound(null); event.setResultSound(null);
return; return;
} }
} }
} }
}
else if (event.getSound().getCategory() == SoundCategory.RECORDS) else if (event.getSound().getCategory() == SoundCategory.RECORDS)
{ {
this.mc.getSoundHandler().stopSounds(); this.mc.getSoundHandler().stopSounds();

6
src/main/resources/assets/aether_legacy/sounds.json
View file

@ -72,7 +72,7 @@
] ]
}, },
"achievement": { "achievement": {
"category": "music", "category": "player",
"sounds": [ "sounds": [
{ {
"name": "aether_legacy:achievement/achievement_gen", "name": "aether_legacy:achievement/achievement_gen",
@ -81,7 +81,7 @@
] ]
}, },
"achievement_silver": { "achievement_silver": {
"category": "music", "category": "player",
"sounds": [ "sounds": [
{ {
"name": "aether_legacy:achievement/achievement_silver", "name": "aether_legacy:achievement/achievement_silver",
@ -90,7 +90,7 @@
] ]
}, },
"achievement_bronze": { "achievement_bronze": {
"category": "music", "category": "player",
"sounds": [ "sounds": [
{ {
"name": "aether_legacy:achievement/achievement_bronze", "name": "aether_legacy:achievement/achievement_bronze",