various: remove dead api, move mixin to proper file

This commit is contained in:
therealunull
2020-12-09 14:22:49 -05:00
parent f48e7c32c4
commit 4457294d89
4 changed files with 31 additions and 64 deletions

View File

@@ -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")

View File

@@ -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);
}
}
}