Fix api for upstream merge

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

@@ -1014,23 +1014,20 @@ public interface RSClient extends RSGameShell, Client
 	@Import("isSpellSelected")
 	boolean getIsSpellSelected();
 
-	@Import("healthBarSpriteCache")
-	RSNodeCache getHealthBarSpriteCache();
+	@Import("readSoundEffect")
+	RSSoundEffect getTrack(RSAbstractIndexCache indexData, int id, int var0);
 
-	@Import("getTrack")
-	RSSoundEffect getTrack(RSIndexData indexData, int id, int var0);
+	@Import("createRawPcmStream")
+	RSRawPcmStream createRawPcmStream(RSRawSound audioNode, int var0, int volume);
 
-	@Import("createSoundEffectAudioTaskNode")
-	RSAudioTaskNode createSoundEffectAudioTaskNode(RSRawAudioNode audioNode, int var0, int volume);
-
-	@Import("soundEffectAudioQueue")
-	RSAudioTaskNodeQueue getSoundEffectAudioQueue();
+	@Import("pcmStreamMixer")
+	RSPcmStreamMixer getSoundEffectAudioQueue();
 
 	@Import("indexCache4")
-	RSIndexData getIndexCache4();
+	RSAbstractIndexCache getIndexCache4();
 
-	@Import("soundEffectResampler")
-	RSResampler getSoundEffectResampler();
+	@Import("decimator")
+	RSDecimator getSoundEffectResampler();
 
 	@Import("soundEffectVolume")
 	int getSoundEffectVolume();

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

@@ -24,6 +24,6 @@
  */
 package net.runelite.rs.api;
 
-public interface RSResampler
+public interface RSDecimator
 {
 }

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

@@ -24,6 +24,6 @@
  */
 package net.runelite.rs.api;
 
-public interface RSTaskDataNode
+public interface RSPcmStream
 {
 }

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

@@ -26,8 +26,8 @@ package net.runelite.rs.api;
 
 import net.runelite.mapping.Import;
 
-public interface RSRawAudioNode
+public interface RSPcmStreamMixer
 {
-	@Import("applyResampler")
-	RSRawAudioNode applyResampler(RSResampler resampler);
+	@Import("addSubStream")
+	void addSubStream(RSPcmStream taskDataNode);
 }

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

@@ -26,7 +26,7 @@ package net.runelite.rs.api;
 
 import net.runelite.mapping.Import;
 
-public interface RSAudioTaskNode
+public interface RSRawPcmStream
 {
 	@Import("setNumLoops")
 	void setNumLoops(int numLoops);

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

@@ -26,8 +26,8 @@ package net.runelite.rs.api;
 
 import net.runelite.mapping.Import;
 
-public interface RSAudioTaskNodeQueue
+public interface RSRawSound
 {
-	@Import("queueAudioTaskNode")
-	void queueAudioTaskNode(RSTaskDataNode taskDataNode);
+	@Import("resample")
+	RSRawSound applyResampler(RSDecimator resampler);
 }

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

@@ -1,9 +1,33 @@
+/*
+ * Copyright (c) 2018, SomeoneWithAnInternetConnection
+ * 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 RSSoundEffect
 {
-	@Import("toRawAudioNode")
-	RSRawAudioNode toRawAudioNode();
+	@Import("toRawSound")
+	RSRawSound toRawAudioNode();
 }