Merge remote-tracking branch 'Owain/2310-merge'

runescape-api/src/main/java/net/runelite/rs/api/RSClient.java

@@ -449,6 +449,9 @@ public interface RSClient extends RSGameShell, Client
 	@Import("SpriteBuffer_spritePalette")
 	void setIndexedSpritePalette(int[] indexedSpritePalette);
 
+	@Import("archive6")
+	RSAbstractArchive getMusicTracks();
+
 	@Import("archive8")
 	@Override
 	RSAbstractArchive getIndexSprites();
@@ -1042,12 +1045,44 @@ public interface RSClient extends RSGameShell, Client
 	@Import("decimator")
 	RSDecimator getSoundEffectResampler();
 
+	@Import("musicVolume")
+	@Override
+	int getMusicVolume();
+
+	@Import("musicVolume")
+	void setClientMusicVolume(int volume);
+
+	@Import("areaSoundEffectVolume")
+	@Override
+	int getAreaSoundEffectVolume();
+
+	@Import("areaSoundEffectVolume")
+	@Override
+	void setAreaSoundEffectVolume(int volume);
+
 	@Import("soundEffectVolume")
+	@Override
 	int getSoundEffectVolume();
 
+	@Import("soundEffectVolume")
+	@Override
+	void setSoundEffectVolume(int volume);
+
+	@Import("musicTrackVolume")
+	void setMusicTrackVolume(int volume);
+
 	@Import("viewportWalking")
 	void setViewportWalking(boolean viewportWalking);
 
+	@Import("playMusicTrack")
+	void playMusicTrack(RSAbstractArchive var0, int var1, int var2, int var3, boolean var4);
+
+	@Import("midiPcmStream")
+	RSMidiPcmStream getMidiPcmStream();
+
+	@Import("currentTrackGroupId")
+	int getCurrentTrackGroupId();
+
 	@Import("crossSprites")
 	@Override
 	RSSprite[] getCrossSprites();
@@ -1101,6 +1136,9 @@ public interface RSClient extends RSGameShell, Client
 	@Import("Login_promptCredentials")
 	void promptCredentials(boolean clearPass);
 
+	@Import("VarpDefinition_get")
+	RSVarpDefinition getVarpDefinition(int id);
+
 	@Construct
 	RSTileItem newTileItem();
 

runescape-api/src/main/java/net/runelite/rs/api/RSMidiPcmStream.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2018, trimbe <github.com/trimbe>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.rs.api;
+
+import net.runelite.mapping.Import;
+
+public interface RSMidiPcmStream
+{
+	@Import("setPcmStreamVolume")
+	void setPcmStreamVolume(int volume);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java

@@ -20,4 +20,7 @@ public interface RSScriptEvent extends ScriptEvent
 
 	@Import("targetName")
 	String getOpbase();
+
+	@Import("mouseX")
+	int getMouseX();
 }

runescape-api/src/main/java/net/runelite/rs/api/RSVarpDefinition.java

@@ -0,0 +1,9 @@
+package net.runelite.rs.api;
+
+import net.runelite.mapping.Import;
+
+public interface RSVarpDefinition extends RSDualNode
+{
+	@Import("type")
+	int getType();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java

@@ -496,4 +496,20 @@ public interface RSWidget extends Widget
 
 	@Import("getSprite")
 	RSSprite getSprite(boolean b);
+
+	@Import("onRelease")
+	@Override
+	void setOnReleaseListener(Object[] o);
+
+	@Import("varTransmitTriggers")
+	@Override
+	void setVarTransmitTrigger(int[] i);
+
+	@Import("onHold")
+	@Override
+	void setOnHoldListener(Object[] o);
+
+	@Import("onClick")
+	@Override
+	void setOnClickListener(Object[] o);
 }