From 4457294d89d38639ba2c46a7534e0179a3daf93a Mon Sep 17 00:00:00 2001
From: therealunull <therealnull@gmail.com>
Date: Wed, 9 Dec 2020 14:22:49 -0500
Subject: [PATCH] various: remove dead api, move mixin to proper file

---
 .../main/java/net/runelite/api/Client.java    | 42 -------------------
 .../net/runelite/mixins/RSClientMixin.java    | 18 --------
 .../mixins/RSClientPreferencesMixin.java      | 31 ++++++++++++++
 .../runelite/rs/api/RSClientPreferences.java  |  4 --
 4 files changed, 31 insertions(+), 64 deletions(-)
 create mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSClientPreferencesMixin.java

diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java
index a4dd24eefa..223604765e 100644
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -1034,48 +1034,6 @@ public interface Client extends GameShell
 	 */
 	List<GraphicsObject> getGraphicsObjects();
 
-	/**
-	 * Gets the music volume
-	 *
-	 * @return volume 0-255 inclusive
-	 */
-	int getMusicVolume();
-
-	/**
-	 * Sets the music volume
-	 *
-	 * @param volume 0-255 inclusive
-	 */
-	void setMusicVolume(int volume);
-
-	/**
-	 * Gets the sound effect volume
-	 *
-	 * @return volume 0-127 inclusive
-	 */
-	int getSoundEffectVolume();
-
-	/**
-	 * Sets the sound effect volume
-	 *
-	 * @param volume 0-127 inclusive
-	 */
-	void setSoundEffectVolume(int volume);
-
-	/**
-	 * Gets the area sound effect volume
-	 *
-	 * @return volume 0-127 inclusive
-	 */
-	int getAreaSoundEffectVolume();
-
-	/**
-	 * Sets the area sound effect volume
-	 *
-	 * @param volume 0-127 inclusive
-	 */
-	void setAreaSoundEffectVolume(int volume);
-
 	/**
 	 * Play a sound effect at the player's current location. This is how UI,
 	 * and player-generated (e.g. mining, woodcutting) sound effects are
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
index 175d04a834..3e908da13a 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -1815,24 +1815,6 @@ public abstract class RSClientMixin implements RSClient
 		}
 	}
 
-	@Inject
-	@Override
-	public void setMusicVolume(int volume)
-	{
-		if (volume > 0 && client.getMusicVolume() <= 0 && client.getCurrentTrackGroupId() != -1)
-		{
-			client.playMusicTrack(1000, client.getMusicTracks(), client.getCurrentTrackGroupId(), 0, volume, false);
-		}
-
-		client.getPreferences().setMusicVolume(volume);
-		client.setMusicTrackVolume(volume);
-		if (client.getMidiPcmStream() != null)
-		{
-			client.getMidiPcmStream().setPcmStreamVolume(volume);
-		}
-	}
-
-
 	@Copy("changeGameOptions")
 	@Replace("changeGameOptions")
 	@SuppressWarnings("InfiniteRecursion")
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientPreferencesMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientPreferencesMixin.java
new file mode 100644
index 0000000000..cc1de2516d
--- /dev/null
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientPreferencesMixin.java
@@ -0,0 +1,31 @@
+package net.runelite.mixins;
+
+import net.runelite.api.mixins.Inject;
+import net.runelite.api.mixins.Mixin;
+import net.runelite.api.mixins.Shadow;
+import net.runelite.rs.api.RSClient;
+import net.runelite.rs.api.RSClientPreferences;
+
+@Mixin(RSClientPreferences.class)
+public abstract class RSClientPreferencesMixin implements RSClientPreferences
+{
+	@Shadow("client")
+	private static RSClient client;
+
+	@Inject
+	@Override
+	public void setMusicVolume(int volume)
+	{
+		if (volume > 0 && client.getPreferences().getMusicVolume() <= 0 && client.getCurrentTrackGroupId() != -1)
+		{
+			client.playMusicTrack(1000, client.getMusicTracks(), client.getCurrentTrackGroupId(), 0, volume, false);
+		}
+
+		client.getPreferences().setMusicVolume(volume);
+		client.setMusicTrackVolume(volume);
+		if (client.getMidiPcmStream() != null)
+		{
+			client.getMidiPcmStream().setPcmStreamVolume(volume);
+		}
+	}
+}
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java
index 41d0004995..be701b2c83 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java
@@ -32,8 +32,4 @@ public interface RSClientPreferences extends Preferences
 	@Import("musicVolume")
 	@Override
 	int getMusicVolume();
-
-	@Import("musicVolume")
-	@Override
-	void setMusicVolume(int i);
 }