From fd3a235d7f029d9e4c5a241a4b41be3921457d31 Mon Sep 17 00:00:00 2001
From: neeerp <dg.goldstein@mail.utoronto.ca>
Date: Sat, 2 Nov 2019 20:08:01 -0400
Subject: [PATCH] music plugin: add more area mute options

This adds an option to mute your own area sounds, sounds from npcs, and
sounds with no source.
---
 .../client/plugins/music/MusicConfig.java     | 38 ++++++++++++++++++-
 .../client/plugins/music/MusicPlugin.java     | 18 ++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicConfig.java
index e425a10f08..16eea65c9f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicConfig.java
@@ -31,16 +31,50 @@ import net.runelite.client.config.ConfigItem;
 @ConfigGroup("music")
 public interface MusicConfig extends Config
 {
+	@ConfigItem(
+		keyName = "muteOwnAreaSounds",
+		name = "Mute player area sounds",
+		description = "Mute area sounds caused by yourself",
+		position = 0
+	)
+	default boolean muteOwnAreaSounds()
+	{
+		return false;
+	}
+
 	@ConfigItem(
 		keyName = "muteOtherAreaSounds",
-		name = "Mute others' area sounds",
-		description = "Mute area sounds caused from other players"
+		name = "Mute other players' area sounds",
+		description = "Mute area sounds caused by other players",
+		position = 1
 	)
 	default boolean muteOtherAreaSounds()
 	{
 		return false;
 	}
 
+	@ConfigItem(
+		keyName = "muteOtherAreaNPCSounds",
+		name = "Mute NPCs' area sounds",
+		description = "Mute area sounds caused by NPCs",
+		position = 2
+	)
+	default boolean muteNpcAreaSounds()
+	{
+		return false;
+	}
+
+	@ConfigItem(
+		keyName = "muteOtherAreaEnvironmentSounds",
+		name = "Mute environment area sounds",
+		description = "Mute area sounds caused by neither NPCs nor players",
+		position = 3
+	)
+	default boolean muteEnvironmentAreaSounds()
+	{
+		return false;
+	}
+
 	@ConfigItem(
 		keyName = "musicVolume",
 		name = "",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java
index 02b95e1e44..3aca086669 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java
@@ -40,6 +40,7 @@ import lombok.Setter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
+import net.runelite.api.NPC;
 import net.runelite.api.Player;
 import net.runelite.api.ScriptID;
 import net.runelite.api.SoundEffectID;
@@ -557,11 +558,26 @@ public class MusicPlugin extends Plugin
 	public void onAreaSoundEffectPlayed(AreaSoundEffectPlayed areaSoundEffectPlayed)
 	{
 		Actor source = areaSoundEffectPlayed.getSource();
-		if (source != client.getLocalPlayer()
+		if (source == client.getLocalPlayer()
+			&& musicConfig.muteOwnAreaSounds())
+		{
+			areaSoundEffectPlayed.consume();
+		}
+		else if (source != client.getLocalPlayer()
 			&& source instanceof Player
 			&& musicConfig.muteOtherAreaSounds())
 		{
 			areaSoundEffectPlayed.consume();
 		}
+		else if (source instanceof NPC
+			&& musicConfig.muteNpcAreaSounds())
+		{
+			areaSoundEffectPlayed.consume();
+		}
+		else if (source == null
+			&& musicConfig.muteEnvironmentAreaSounds())
+		{
+			areaSoundEffectPlayed.consume();
+		}
 	}
 }
\ No newline at end of file