ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

various: remove dead api, move mixin to proper file

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

42
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -1034,48 +1034,6 @@ public interface Client extends GameShell
*/ */
List<GraphicsObject> getGraphicsObjects(); 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, * Play a sound effect at the player's current location. This is how UI,
* and player-generated (e.g. mining, woodcutting) sound effects are * and player-generated (e.g. mining, woodcutting) sound effects are

18
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
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") @Copy("changeGameOptions")
@Replace("changeGameOptions") @Replace("changeGameOptions")
@SuppressWarnings("InfiniteRecursion") @SuppressWarnings("InfiniteRecursion")

31
runelite-mixins/src/main/java/net/runelite/mixins/RSClientPreferencesMixin.java Normal file
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);
}
}
}

4
runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java
View File

@@ -32,8 +32,4 @@ public interface RSClientPreferences extends Preferences
@Import("musicVolume") @Import("musicVolume")
@Override @Override
int getMusicVolume(); int getMusicVolume();
@Import("musicVolume")
@Override
void setMusicVolume(int i);
} }