From d821ac719736cac88f3939b1f7af8c13cddadd30 Mon Sep 17 00:00:00 2001
From: Woah <woahscam@hotmail.com>
Date: Thu, 25 Mar 2021 18:08:27 -0400
Subject: [PATCH] Audio renaming (still need to find sound effect audio)
 Identified the probable cause of the display thread death
 HDToolKit.bufferSwap. There's an error that gets thrown when the user exits
 the client without going through the proper way to do so which is
 unacceptable. A band-aid has been applied.

---
 .../org/runite/client/AnimationHeader.java    |   6 +-
 .../java/org/runite/client/AudioHandler.java  | 135 +++++++-
 .../org/runite/client/BufferedDataStream.java |   4 +-
 .../java/org/runite/client/CS2Script.java     |  22 +-
 .../main/java/org/runite/client/Class102.java |  31 +-
 .../main/java/org/runite/client/Class107.java |   2 +-
 .../main/java/org/runite/client/Class115.java |  11 -
 .../main/java/org/runite/client/Class116.java | 303 -----------------
 .../main/java/org/runite/client/Class117.java |   6 +-
 .../main/java/org/runite/client/Class129.java |   1 -
 .../main/java/org/runite/client/Class135.java | 103 ------
 .../java/org/runite/client/Class140_Sub2.java |   4 +-
 .../java/org/runite/client/Class140_Sub4.java |  16 +-
 .../main/java/org/runite/client/Class155.java |   2 +-
 .../java/org/runite/client/Class164_Sub2.java |   4 +-
 .../main/java/org/runite/client/Class166.java |   1 -
 .../main/java/org/runite/client/Class167.java |  10 +-
 .../main/java/org/runite/client/Class168.java |   4 +-
 .../main/java/org/runite/client/Class17.java  |  12 +-
 .../main/java/org/runite/client/Class23.java  |   4 +-
 .../main/java/org/runite/client/Class27.java  |   2 +-
 .../main/java/org/runite/client/Class34.java  |  67 ----
 .../main/java/org/runite/client/Class38.java  |  21 --
 .../main/java/org/runite/client/Class39.java  |  12 +-
 .../java/org/runite/client/Class3_Sub14.java  |   4 +-
 .../java/org/runite/client/Class3_Sub15.java  |   8 +-
 .../java/org/runite/client/Class3_Sub22.java  |   4 +-
 .../java/org/runite/client/Class3_Sub24.java  |   2 +-
 .../org/runite/client/Class3_Sub24_Sub1.java  |  56 ++--
 .../org/runite/client/Class3_Sub24_Sub3.java  |   8 +-
 .../org/runite/client/Class3_Sub24_Sub4.java  |  12 +-
 .../java/org/runite/client/Class3_Sub25.java  |   1 -
 .../org/runite/client/Class3_Sub28_Sub20.java |   8 +-
 .../java/org/runite/client/Class3_Sub5.java   |  34 +-
 .../java/org/runite/client/Class3_Sub8.java   |  95 +-----
 .../main/java/org/runite/client/Class49.java  |   2 +-
 .../main/java/org/runite/client/Class60.java  |  15 -
 .../java/org/runite/client/Class75_Sub1.java  |   4 +-
 .../main/java/org/runite/client/Class79.java  |   8 +-
 .../main/java/org/runite/client/Class83.java  |  17 +-
 .../main/java/org/runite/client/Class84.java  |   2 +-
 .../main/java/org/runite/client/Class97.java  |   4 +-
 .../main/java/org/runite/client/Client.java   |  22 +-
 .../java/org/runite/client/DataBuffer.java    |   2 +-
 .../main/java/org/runite/client/Envelope.java |  67 ++++
 .../client/{Class103.java => Filter.java}     |  32 +-
 .../java/org/runite/client/HDToolKit.java     |  30 +-
 .../java/org/runite/client/LinkedList.java    |  16 +-
 .../java/org/runite/client/Model_Sub1.java    |  36 +--
 .../src/main/java/org/runite/client/NPC.java  |   6 +-
 .../java/org/runite/client/NPCRendering.java  |  17 +-
 .../java/org/runite/client/PacketParser.java  |   4 +-
 .../{Class3_Sub12_Sub1.java => PcmSound.java} |   8 +-
 .../main/java/org/runite/client/Player.java   |  28 +-
 .../org/runite/client/PlayerRendering.java    |  27 +-
 .../client/RenderAnimationDefinition.java     |  16 +-
 .../client/{Class3_Sub12.java => Sound.java}  |   2 +-
 .../main/java/org/runite/client/Sprites.java  |   2 +-
 .../org/runite/client/SynthInstrument.java    | 304 ++++++++++++++++++
 .../java/org/runite/client/SynthSound.java    | 101 ++++++
 .../org/runite/client/TextureOperation1.java  |   4 +-
 .../org/runite/client/TextureOperation10.java |   4 +-
 .../org/runite/client/TextureOperation20.java |   6 +-
 .../org/runite/client/TextureOperation26.java |   2 +-
 .../org/runite/client/TextureOperation32.java |   8 +-
 .../org/runite/client/TextureOperation36.java |  28 +-
 .../main/java/org/runite/client/Unsorted.java | 127 ++++----
 .../main/java/org/runite/client/WorldMap.java |   4 +-
 .../org/runite/client/drawcalls/Minimap.java  |  40 +--
 69 files changed, 1003 insertions(+), 1007 deletions(-)
 delete mode 100644 Client/src/main/java/org/runite/client/Class116.java
 delete mode 100644 Client/src/main/java/org/runite/client/Class135.java
 delete mode 100644 Client/src/main/java/org/runite/client/Class34.java
 create mode 100644 Client/src/main/java/org/runite/client/Envelope.java
 rename Client/src/main/java/org/runite/client/{Class103.java => Filter.java} (81%)
 rename Client/src/main/java/org/runite/client/{Class3_Sub12_Sub1.java => PcmSound.java} (79%)
 rename Client/src/main/java/org/runite/client/{Class3_Sub12.java => Sound.java} (64%)
 create mode 100644 Client/src/main/java/org/runite/client/SynthInstrument.java
 create mode 100644 Client/src/main/java/org/runite/client/SynthSound.java

diff --git a/Client/src/main/java/org/runite/client/AnimationHeader.java b/Client/src/main/java/org/runite/client/AnimationHeader.java
index 3712c2791..8a832305a 100644
--- a/Client/src/main/java/org/runite/client/AnimationHeader.java
+++ b/Client/src/main/java/org/runite/client/AnimationHeader.java
@@ -146,19 +146,19 @@ final class AnimationHeader {
 		            if((var11 & 1) == 0) {
 		               aShortArray1394[var6] = var12;
 		            } else {
-		               aShortArray1394[var6] = (short)parent.getSmart(-21208);
+		               aShortArray1394[var6] = (short)parent.getByteOrShort();
 		            }
 
                      if((var11 & 2) == 0) {
                         aShortArray1391[var6] = var12;
                      } else {
-                        aShortArray1391[var6] = (short)parent.getSmart(-21208);
+                        aShortArray1391[var6] = (short)parent.getByteOrShort();
                      }
 
                      if((var11 & 4) == 0) {
                         aShortArray1390[var6] = var12;
                      } else {
-                        aShortArray1390[var6] = (short)parent.getSmart(-21208);
+                        aShortArray1390[var6] = (short)parent.getByteOrShort();
                      }
 
                      aByteArray1389[var6] = (byte)(var11 >>> 3 & 3);
diff --git a/Client/src/main/java/org/runite/client/AudioHandler.java b/Client/src/main/java/org/runite/client/AudioHandler.java
index f9aae87b7..c5f46d419 100644
--- a/Client/src/main/java/org/runite/client/AudioHandler.java
+++ b/Client/src/main/java/org/runite/client/AudioHandler.java
@@ -1,19 +1,29 @@
 package org.runite.client;
 
+import java.util.Objects;
+
 public final class AudioHandler {
 
 
-    static int currentSoundEffectCount = 0;
+   public static int[] anIntArray2157 = new int[50];
+   public static int musicVolume = 255;
+   static int currentSoundEffectCount = 0;
     static int soundEffectVolume = 127;
+   static int currentTrack = -1;
+   static boolean musicEffectPlaying = false;
+   static int[] soundEffectVolumeArray = new int[50];
+   static int[] soundEffectIDs = new int[50];
+   static SynthSound[] soundEffects = new SynthSound[50];
+   static int[] soundEffectCoordinates = new int[50];
 
-    public static void musicHandler(int var1) {
+   public static void musicHandler(int var1) {
         try {
-            if (-1 == var1 && !Class83.aBoolean1158) {
+            if (-1 == var1 && !musicEffectPlaying) {
                 GameObject.method1870();
-            } else if (var1 != -1 && (Class129.anInt1691 != var1 || Class79.method1391(-1)) && Unsorted.anInt120 != 0 && !Class83.aBoolean1158) {
-                Unsorted.method2099(var1, CacheIndex.musicIndex, Unsorted.anInt120);
+            } else if (var1 != -1 && (currentTrack != var1 || Class79.method1391(-1)) && musicVolume != 0 && !musicEffectPlaying) {
+                method2099(var1, CacheIndex.musicIndex, musicVolume);
             }
-            Class129.anInt1691 = var1;
+            currentTrack = var1;
         } catch (RuntimeException var3) {
             throw ClientErrorException.clientError(var3, "li.B(" + true + ',' + var1 + ')');
         }
@@ -22,11 +32,11 @@ public final class AudioHandler {
     static void soundEffectHandler(int soundEffectID, int soundEffectDelay, int soundEffectVolume) {
        try {
           if(soundEffectVolume != 0 && soundEffectID != 0 && currentSoundEffectCount < 50 && soundEffectDelay != -1) {
-              Class166.anIntArray2068[currentSoundEffectCount] = soundEffectID;
-             Class3_Sub25.anIntArray2550[currentSoundEffectCount] = soundEffectDelay;
-             Unsorted.anIntArray2157[currentSoundEffectCount] = soundEffectVolume;
-             Class102.aClass135Array2131[currentSoundEffectCount] = null;
-             Class3_Sub8.anIntArray3083[currentSoundEffectCount] = 0;
+              soundEffectVolumeArray[currentSoundEffectCount] = soundEffectID;
+             soundEffectIDs[currentSoundEffectCount] = soundEffectDelay;
+             anIntArray2157[currentSoundEffectCount] = soundEffectVolume;
+             soundEffects[currentSoundEffectCount] = null;
+             soundEffectCoordinates[currentSoundEffectCount] = 0;
              currentSoundEffectCount++;
           }
 
@@ -34,4 +44,107 @@ public final class AudioHandler {
           throw ClientErrorException.clientError(var5, "ca.C(" + soundEffectID + ',' + soundEffectDelay + ',' + soundEffectVolume + ',' + -799 + ')');
        }
     }
+
+    static void method132() {
+       try {
+          for(int var1 = 0; var1 < currentSoundEffectCount; ++var1) {
+             --anIntArray2157[var1];
+             if(anIntArray2157[var1] < -10) {
+                --currentSoundEffectCount;
+
+                for(int var2 = var1; var2 < currentSoundEffectCount; ++var2) {
+                   soundEffectIDs[var2] = soundEffectIDs[var2 + 1];
+                   soundEffects[var2] = soundEffects[var2 + 1];
+                   soundEffectVolumeArray[var2] = soundEffectVolumeArray[1 + var2];
+                   anIntArray2157[var2] = anIntArray2157[1 + var2];
+                   soundEffectCoordinates[var2] = soundEffectCoordinates[var2 + 1];
+                }
+
+                --var1;
+             } else {
+                SynthSound var11 = soundEffects[var1];
+                if(null == var11) {
+                   var11 = SynthSound.create(CacheIndex.soundFXIndex, soundEffectIDs[var1], 0);
+                   if(null == var11) {
+                      continue;
+                   }
+
+                   anIntArray2157[var1] += var11.getStart();
+                   soundEffects[var1] = var11;
+                }
+
+                if(0 > anIntArray2157[var1]) {
+                   int var3;
+                   if(soundEffectCoordinates[var1] == 0) {
+                      var3 = soundEffectVolume;
+                   } else {
+                      int var4 = (soundEffectCoordinates[var1] & 0xFF) * 128;
+                      int var7 = soundEffectCoordinates[var1] >> 8 & 0xFF;
+                      int var5 = soundEffectCoordinates[var1] >> 16 & 0xFF;
+                      int var8 = -Class102.player.zAxis + 64 + 128 * var7;
+                      if(var8 < 0) {
+                         var8 = -var8;
+                      }
+
+                      int var6 = -Class102.player.xAxis + 64 + var5 * 128;
+                      if(0 > var6) {
+                         var6 = -var6;
+                      }
+
+                      int var9 = -128 + var6 + var8;
+                      if(var9 > var4) {
+                         anIntArray2157[var1] = -100;
+                         continue;
+                      }
+
+                      if(var9 < 0) {
+                         var9 = 0;
+                      }
+
+                      var3 = Sprites.ambientVolume * (var4 + -var9) / var4;
+                   }
+
+                   if(var3 > 0) {
+                      PcmSound var12 = var11.toPCMSound().method151(Class27.resampler);
+                      Class3_Sub24_Sub1 var13 = Class3_Sub24_Sub1.method437(var12, var3);
+                      Objects.requireNonNull(var13).method429(soundEffectVolumeArray[var1] - 1);
+                      Class3_Sub26.aClass3_Sub24_Sub2_2563.method457(var13);
+                   }
+
+                   anIntArray2157[var1] = -100;
+                }
+             }
+          }
+
+          if(musicEffectPlaying && Class79.method1391(-1)) {
+             if(0 != musicVolume && currentTrack != -1) {
+                Class70.method1285(CacheIndex.musicIndex, currentTrack, musicVolume);
+             }
+
+             musicEffectPlaying = false;
+          } else if(musicVolume != 0 && currentTrack != -1 && Class79.method1391((byte) -92 + 91)) {
+             TextureOperation12.outgoingBuffer.putOpcode(137);
+             TextureOperation12.outgoingBuffer.writeInt(currentTrack);
+             currentTrack = -1;
+          }
+
+       } catch (RuntimeException var10) {
+          throw ClientErrorException.clientError(var10, "ed.C(" + (byte) -92 + ')');
+       }
+    }
+
+   public static void method2099(int var1, CacheIndex var3, int var5) {
+       try {
+           Class101.aClass153_1423 = var3;
+           Class132.anInt1741 = 0;
+           TextureOperation8.anInt3463 = var1;
+           Unsorted.aBoolean2311 = false;
+           Unsorted.anInt154 = 1;
+           GraphicDefinition.anInt546 = 2;
+
+           TextureOperation36.anInt3423 = var5;
+       } catch (RuntimeException var8) {
+           throw ClientErrorException.clientError(var8, "v.Q(" + true + ',' + var1 + ',' + 0 + ',' + (var3 != null ? "{...}" : "null") + ',' + false + ',' + var5 + ',' + 2 + ')');
+       }
+   }
 }
diff --git a/Client/src/main/java/org/runite/client/BufferedDataStream.java b/Client/src/main/java/org/runite/client/BufferedDataStream.java
index 9d12f3754..6d133d9bd 100644
--- a/Client/src/main/java/org/runite/client/BufferedDataStream.java
+++ b/Client/src/main/java/org/runite/client/BufferedDataStream.java
@@ -226,8 +226,8 @@ public final class BufferedDataStream extends DataBuffer {
                             TextureOperation12.outgoingBuffer.writeByte(TextureOperation9.anInt3102);
                             TextureOperation12.outgoingBuffer.writeByte(Class164_Sub2.anInt3020);
                             TextureOperation12.outgoingBuffer.writeByte(89);
-                            TextureOperation12.outgoingBuffer.writeShort(Class102.player.anInt2819);
-                            TextureOperation12.outgoingBuffer.writeShort(Class102.player.anInt2829);
+                            TextureOperation12.outgoingBuffer.writeShort(Class102.player.xAxis);
+                            TextureOperation12.outgoingBuffer.writeShort(Class102.player.zAxis);
                             TextureOperation12.outgoingBuffer.writeByte(Class129.anInt1692);
                             TextureOperation12.outgoingBuffer.writeByte(63);
                         }
diff --git a/Client/src/main/java/org/runite/client/CS2Script.java b/Client/src/main/java/org/runite/client/CS2Script.java
index 9e2f97ece..990574b63 100644
--- a/Client/src/main/java/org/runite/client/CS2Script.java
+++ b/Client/src/main/java/org/runite/client/CS2Script.java
@@ -998,8 +998,8 @@ public final class CS2Script extends Linkable {
                                                     }
                                                     if (opcode == 3308) {
                                                         int l9 = WorldListCountry.localPlane;
-                                                        int k47 = Class131.anInt1716 + (Class102.player.anInt2819 >> 7);
-                                                        int i68 = (Class102.player.anInt2829 >> 7) - -Texture.anInt1152;
+                                                        int k47 = Class131.anInt1716 + (Class102.player.xAxis >> 7);
+                                                        int i68 = (Class102.player.zAxis >> 7) - -Texture.anInt1152;
                                                         ItemDefinition.intsStack[iStackCounter++] = (l9 << 28) - (-(k47 << 14) - i68);
                                                         continue;
                                                     }
@@ -2674,17 +2674,17 @@ public final class CS2Script extends Linkable {
                                                                                 k35 = 0;
                                                                             if (k35 > 255)
                                                                                 k35 = 255;
-                                                                            if (Unsorted.anInt120 != k35) {
-                                                                                if (Unsorted.anInt120 == 0 && Class129.anInt1691 != -1) {
-                                                                                    Class70.method1285(CacheIndex.musicIndex, Class129.anInt1691, k35);
-                                                                                    Class83.aBoolean1158 = false;
+                                                                            if (AudioHandler.musicVolume != k35) {
+                                                                                if (AudioHandler.musicVolume == 0 && AudioHandler.currentTrack != -1) {
+                                                                                    Class70.method1285(CacheIndex.musicIndex, AudioHandler.currentTrack, k35);
+                                                                                    AudioHandler.musicEffectPlaying = false;
                                                                                 } else if (k35 == 0) {
                                                                                     GameObject.method1870();
-                                                                                    Class83.aBoolean1158 = false;
+                                                                                    AudioHandler.musicEffectPlaying = false;
                                                                                 } else {
                                                                                     LinkableRSString.method736(k35, 115);
                                                                                 }
-                                                                                Unsorted.anInt120 = k35;
+                                                                                AudioHandler.musicVolume = k35;
                                                                             }
                                                                             Class119.method1730(Class38.gameSignlink);
                                                                             aBoolean2705 = false;
@@ -2696,7 +2696,7 @@ public final class CS2Script extends Linkable {
                                                                                 l35 = 0;
                                                                             if (127 < l35)
                                                                                 l35 = 127;
-                                                                            Sprites.anInt340 = l35;
+                                                                            Sprites.ambientVolume = l35;
                                                                             Class119.method1730(Class38.gameSignlink);
                                                                             aBoolean2705 = false;
                                                                             continue;
@@ -2803,11 +2803,11 @@ public final class CS2Script extends Linkable {
                                                                             continue;
                                                                         }
                                                                         if (6119 == opcode) {
-                                                                            ItemDefinition.intsStack[iStackCounter++] = Unsorted.anInt120;
+                                                                            ItemDefinition.intsStack[iStackCounter++] = AudioHandler.musicVolume;
                                                                             continue;
                                                                         }
                                                                         if (opcode == 6120) {
-                                                                            ItemDefinition.intsStack[iStackCounter++] = Sprites.anInt340;
+                                                                            ItemDefinition.intsStack[iStackCounter++] = Sprites.ambientVolume;
                                                                             continue;
                                                                         }
                                                                         if (opcode == 6121) {
diff --git a/Client/src/main/java/org/runite/client/Class102.java b/Client/src/main/java/org/runite/client/Class102.java
index 4b4ce74b4..e3f24fd92 100644
--- a/Client/src/main/java/org/runite/client/Class102.java
+++ b/Client/src/main/java/org/runite/client/Class102.java
@@ -5,7 +5,6 @@ import org.rs09.client.data.NodeCache;
 public final class Class102 implements Interface2 {
 
     static int[] anIntArray2125;
-    static Class135[] aClass135Array2131 = new Class135[50];
     static int anInt2136;
     public static Player player;
     private final boolean[] aBooleanArray2122;
@@ -130,9 +129,9 @@ public final class Class102 implements Interface2 {
                     int var4 = var3.getSize();
                     int var5;
                     if (1 != var4) {
-                        if (((1 & var4) != 0 || (127 & var3.anInt2819) == 0 && 0 == (127 & var3.anInt2829)) && ((var4 & 1) != 1 || (127 & var3.anInt2819) == 64 && 64 == (127 & var3.anInt2829))) {
-                            var5 = var3.anInt2819 + -(var4 * 64) >> 7;
-                            var6 = -(var4 * 64) + var3.anInt2829 >> 7;
+                        if (((1 & var4) != 0 || (127 & var3.xAxis) == 0 && 0 == (127 & var3.zAxis)) && ((var4 & 1) != 1 || (127 & var3.xAxis) == 64 && 64 == (127 & var3.zAxis))) {
+                            var5 = var3.xAxis + -(var4 * 64) >> 7;
+                            var6 = -(var4 * 64) + var3.zAxis >> 7;
                             var7 = var3.getSize() + var5;
                             if (var5 < 0) {
                                 var5 = 0;
@@ -157,9 +156,9 @@ public final class Class102 implements Interface2 {
                                 }
                             }
                         }
-                    } else if ((127 & var3.anInt2819) == 64 && (var3.anInt2829 & 127) == 64) {
-                        var5 = var3.anInt2819 >> 7;
-                        var6 = var3.anInt2829 >> 7;
+                    } else if ((127 & var3.xAxis) == 64 && (var3.zAxis & 127) == 64) {
+                        var5 = var3.xAxis >> 7;
+                        var6 = var3.zAxis >> 7;
                         if (var5 >= 0 && var5 < 104 && var6 >= 0 && var6 < 104) {
                             ++Class163_Sub1_Sub1.anIntArrayArray4010[var5][var6];
                         }
@@ -174,9 +173,9 @@ public final class Class102 implements Interface2 {
                 if (var3 != null && var3.hasDefinitions() && !var3.definition.aBoolean1263 == !var1 && var3.definition.method1472()) {
                     var6 = var3.getSize();
                     if (var6 != 1) {
-                        if ((var6 & 1) == 0 && (var3.anInt2819 & 127) == 0 && (127 & var3.anInt2829) == 0 || (var6 & 1) == 1 && (var3.anInt2819 & 127) == 64 && (127 & var3.anInt2829) == 64) {
-                            var7 = -(64 * var6) + var3.anInt2819 >> 7;
-                            var8 = -(var6 * 64) + var3.anInt2829 >> 7;
+                        if ((var6 & 1) == 0 && (var3.xAxis & 127) == 0 && (127 & var3.zAxis) == 0 || (var6 & 1) == 1 && (var3.xAxis & 127) == 64 && (127 & var3.zAxis) == 64) {
+                            var7 = -(64 * var6) + var3.xAxis >> 7;
+                            var8 = -(var6 * 64) + var3.zAxis >> 7;
                             var10 = var8 - -var6;
                             if (var8 < 0) {
                                 var8 = 0;
@@ -223,9 +222,9 @@ public final class Class102 implements Interface2 {
                                 }
                             }
                         }
-                    } else if ((127 & var3.anInt2819) == 64 && (127 & var3.anInt2829) == 64) {
-                        var7 = var3.anInt2819 >> 7;
-                        var8 = var3.anInt2829 >> 7;
+                    } else if ((127 & var3.xAxis) == 64 && (127 & var3.zAxis) == 64) {
+                        var7 = var3.xAxis >> 7;
+                        var8 = var3.zAxis >> 7;
                         if (0 > var7 || var7 >= 104 || var8 < 0 || var8 >= 104) {
                             continue;
                         }
@@ -240,8 +239,8 @@ public final class Class102 implements Interface2 {
                         var15 |= Long.MIN_VALUE;
                     }
 
-                    var3.anInt2831 = Class121.method1736(WorldListCountry.localPlane, 1, var3.anInt2819, var3.anInt2829);
-                    Class20.method907(WorldListCountry.localPlane, var3.anInt2819, var3.anInt2829, var3.anInt2831, -64 + 64 * var6 + 60, var3, var3.anInt2785, var15, var3.aBoolean2810);
+                    var3.anInt2831 = Class121.method1736(WorldListCountry.localPlane, 1, var3.xAxis, var3.zAxis);
+                    Class20.method907(WorldListCountry.localPlane, var3.xAxis, var3.zAxis, var3.anInt2831, -64 + 64 * var6 + 60, var3, var3.anInt2785, var15, var3.aBoolean2810);
                 }
             }
 
@@ -259,7 +258,7 @@ public final class Class102 implements Interface2 {
 
             anIntArray2125 = null;
             Sprites.aClass3_Sub28_Sub16_Sub2Array2140 = null;
-            aClass135Array2131 = null;
+            AudioHandler.soundEffects = null;
         } catch (RuntimeException var2) {
             throw ClientErrorException.clientError(var2, "nk.W(" + var0 + ')');
         }
diff --git a/Client/src/main/java/org/runite/client/Class107.java b/Client/src/main/java/org/runite/client/Class107.java
index 0856eeb55..9723ccd87 100644
--- a/Client/src/main/java/org/runite/client/Class107.java
+++ b/Client/src/main/java/org/runite/client/Class107.java
@@ -26,7 +26,7 @@ final class Class107 {
     static void method1647(int var1, int var2, Class140_Sub4 var3, int var4, int var5, int var6) {
         try {
 
-            Unsorted.method1724(var6, var2, var3.anInt2829, var5, var1, var3.anInt2819, (byte) -85, var4);
+            Unsorted.method1724(var6, var2, var3.zAxis, var5, var1, var3.xAxis, (byte) -85, var4);
         } catch (RuntimeException var8) {
             throw ClientErrorException.clientError(var8, "og.A(" + (byte) 122 + ',' + var1 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ',' + var5 + ',' + var6 + ')');
         }
diff --git a/Client/src/main/java/org/runite/client/Class115.java b/Client/src/main/java/org/runite/client/Class115.java
index f93451e35..ea345d527 100644
--- a/Client/src/main/java/org/runite/client/Class115.java
+++ b/Client/src/main/java/org/runite/client/Class115.java
@@ -105,15 +105,4 @@ final class Class115 {
             throw ClientErrorException.clientError(var19, "ph.A(" + (byte) -91 + ')');
         }
     }
-
-//   static void method1714() {
-//      try {
-//         KeyboardListener.aReferenceCache_1911.clearSoftReferences();
-//
-//          Unsorted.aReferenceCache_1131.clearSoftReferences();
-//      } catch (RuntimeException var2) {
-//         throw ClientErrorException.clientError(var2, "ph.C(" + (byte) -6 + ')');
-//      }
-//   }
-
 }
diff --git a/Client/src/main/java/org/runite/client/Class116.java b/Client/src/main/java/org/runite/client/Class116.java
deleted file mode 100644
index 9c9db1c6f..000000000
--- a/Client/src/main/java/org/runite/client/Class116.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package org.runite.client;
-
-import org.rs09.client.util.ArrayUtils;
-
-import java.util.Random;
-
-final class Class116 {
-
-    private static final int[] anIntArray1591;
-    private static final int[] anIntArray1594 = new int[32768];
-    private static final int[] anIntArray1598;
-    private static final int[] anIntArray1599;
-    private static final int[] anIntArray1600;
-    private static final int[] anIntArray1601;
-    private static final int[] anIntArray1602;
-    private static final int[] anIntArray1603;
-    static int[][] anIntArrayArray1435 = new int[2][8];
-    static int anInt1436;
-
-    static {
-        Random var0 = new Random(0L);
-
-        int var1;
-        for (var1 = 0; var1 < 32768; ++var1) {
-            anIntArray1594[var1] = (var0.nextInt() & 2) - 1;
-        }
-
-        anIntArray1591 = new int[32768];
-
-        for (var1 = 0; var1 < 32768; ++var1) {
-            anIntArray1591[var1] = (int) (Math.sin((double) var1 / 5215.1903D) * 16384.0D);
-        }
-
-        anIntArray1598 = new int[220500];
-        anIntArray1599 = new int[5];
-        anIntArray1600 = new int[5];
-        anIntArray1601 = new int[5];
-        anIntArray1603 = new int[5];
-        anIntArray1602 = new int[5];
-    }
-
-    private final int[] anIntArray1596 = new int[]{0, 0, 0, 0, 0};
-    private final int[] anIntArray1597 = new int[]{0, 0, 0, 0, 0};
-    private final int[] anIntArray1605 = new int[]{0, 0, 0, 0, 0};
-    int anInt1586 = 500;
-    int anInt1593 = 0;
-    private Class34 aClass34_1584;
-    private Class34 aClass34_1585;
-    private Class34 aClass34_1587;
-    private Class34 aClass34_1588;
-    private Class34 aClass34_1589;
-    private int anInt1590 = 0;
-    private Class34 aClass34_1592;
-    private Class34 aClass34_1595;
-    private int anInt1604 = 100;
-    private Class103 aClass103_1606;
-    private Class34 aClass34_1607;
-    private Class34 aClass34_1608;
-
-    private int method1716(int var1, int var2, int var3) {
-        return var3 == 1 ? ((var1 & 32767) < 16384 ? var2 : -var2) : (var3 == 2 ? anIntArray1591[var1 & 32767] * var2 >> 14 : (var3 == 3 ? ((var1 & 32767) * var2 >> 14) - var2 : (var3 == 4 ? anIntArray1594[var1 / 2607 & 32767] * var2 : 0)));
-    }
-
-    final int[] method1717(int var1, int var2) {
-        ArrayUtils.zero(anIntArray1598, 0, var1);
-        if (var2 >= 10) {
-            double var3 = (double) var1 / ((double) var2 + 0.0D);
-            this.aClass34_1589.method1008();
-            this.aClass34_1587.method1008();
-            int var5 = 0;
-            int var6 = 0;
-            int var7 = 0;
-            if (this.aClass34_1608 != null) {
-                this.aClass34_1608.method1008();
-                this.aClass34_1607.method1008();
-                var5 = (int) ((double) (this.aClass34_1608.anInt605 - this.aClass34_1608.anInt603) * 32.768D / var3);
-                var6 = (int) ((double) this.aClass34_1608.anInt603 * 32.768D / var3);
-            }
-
-            int var8 = 0;
-            int var9 = 0;
-            int var10 = 0;
-            if (this.aClass34_1595 != null) {
-                this.aClass34_1595.method1008();
-                this.aClass34_1584.method1008();
-                var8 = (int) ((double) (this.aClass34_1595.anInt605 - this.aClass34_1595.anInt603) * 32.768D / var3);
-                var9 = (int) ((double) this.aClass34_1595.anInt603 * 32.768D / var3);
-            }
-
-            int var11;
-            for (var11 = 0; var11 < 5; ++var11) {
-                if (this.anIntArray1596[var11] != 0) {
-                    anIntArray1601[var11] = 0;
-                    anIntArray1602[var11] = (int) ((double) this.anIntArray1597[var11] * var3);
-                    anIntArray1603[var11] = (this.anIntArray1596[var11] << 14) / 100;
-                    anIntArray1599[var11] = (int) ((double) (this.aClass34_1589.anInt605 - this.aClass34_1589.anInt603) * 32.768D * Math.pow(1.0057929410678534D, this.anIntArray1605[var11]) / var3);
-                    anIntArray1600[var11] = (int) ((double) this.aClass34_1589.anInt603 * 32.768D / var3);
-                }
-            }
-
-            int var12;
-            int var13;
-            int var14;
-            int var15;
-            for (var11 = 0; var11 < var1; ++var11) {
-                var12 = this.aClass34_1589.method1007(var1);
-                var13 = this.aClass34_1587.method1007(var1);
-                if (this.aClass34_1608 != null) {
-                    var14 = this.aClass34_1608.method1007(var1);
-                    var15 = this.aClass34_1607.method1007(var1);
-                    var12 += this.method1716(var7, var15, this.aClass34_1608.anInt601) >> 1;
-                    var7 += (var14 * var5 >> 16) + var6;
-                }
-
-                if (this.aClass34_1595 != null) {
-                    var14 = this.aClass34_1595.method1007(var1);
-                    var15 = this.aClass34_1584.method1007(var1);
-                    var13 = var13 * ((this.method1716(var10, var15, this.aClass34_1595.anInt601) >> 1) + 32768) >> 15;
-                    var10 += (var14 * var8 >> 16) + var9;
-                }
-
-                for (var14 = 0; var14 < 5; ++var14) {
-                    if (this.anIntArray1596[var14] != 0) {
-                        var15 = var11 + anIntArray1602[var14];
-                        if (var15 < var1) {
-                            anIntArray1598[var15] += this.method1716(anIntArray1601[var14], var13 * anIntArray1603[var14] >> 15, this.aClass34_1589.anInt601);
-                            anIntArray1601[var14] += (var12 * anIntArray1599[var14] >> 16) + anIntArray1600[var14];
-                        }
-                    }
-                }
-            }
-
-            int var16;
-            if (this.aClass34_1585 != null) {
-                this.aClass34_1585.method1008();
-                this.aClass34_1588.method1008();
-                var11 = 0;
-
-                for (var14 = 0; var14 < var1; ++var14) {
-                    var15 = this.aClass34_1585.method1007(var1);
-                    var16 = this.aClass34_1588.method1007(var1);
-                    var12 = this.aClass34_1585.anInt603 + ((this.aClass34_1585.anInt605 - this.aClass34_1585.anInt603) * var15 >> 8);
-                    var11 += 256;
-                    if (var11 >= var12) {
-                        var11 = 0;
-                    } else {
-                        anIntArray1598[var14] = 0;
-                    }
-                }
-            }
-
-            if (this.anInt1590 > 0 && this.anInt1604 > 0) {
-                var11 = (int) ((double) this.anInt1590 * var3);
-
-                for (var12 = var11; var12 < var1; ++var12) {
-                    anIntArray1598[var12] += anIntArray1598[var12 - var11] * this.anInt1604 / 100;
-                }
-            }
-
-            if (this.aClass103_1606.anIntArray1434[0] > 0 || this.aClass103_1606.anIntArray1434[1] > 0) {
-                this.aClass34_1592.method1008();
-                var11 = this.aClass34_1592.method1007(var1 + 1);
-                var12 = this.aClass103_1606.method1622(0, (float) var11 / 65536.0F);
-                var13 = this.aClass103_1606.method1622(1, (float) var11 / 65536.0F);
-                if (var1 >= var12 + var13) {
-                    var14 = 0;
-                    var15 = var13;
-                    if (var13 > var1 - var12) {
-                        var15 = var1 - var12;
-                    }
-
-                    int var17;
-                    while (var14 < var15) {
-                        var16 = (int) ((long) anIntArray1598[var14 + var12] * (long) anInt1436 >> 16);
-
-                        for (var17 = 0; var17 < var12; ++var17) {
-                            var16 += (int) ((long) anIntArray1598[var14 + var12 - 1 - var17] * (long) anIntArrayArray1435[0][var17] >> 16);
-                        }
-
-                        for (var17 = 0; var17 < var14; ++var17) {
-                            var16 -= (int) ((long) anIntArray1598[var14 - 1 - var17] * (long) anIntArrayArray1435[1][var17] >> 16);
-                        }
-
-                        anIntArray1598[var14] = var16;
-                        var11 = this.aClass34_1592.method1007(var1 + 1);
-                        ++var14;
-                    }
-
-                    var15 = 128;
-
-                    while (true) {
-                        if (var15 > var1 - var12) {
-                            var15 = var1 - var12;
-                        }
-
-                        while (var14 < var15) {
-                            var16 = (int) ((long) anIntArray1598[var14 + var12] * (long) anInt1436 >> 16);
-
-                            for (var17 = 0; var17 < var12; ++var17) {
-                                var16 += (int) ((long) anIntArray1598[var14 + var12 - 1 - var17] * (long) anIntArrayArray1435[0][var17] >> 16);
-                            }
-
-                            for (var17 = 0; var17 < var13; ++var17) {
-                                var16 -= (int) ((long) anIntArray1598[var14 - 1 - var17] * (long) anIntArrayArray1435[1][var17] >> 16);
-                            }
-
-                            anIntArray1598[var14] = var16;
-                            var11 = this.aClass34_1592.method1007(var1 + 1);
-                            ++var14;
-                        }
-
-                        if (var14 >= var1 - var12) {
-                            while (var14 < var1) {
-                                var16 = 0;
-
-                                for (var17 = var14 + var12 - var1; var17 < var12; ++var17) {
-                                    var16 += (int) ((long) anIntArray1598[var14 + var12 - 1 - var17] * (long) anIntArrayArray1435[0][var17] >> 16);
-                                }
-
-                                for (var17 = 0; var17 < var13; ++var17) {
-                                    var16 -= (int) ((long) anIntArray1598[var14 - 1 - var17] * (long) anIntArrayArray1435[1][var17] >> 16);
-                                }
-
-                                anIntArray1598[var14] = var16;
-                                this.aClass34_1592.method1007(var1 + 1);
-                                ++var14;
-                            }
-                            break;
-                        }
-
-                        var12 = this.aClass103_1606.method1622(0, (float) var11 / 65536.0F);
-                        var13 = this.aClass103_1606.method1622(1, (float) var11 / 65536.0F);
-                        var15 += 128;
-                    }
-                }
-            }
-
-            for (var11 = 0; var11 < var1; ++var11) {
-                if (anIntArray1598[var11] < -32768) {
-                    anIntArray1598[var11] = -32768;
-                }
-
-                if (anIntArray1598[var11] > 32767) {
-                    anIntArray1598[var11] = 32767;
-                }
-            }
-
-        }
-        return anIntArray1598;
-    }
-
-    final void method1718(DataBuffer var1) {
-        this.aClass34_1589 = new Class34();
-        this.aClass34_1589.method1010(var1);
-        this.aClass34_1587 = new Class34();
-        this.aClass34_1587.method1010(var1);
-        int var2 = var1.readUnsignedByte();
-        if (var2 != 0) {
-            --var1.index;
-            this.aClass34_1608 = new Class34();
-            this.aClass34_1608.method1010(var1);
-            this.aClass34_1607 = new Class34();
-            this.aClass34_1607.method1010(var1);
-        }
-
-        var2 = var1.readUnsignedByte();
-        if (var2 != 0) {
-            --var1.index;
-            this.aClass34_1595 = new Class34();
-            this.aClass34_1595.method1010(var1);
-            this.aClass34_1584 = new Class34();
-            this.aClass34_1584.method1010(var1);
-        }
-
-        var2 = var1.readUnsignedByte();
-        if (var2 != 0) {
-            --var1.index;
-            this.aClass34_1585 = new Class34();
-            this.aClass34_1585.method1010(var1);
-            this.aClass34_1588 = new Class34();
-            this.aClass34_1588.method1010(var1);
-        }
-
-        for (int var3 = 0; var3 < 10; ++var3) {
-            int var4 = var1.getSmart();
-            if (var4 == 0) {
-                break;
-            }
-
-            this.anIntArray1596[var3] = var4;
-            this.anIntArray1605[var3] = var1.getSmart(-21208);
-            this.anIntArray1597[var3] = var1.getSmart();
-        }
-
-        this.anInt1590 = var1.getSmart();
-        this.anInt1604 = var1.getSmart();
-        this.anInt1586 = var1.readUnsignedShort();
-        this.anInt1593 = var1.readUnsignedShort();
-        this.aClass103_1606 = new Class103();
-        this.aClass34_1592 = new Class34();
-        this.aClass103_1606.method1620(var1, this.aClass34_1592);
-    }
-}
diff --git a/Client/src/main/java/org/runite/client/Class117.java b/Client/src/main/java/org/runite/client/Class117.java
index ac9f61ca0..e2255d8a7 100644
--- a/Client/src/main/java/org/runite/client/Class117.java
+++ b/Client/src/main/java/org/runite/client/Class117.java
@@ -44,11 +44,11 @@ public final class Class117 {
                 boolean var3 = 5 == Class143.gameStage || Class143.gameStage == 10 || Class143.gameStage == 28;
                 if (var3 == !var2) {
                     if (var2) {
-                        Class129.anInt1691 = KeyboardListener.loginThemeSongArchiveID;
-                        if (Unsorted.anInt120 == 0) {
+                        AudioHandler.currentTrack = KeyboardListener.loginThemeSongArchiveID;
+                        if (AudioHandler.musicVolume == 0) {
                             Unsorted.method882();
                         } else {
-                            Unsorted.method2099(KeyboardListener.loginThemeSongArchiveID, CacheIndex.musicIndex, 255);
+                            AudioHandler.method2099(KeyboardListener.loginThemeSongArchiveID, CacheIndex.musicIndex, 255);
                         }
 
                         Class58.aJs5Worker_917.sendLoginState(false);
diff --git a/Client/src/main/java/org/runite/client/Class129.java b/Client/src/main/java/org/runite/client/Class129.java
index e48912be7..5883e907d 100644
--- a/Client/src/main/java/org/runite/client/Class129.java
+++ b/Client/src/main/java/org/runite/client/Class129.java
@@ -5,7 +5,6 @@ import org.rs09.client.rendering.Toolkit;
 abstract class Class129 {
 
     static int[] anIntArray1690;
-    static int anInt1691 = -1;
     static int anInt1692 = 0;
     static int[] anIntArray1693 = new int[128];
     static int[] anIntArray1695;
diff --git a/Client/src/main/java/org/runite/client/Class135.java b/Client/src/main/java/org/runite/client/Class135.java
deleted file mode 100644
index 7a5a064c8..000000000
--- a/Client/src/main/java/org/runite/client/Class135.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.runite.client;
-
-final class Class135 {
-
-    private final Class116[] aClass116Array1768 = new Class116[10];
-    private int anInt1767;
-    private int anInt1769;
-
-
-    private Class135(DataBuffer var1) {
-        for (int var2 = 0; var2 < 10; ++var2) {
-            int var3 = var1.readUnsignedByte();
-            if (var3 != 0) {
-                --var1.index;
-                this.aClass116Array1768[var2] = new Class116();
-                this.aClass116Array1768[var2].method1718(var1);
-            }
-        }
-
-        this.anInt1769 = var1.readUnsignedShort();
-        this.anInt1767 = var1.readUnsignedShort();
-    }
-
-    static Class135 method1811(CacheIndex var0, int var1, int var2) {
-        byte[] var3 = var0.getFile(var1, var2);
-        return var3 == null ? null : new Class135(new DataBuffer(var3));
-    }
-
-    private byte[] method1810() {
-        int var1 = 0;
-
-        int var2;
-        for (var2 = 0; var2 < 10; ++var2) {
-            if (this.aClass116Array1768[var2] != null && this.aClass116Array1768[var2].anInt1586 + this.aClass116Array1768[var2].anInt1593 > var1) {
-                var1 = this.aClass116Array1768[var2].anInt1586 + this.aClass116Array1768[var2].anInt1593;
-            }
-        }
-
-        if (var1 == 0) {
-            return new byte[0];
-        } else {
-            var2 = 22050 * var1 / 1000;
-            byte[] var3 = new byte[var2];
-
-            for (int var4 = 0; var4 < 10; ++var4) {
-                if (this.aClass116Array1768[var4] != null) {
-                    int var5 = this.aClass116Array1768[var4].anInt1586 * 22050 / 1000;
-                    int var6 = this.aClass116Array1768[var4].anInt1593 * 22050 / 1000;
-                    int[] var7 = this.aClass116Array1768[var4].method1717(var5, this.aClass116Array1768[var4].anInt1586);
-
-                    for (int var8 = 0; var8 < var5; ++var8) {
-                        int var9 = var3[var8 + var6] + (var7[var8] >> 8);
-                        if ((var9 + 128 & -256) != 0) {
-                            var9 = var9 >> 31 ^ 127;
-                        }
-
-                        var3[var8 + var6] = (byte) var9;
-                    }
-                }
-            }
-
-            return var3;
-        }
-    }
-
-    final Class3_Sub12_Sub1 method1812() {
-        byte[] var1 = this.method1810();
-        return new Class3_Sub12_Sub1(var1, 22050 * this.anInt1769 / 1000, 22050 * this.anInt1767 / 1000);
-    }
-
-    final int method1813() {
-        int var1 = 9999999;
-
-        int var2;
-        for (var2 = 0; var2 < 10; ++var2) {
-            if (this.aClass116Array1768[var2] != null && this.aClass116Array1768[var2].anInt1593 / 20 < var1) {
-                var1 = this.aClass116Array1768[var2].anInt1593 / 20;
-            }
-        }
-
-        if (this.anInt1769 < this.anInt1767 && this.anInt1769 / 20 < var1) {
-            var1 = this.anInt1769 / 20;
-        }
-
-        if (var1 == 9999999 || var1 == 0) {
-            return 0;
-        } else {
-            for (var2 = 0; var2 < 10; ++var2) {
-                if (this.aClass116Array1768[var2] != null) {
-                    this.aClass116Array1768[var2].anInt1593 -= var1 * 20;
-                }
-            }
-
-            if (this.anInt1769 < this.anInt1767) {
-                this.anInt1769 -= var1 * 20;
-                this.anInt1767 -= var1 * 20;
-            }
-
-            return var1;
-        }
-    }
-
-}
diff --git a/Client/src/main/java/org/runite/client/Class140_Sub2.java b/Client/src/main/java/org/runite/client/Class140_Sub2.java
index 29f055425..30b913fdc 100644
--- a/Client/src/main/java/org/runite/client/Class140_Sub2.java
+++ b/Client/src/main/java/org/runite/client/Class140_Sub2.java
@@ -44,8 +44,8 @@ final class Class140_Sub2 extends GameObject {
              var0.anInt2806 = 1024;
           }
 
-          var0.anInt2819 += (-var0.anInt2819 + var3) / var2;
-          var0.anInt2829 += (var4 + -var0.anInt2829) / var2;
+          var0.xAxis += (-var0.xAxis + var3) / var2;
+          var0.zAxis += (var4 + -var0.zAxis) / var2;
           if(var0.anInt2840 == 1) {
              var0.anInt2806 = 1536;
           }
diff --git a/Client/src/main/java/org/runite/client/Class140_Sub4.java b/Client/src/main/java/org/runite/client/Class140_Sub4.java
index d877cab98..bc9510ef0 100644
--- a/Client/src/main/java/org/runite/client/Class140_Sub4.java
+++ b/Client/src/main/java/org/runite/client/Class140_Sub4.java
@@ -67,7 +67,7 @@ public abstract class Class140_Sub4 extends GameObject {
     int anInt2816 = 0;
     int anInt2817;
     int anInt2818;
-    public int anInt2819;
+    public int xAxis;
     int anInt2820 = -32768;
     int anInt2821 = 0;
     private int size = 1;
@@ -77,7 +77,7 @@ public abstract class Class140_Sub4 extends GameObject {
     int anInt2826 = -1;
     private int anInt2827 = 0;
     int anInt2828 = 0;
-    public int anInt2829;
+    public int zAxis;
     private int anInt2830 = 0;
     int anInt2831;
     int anInt2832 = 0;
@@ -141,8 +141,8 @@ public abstract class Class140_Sub4 extends GameObject {
             this.anIntArray2755[0] = var4;
             this.anInt2816 = 0;
             this.anInt2811 = 0;
-            this.anInt2829 = 64 * var2 + this.anIntArray2755[0] * 128;
-            this.anInt2819 = var2 * 64 + 128 * this.anIntArray2767[0];
+            this.zAxis = 64 * var2 + this.anIntArray2755[0] * 128;
+            this.xAxis = var2 * 64 + 128 * this.anIntArray2767[0];
 
             if (HDToolKit.highDetail && Class102.player == this) {
                 TextureOperation31.method236();
@@ -235,13 +235,13 @@ public abstract class Class140_Sub4 extends GameObject {
                 int var10 = -var6 / 2;
                 int var12 = -(var9 * var7) + var10 * var8 >> 16;
                 int var11 = var7 * var10 - -(var8 * var9) >> 16;
-                int var13 = Class121.method1736(WorldListCountry.localPlane, 1, var11 + this.anInt2819, this.anInt2829 + var12);
+                int var13 = Class121.method1736(WorldListCountry.localPlane, 1, var11 + this.xAxis, this.zAxis + var12);
                 int var14 = var5 / 2;
                 int var15 = -var6 / 2;
                 int var16 = var14 * var8 + var15 * var7 >> 16;
                 int var20 = var6 / 2;
                 int var17 = var15 * var8 + -(var14 * var7) >> 16;
-                int var18 = Class121.method1736(WorldListCountry.localPlane, 1, var16 + this.anInt2819, this.anInt2829 - -var17);
+                int var18 = Class121.method1736(WorldListCountry.localPlane, 1, var16 + this.xAxis, this.zAxis - -var17);
                 int var19 = -var5 / 2;
                 int var22 = -(var7 * var19) + var20 * var8 >> 16;
                 int var25 = var6 / 2;
@@ -249,9 +249,9 @@ public abstract class Class140_Sub4 extends GameObject {
                 int var21 = var7 * var20 - -(var8 * var19) >> 16;
                 int var27 = var25 * var8 - var7 * var24 >> 16;
                 int var26 = var7 * var25 + var8 * var24 >> 16;
-                int var23 = Class121.method1736(WorldListCountry.localPlane, 1, this.anInt2819 + var21, var22 + this.anInt2829);
+                int var23 = Class121.method1736(WorldListCountry.localPlane, 1, this.xAxis + var21, var22 + this.zAxis);
                 int var29 = var13 < var18 ? var13 : var18;
-                int var28 = Class121.method1736(WorldListCountry.localPlane, 1, var26 + this.anInt2819, var27 + this.anInt2829);
+                int var28 = Class121.method1736(WorldListCountry.localPlane, 1, var26 + this.xAxis, var27 + this.zAxis);
                 int var30 = var28 > var23 ? var23 : var28;
                 int var31 = var28 > var18 ? var18 : var28;
                 int var32 = var23 <= var13 ? var23 : var13;
diff --git a/Client/src/main/java/org/runite/client/Class155.java b/Client/src/main/java/org/runite/client/Class155.java
index e0062618d..3d41a18ac 100644
--- a/Client/src/main/java/org/runite/client/Class155.java
+++ b/Client/src/main/java/org/runite/client/Class155.java
@@ -99,7 +99,7 @@ class Class155 {
                         Class3_Sub24 var11 = this.aClass3_Sub24Array1980[var7];
 
                         while (var11 != null) {
-                            Class3_Sub12 var12 = var11.aClass3_Sub12_2544;
+                            Sound var12 = var11.aSound_2544;
                             if (var12 != null && var12.anInt2374 > var8) {
                                 var5 |= 1 << var7;
                                 var10 = var11;
diff --git a/Client/src/main/java/org/runite/client/Class164_Sub2.java b/Client/src/main/java/org/runite/client/Class164_Sub2.java
index 0aab7c30d..290706568 100644
--- a/Client/src/main/java/org/runite/client/Class164_Sub2.java
+++ b/Client/src/main/java/org/runite/client/Class164_Sub2.java
@@ -188,11 +188,11 @@ public class Class164_Sub2 extends Class164 {
                   }
 
                   if(var8 == 18) {
-                     var9 = (Class102.player.anInt2819 >> 7) - -Class131.anInt1716;
+                     var9 = (Class102.player.xAxis >> 7) - -Class131.anInt1716;
                   }
 
                   if(var8 == 19) {
-                     var9 = (Class102.player.anInt2829 >> 7) - -Texture.anInt1152;
+                     var9 = (Class102.player.zAxis >> 7) - -Texture.anInt1152;
                   }
 
                   if(var8 == 20) {
diff --git a/Client/src/main/java/org/runite/client/Class166.java b/Client/src/main/java/org/runite/client/Class166.java
index 1e35a5ad2..99ccd4325 100644
--- a/Client/src/main/java/org/runite/client/Class166.java
+++ b/Client/src/main/java/org/runite/client/Class166.java
@@ -3,7 +3,6 @@ package org.runite.client;
 final class Class166 {
 
     static Class3_Sub2[][][] aClass3_Sub2ArrayArrayArray2065;
-    static int[] anIntArray2068 = new int[50];
     static Class3_Sub28_Sub5[] aClass3_Sub28_Sub5Array2070 = new Class3_Sub28_Sub5[14];
     static AbstractSprite[] aAbstractSpriteArray2072;
     static int[] anIntArray2073 = new int[5];
diff --git a/Client/src/main/java/org/runite/client/Class167.java b/Client/src/main/java/org/runite/client/Class167.java
index e79644e50..f33bf8d27 100644
--- a/Client/src/main/java/org/runite/client/Class167.java
+++ b/Client/src/main/java/org/runite/client/Class167.java
@@ -46,9 +46,9 @@ public final class Class167 {
 
     public static void musicEffectHandler(int var1) {
         try {
-            if (Unsorted.anInt120 != 0 && var1 != -1) {
-                Class70.method1285(CacheIndex.music2Index, var1, Unsorted.anInt120);
-                Class83.aBoolean1158 = true;
+            if (AudioHandler.musicVolume != 0 && var1 != -1) {
+                Class70.method1285(CacheIndex.music2Index, var1, AudioHandler.musicVolume);
+                AudioHandler.musicEffectPlaying = true;
             }
         } catch (RuntimeException var4) {
             throw ClientErrorException.clientError(var4, "wj.D(" + ',' + var1 + ',' + (byte) -1 + ')');
@@ -171,8 +171,8 @@ public final class Class167 {
             Unsorted.method1250(62, false);
             System.gc();
             Unsorted.method882();
-            Class83.aBoolean1158 = false;
-            Class129.anInt1691 = -1;
+            AudioHandler.musicEffectPlaying = false;
+            AudioHandler.currentTrack = -1;
             Class164_Sub1.method2241((byte) -77, true);
             LinkableRSString.isDynamicSceneGraph = false;
             Texture.anInt1152 = 0;
diff --git a/Client/src/main/java/org/runite/client/Class168.java b/Client/src/main/java/org/runite/client/Class168.java
index 015c98304..5b03cff4f 100644
--- a/Client/src/main/java/org/runite/client/Class168.java
+++ b/Client/src/main/java/org/runite/client/Class168.java
@@ -27,8 +27,8 @@ final class Class168 {
                 int var5 = var0.anInt2835 * 128 - -(var0.getSize() * 64);
                 int var6 = 128 * var0.anInt2823 + var0.getSize() * 64;
                 int var7 = 128 * var0.anInt2798 + var0.getSize() * 64;
-                var0.anInt2819 = (var3 * var6 + var4 * (var2 - var3)) / var2;
-                var0.anInt2829 = (var7 * var3 + var5 * (var2 - var3)) / var2;
+                var0.xAxis = (var3 * var6 + var4 * (var2 - var3)) / var2;
+                var0.zAxis = (var7 * var3 + var5 * (var2 - var3)) / var2;
             }
 
             var0.anInt2824 = 0;
diff --git a/Client/src/main/java/org/runite/client/Class17.java b/Client/src/main/java/org/runite/client/Class17.java
index e9e893206..fc893119b 100644
--- a/Client/src/main/java/org/runite/client/Class17.java
+++ b/Client/src/main/java/org/runite/client/Class17.java
@@ -15,8 +15,8 @@ final class Class17 {
                 if (var1.anInt2772 != -1 && 32768 > var1.anInt2772) {
                     NPC var3 = NPC.npcs[var1.anInt2772];
                     if (var3 != null) {
-                        var5 = -var3.anInt2829 + var1.anInt2829;
-                        var4 = -var3.anInt2819 + var1.anInt2819;
+                        var5 = -var3.zAxis + var1.zAxis;
+                        var4 = -var3.xAxis + var1.xAxis;
                         if (0 != var4 || 0 != var5) {
                             var1.anInt2806 = (int) (Math.atan2(var4, var5) * 325.949D) & 0x7FF;
                         }
@@ -33,8 +33,8 @@ final class Class17 {
 
                     Player var10 = Unsorted.players[var9];
                     if (null != var10) {
-                        var6 = -var10.anInt2829 + var1.anInt2829;
-                        var5 = -var10.anInt2819 + var1.anInt2819;
+                        var6 = -var10.zAxis + var1.zAxis;
+                        var5 = -var10.xAxis + var1.xAxis;
                         if (var5 != 0 || var6 != 0) {
                             var1.anInt2806 = (int) (Math.atan2(var5, var6) * 325.949D) & 0x7FF;
                         }
@@ -42,8 +42,8 @@ final class Class17 {
                 }
 
                 if ((0 != var1.anInt2786 || 0 != var1.anInt2762) && (var1.anInt2816 == 0 || var1.anInt2824 > 0)) {
-                    var9 = var1.anInt2819 + -((-Class131.anInt1716 + (var1.anInt2786 - Class131.anInt1716)) * 64);
-                    var4 = -((-Texture.anInt1152 + (var1.anInt2762 - Texture.anInt1152)) * 64) + var1.anInt2829;
+                    var9 = var1.xAxis + -((-Class131.anInt1716 + (var1.anInt2786 - Class131.anInt1716)) * 64);
+                    var4 = -((-Texture.anInt1152 + (var1.anInt2762 - Texture.anInt1152)) * 64) + var1.zAxis;
                     if (var9 != 0 || var4 != 0) {
                         var1.anInt2806 = (int) (Math.atan2(var9, var4) * 325.949D) & 0x7FF;
                     }
diff --git a/Client/src/main/java/org/runite/client/Class23.java b/Client/src/main/java/org/runite/client/Class23.java
index d84feb183..baf8e1d95 100644
--- a/Client/src/main/java/org/runite/client/Class23.java
+++ b/Client/src/main/java/org/runite/client/Class23.java
@@ -40,8 +40,8 @@ public final class Class23 {
             var1.writeByte(Class3_Sub28_Sub9.anInt3622);
             var1.writeByte(!TextureOperation17.aBoolean3184 ? 0 : 1);
             var1.writeByte(AudioHandler.soundEffectVolume);
-            var1.writeByte(Unsorted.anInt120);
-            var1.writeByte(Sprites.anInt340);
+            var1.writeByte(AudioHandler.musicVolume);
+            var1.writeByte(Sprites.ambientVolume);
             var1.writeShort(TextureOperation.anInt2378);
             var1.writeShort(Unsorted.anInt3071);
             var1.writeByte(Class127_Sub1.method1757());
diff --git a/Client/src/main/java/org/runite/client/Class27.java b/Client/src/main/java/org/runite/client/Class27.java
index 9050b7438..8ee2b12e0 100644
--- a/Client/src/main/java/org/runite/client/Class27.java
+++ b/Client/src/main/java/org/runite/client/Class27.java
@@ -10,7 +10,7 @@ final class Class27 {
     static int anInt515 = -1;
     static int anInt517 = 0;
     static Class3_Sub28_Sub16_Sub2 aClass3_Sub28_Sub16_Sub2_518;
-    static Class157 aClass157_524;
+    static Class157 resampler;
 
     static RSInterface aClass11_526 = null;
 
diff --git a/Client/src/main/java/org/runite/client/Class34.java b/Client/src/main/java/org/runite/client/Class34.java
deleted file mode 100644
index f4485c99b..000000000
--- a/Client/src/main/java/org/runite/client/Class34.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.runite.client;
-
-final class Class34 {
-
-    int anInt601;
-    int anInt603;
-    int anInt605;
-    private int anInt600 = 2;
-    private int[] anIntArray602 = new int[2];
-    private int[] anIntArray604 = new int[2];
-    private int anInt606;
-    private int anInt607;
-    private int anInt608;
-    private int anInt609;
-    private int anInt610;
-
-
-    public Class34() {
-        this.anIntArray604[1] = 65535;
-        this.anIntArray602[1] = 65535;
-    }
-
-    final int method1007(int var1) {
-        if (this.anInt610 >= this.anInt609) {
-            this.anInt607 = this.anIntArray602[this.anInt606++] << 15;
-            if (this.anInt606 >= this.anInt600) {
-                this.anInt606 = this.anInt600 - 1;
-            }
-
-            this.anInt609 = (int) ((double) this.anIntArray604[this.anInt606] / 65536.0D * (double) var1);
-            if (this.anInt609 > this.anInt610) {
-                this.anInt608 = ((this.anIntArray602[this.anInt606] << 15) - this.anInt607) / (this.anInt609 - this.anInt610);
-            }
-        }
-
-        this.anInt607 += this.anInt608;
-        ++this.anInt610;
-        return this.anInt607 - this.anInt608 >> 15;
-    }
-
-    final void method1008() {
-        this.anInt609 = 0;
-        this.anInt606 = 0;
-        this.anInt608 = 0;
-        this.anInt607 = 0;
-        this.anInt610 = 0;
-    }
-
-    final void method1009(DataBuffer var1) {
-        this.anInt600 = var1.readUnsignedByte();
-        this.anIntArray604 = new int[this.anInt600];
-        this.anIntArray602 = new int[this.anInt600];
-
-        for (int var2 = 0; var2 < this.anInt600; ++var2) {
-            this.anIntArray604[var2] = var1.readUnsignedShort();
-            this.anIntArray602[var2] = var1.readUnsignedShort();
-        }
-
-    }
-
-    final void method1010(DataBuffer var1) {
-        this.anInt601 = var1.readUnsignedByte();
-        this.anInt603 = var1.readInt();
-        this.anInt605 = var1.readInt();
-        this.method1009(var1);
-    }
-}
diff --git a/Client/src/main/java/org/runite/client/Class38.java b/Client/src/main/java/org/runite/client/Class38.java
index 49bd2d767..9a9e2b9ab 100644
--- a/Client/src/main/java/org/runite/client/Class38.java
+++ b/Client/src/main/java/org/runite/client/Class38.java
@@ -9,27 +9,6 @@ class Class38 {
     static Signlink gameSignlink;
     static Class146 aClass146_668;
 
-    static void method1028() {
-        try {
-            for (int var1 = -1; Class159.localPlayerCount > var1; ++var1) {
-                int var2;
-                if (var1 == -1) {
-                    var2 = 2047;
-                } else {
-                    var2 = Class56.localPlayerIndexes[var1];
-                }
-
-                Player var3 = Unsorted.players[var2];
-                if (var3 != null) {
-                    Unsorted.method68(var3.getSize(), var3);
-                }
-            }
-
-        } catch (RuntimeException var4) {
-            throw ClientErrorException.clientError(var4, "fk.G(" + -102 + ')');
-        }
-    }
-
     static void method1029() {
         try {
             TextureOperation12.outgoingBuffer.putOpcode(177);
diff --git a/Client/src/main/java/org/runite/client/Class39.java b/Client/src/main/java/org/runite/client/Class39.java
index 2f511d340..c6eebb894 100644
--- a/Client/src/main/java/org/runite/client/Class39.java
+++ b/Client/src/main/java/org/runite/client/Class39.java
@@ -557,12 +557,12 @@ public final class Class39 {
                             var7 = 7 & var5;
                             if (var2 >= 0 && var3 >= 0 && var2 < 104 && var3 < 104) {
                                 var28 = 1 + var6;
-                                if (var2 + -var28 <= Class102.player.anIntArray2767[0] && Class102.player.anIntArray2767[0] <= var28 + var2 && Class102.player.anIntArray2755[0] >= -var28 + var3 && Class102.player.anIntArray2755[0] <= var28 + var3 && 0 != Sprites.anInt340 && var7 > 0 && 50 > AudioHandler.currentSoundEffectCount && var4 != -1) {
-                                    Class3_Sub25.anIntArray2550[AudioHandler.currentSoundEffectCount] = var4;
-                                    Class166.anIntArray2068[AudioHandler.currentSoundEffectCount] = var7;
-                                    Unsorted.anIntArray2157[AudioHandler.currentSoundEffectCount] = var8;
-                                    Class102.aClass135Array2131[AudioHandler.currentSoundEffectCount] = null;
-                                    Class3_Sub8.anIntArray3083[AudioHandler.currentSoundEffectCount] = var6 + ((var2 << 16) - -(var3 << 8));
+                                if (var2 + -var28 <= Class102.player.anIntArray2767[0] && Class102.player.anIntArray2767[0] <= var28 + var2 && Class102.player.anIntArray2755[0] >= -var28 + var3 && Class102.player.anIntArray2755[0] <= var28 + var3 && 0 != Sprites.ambientVolume && var7 > 0 && 50 > AudioHandler.currentSoundEffectCount && var4 != -1) {
+                                    AudioHandler.soundEffectIDs[AudioHandler.currentSoundEffectCount] = var4;
+                                    AudioHandler.soundEffectVolumeArray[AudioHandler.currentSoundEffectCount] = var7;
+                                    AudioHandler.anIntArray2157[AudioHandler.currentSoundEffectCount] = var8;
+                                    AudioHandler.soundEffects[AudioHandler.currentSoundEffectCount] = null;
+                                    AudioHandler.soundEffectCoordinates[AudioHandler.currentSoundEffectCount] = var6 + ((var2 << 16) - -(var3 << 8));
                                     ++AudioHandler.currentSoundEffectCount;
                                 }
                             }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub14.java b/Client/src/main/java/org/runite/client/Class3_Sub14.java
index c782ce472..c006505b0 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub14.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub14.java
@@ -51,7 +51,7 @@ final class Class3_Sub14 extends Linkable {
       return (float)((double)var1 * Math.pow(2.0D, var3 - 788));
    }
 
-   final Class3_Sub12_Sub1 method359(int[] var1) {
+   final PcmSound method359(int[] var1) {
       if(var1 != null && var1[0] <= 0) {
          return null;
       } else {
@@ -96,7 +96,7 @@ final class Class3_Sub14 extends Linkable {
          this.aFloatArray2394 = null;
          byte[] var7 = this.aByteArray2415;
          this.aByteArray2415 = null;
-         return new Class3_Sub12_Sub1(this.anInt2408, var7, this.anInt2397, this.anInt2401, this.aBoolean2395);
+         return new PcmSound(this.anInt2408, var7, this.anInt2397, this.anInt2401, this.aBoolean2395);
       }
    }
 
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub15.java b/Client/src/main/java/org/runite/client/Class3_Sub15.java
index ffdd2041f..e561d1db1 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub15.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub15.java
@@ -16,7 +16,7 @@ public final class Class3_Sub15 extends Linkable {
     static ReferenceCache aReferenceCache_2428 = new ReferenceCache(50);
     public static Connection activeConnection;
     byte[] aByteArray2430;
-    Class3_Sub12_Sub1[] aClass3_Sub12_Sub1Array2431;
+    PcmSound[] aPcmSoundArray2431;
     static boolean aBoolean2433 = false;
     short[] aShortArray2434;
     Class166[] aClass166Array2435;
@@ -57,7 +57,7 @@ public final class Class3_Sub15 extends Linkable {
     final boolean method373(int[] var2, Class83 var3, byte[] var4) {
         try {
             int var6 = 0;
-            Class3_Sub12_Sub1 var7 = null;
+            PcmSound var7 = null;
             boolean var5 = true;
 
             for (int var8 = 0; var8 < 128; ++var8) {
@@ -78,7 +78,7 @@ public final class Class3_Sub15 extends Linkable {
                         }
 
                         if (null != var7) {
-                            this.aClass3_Sub12_Sub1Array2431[var8] = var7;
+                            this.aPcmSoundArray2431[var8] = var7;
                             this.anIntArray2423[var8] = 0;
                         }
                     }
@@ -150,7 +150,7 @@ public final class Class3_Sub15 extends Linkable {
         try {
             this.aShortArray2434 = new short[128];
             this.aByteArray2430 = new byte[128];
-            this.aClass3_Sub12_Sub1Array2431 = new Class3_Sub12_Sub1[128];
+            this.aPcmSoundArray2431 = new PcmSound[128];
             this.aByteArray2422 = new byte[128];
             this.aClass166Array2435 = new Class166[128];
             this.anIntArray2423 = new int[128];
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub22.java b/Client/src/main/java/org/runite/client/Class3_Sub22.java
index 14ed2d2ca..7828366fa 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub22.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub22.java
@@ -19,7 +19,7 @@ final class Class3_Sub22 extends Linkable {
    int anInt2506;
    Class3_Sub24_Sub1 aClass3_Sub24_Sub1_2507;
    int anInt2508;
-   Class3_Sub12_Sub1 aClass3_Sub12_Sub1_2509;
+   PcmSound aPcmSound_2509;
    int anInt2510;
    int anInt2511;
    int anInt2512;
@@ -151,7 +151,7 @@ final class Class3_Sub22 extends Linkable {
    final void method401() {
       try {
          this.aClass166_2504 = null;
-         this.aClass3_Sub12_Sub1_2509 = null;
+         this.aPcmSound_2509 = null;
          this.aClass3_Sub24_Sub1_2507 = null;
          this.aClass3_Sub15_2527 = null;
 
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24.java b/Client/src/main/java/org/runite/client/Class3_Sub24.java
index ec287d1b4..b1bc8d500 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub24.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub24.java
@@ -5,7 +5,7 @@ import org.rs09.client.Linkable;
 abstract class Class3_Sub24 extends Linkable {
 
    int anInt2543;
-   Class3_Sub12 aClass3_Sub12_2544;
+   Sound aSound_2544;
    volatile boolean aBoolean2545 = true;
    Class3_Sub24 aClass3_Sub24_2546;
 
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub1.java
index abaff6d23..095540687 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub1.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub1.java
@@ -23,7 +23,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
       if(this.anInt3471 == 0 && this.anInt3480 == 0) {
          this.method415(var3);
       } else {
-         Class3_Sub12_Sub1 var4 = (Class3_Sub12_Sub1)this.aClass3_Sub12_2544;
+         PcmSound var4 = (PcmSound)this.aSound_2544;
          int var5 = this.anInt3473 << 8;
          int var6 = this.anInt3482 << 8;
          int var7 = var4.aByteArray3030.length << 8;
@@ -319,14 +319,14 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
             this.anInt3480 += var2;
             if(this.anInt3470 == 256 && (this.anInt3474 & 0xFF) == 0) {
                if(Unsorted.aBoolean2150) {
-                  var2 = method426(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this);
+                  var2 = method426(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this);
                } else {
-                  var2 = method428(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, this.anInt3472, var6, var3, this);
+                  var2 = method428(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, this.anInt3472, var6, var3, this);
                }
             } else if(Unsorted.aBoolean2150) {
-               var2 = method421(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this, this.anInt3470, var5);
+               var2 = method421(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this, this.anInt3470, var5);
             } else {
-               var2 = method422(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, this.anInt3472, var6, var3, this, this.anInt3470, var5);
+               var2 = method422(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, this.anInt3472, var6, var3, this, this.anInt3470, var5);
             }
 
             this.anInt3480 -= var2;
@@ -343,17 +343,17 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
 
          if(this.anInt3470 == 256 && (this.anInt3474 & 0xFF) == 0) {
             if(Unsorted.aBoolean2150) {
-               return method420(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this);
+               return method420(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this);
             }
 
-            return method424(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, var4, var3, this);
+            return method424(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, var4, var3, this);
          }
 
          if(Unsorted.aBoolean2150) {
-            return method433(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this, this.anInt3470, var5);
+            return method433(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this, this.anInt3470, var5);
          }
 
-         return method455(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, var4, var3, this, this.anInt3470, var5);
+         return method455(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, var4, var3, this, this.anInt3470, var5);
       }
    }
 
@@ -365,9 +365,9 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
       int var1 = this.anInt3476 * 3 >> 6;
       var1 = (var1 ^ var1 >> 31) + (var1 >>> 31);
       if(this.anInt3479 == 0) {
-         var1 -= var1 * this.anInt3474 / (((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030.length << 8);
+         var1 -= var1 * this.anInt3474 / (((PcmSound)this.aSound_2544).aByteArray3030.length << 8);
       } else if(this.anInt3479 >= 0) {
-         var1 -= var1 * this.anInt3473 / ((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030.length;
+         var1 -= var1 * this.anInt3473 / ((PcmSound)this.aSound_2544).aByteArray3030.length;
       }
 
       return var1 > 255?255:var1;
@@ -733,7 +733,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
          }
       }
 
-      Class3_Sub12_Sub1 var2 = (Class3_Sub12_Sub1)this.aClass3_Sub12_2544;
+      PcmSound var2 = (PcmSound)this.aSound_2544;
       int var3 = this.anInt3473 << 8;
       int var4 = this.anInt3482 << 8;
       int var5 = var2.aByteArray3030.length << 8;
@@ -897,7 +897,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
       this.method450(var1, var2, this.method451());
    }
 
-   static Class3_Sub24_Sub1 method432(Class3_Sub12_Sub1 var0, int var1, int var2, int var3) {
+   static Class3_Sub24_Sub1 method432(PcmSound var0, int var1, int var2, int var3) {
       return var0.aByteArray3030 != null && var0.aByteArray3030.length != 0?new Class3_Sub24_Sub1(var0, var1, var2, var3):null;
    }
 
@@ -947,7 +947,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
    }
 
    final synchronized void method434(int var1) {
-      int var2 = ((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030.length << 8;
+      int var2 = ((PcmSound)this.aSound_2544).aByteArray3030.length << 8;
       if(var1 < -1) {
          var1 = -1;
       }
@@ -1033,14 +1033,14 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
             this.anInt3480 += var2;
             if(this.anInt3470 == -256 && (this.anInt3474 & 0xFF) == 0) {
                if(Unsorted.aBoolean2150) {
-                  var2 = method435(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this);
+                  var2 = method435(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this);
                } else {
-                  var2 = method427(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, this.anInt3472, var6, var3, this);
+                  var2 = method427(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, this.anInt3472, var6, var3, this);
                }
             } else if(Unsorted.aBoolean2150) {
-               var2 = method440(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this, this.anInt3470, var5);
+               var2 = method440(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, this.anInt3475, this.anInt3483, var6, var3, this, this.anInt3470, var5);
             } else {
-               var2 = method448(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, this.anInt3472, var6, var3, this, this.anInt3470, var5);
+               var2 = method448(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, this.anInt3472, var6, var3, this, this.anInt3470, var5);
             }
 
             this.anInt3480 -= var2;
@@ -1057,21 +1057,21 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
 
          if(this.anInt3470 == -256 && (this.anInt3474 & 0xFF) == 0) {
             if(Unsorted.aBoolean2150) {
-               return method447(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this);
+               return method447(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this);
             }
 
-            return method446(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, var4, var3, this);
+            return method446(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, var4, var3, this);
          }
 
          if(Unsorted.aBoolean2150) {
-            return method453(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this, this.anInt3470, var5);
+            return method453(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3484, this.anInt3481, var4, var3, this, this.anInt3470, var5);
          }
 
-         return method423(((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, var4, var3, this, this.anInt3470, var5);
+         return method423(((PcmSound)this.aSound_2544).aByteArray3030, var1, this.anInt3474, var2, this.anInt3476, var4, var3, this, this.anInt3470, var5);
       }
    }
 
-   static Class3_Sub24_Sub1 method437(Class3_Sub12_Sub1 var0, int var2) {
+   static Class3_Sub24_Sub1 method437(PcmSound var0, int var2) {
       return var0.aByteArray3030 != null && var0.aByteArray3030.length != 0?new Class3_Sub24_Sub1(var0, (int)((long)var0.anInt3034 * 256L * (long) 100 / (long)(100 * Class21.anInt443)), var2 << 6):null;
    }
 
@@ -1162,7 +1162,7 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
    }
 
    final boolean method444() {
-      return this.anInt3474 < 0 || this.anInt3474 >= ((Class3_Sub12_Sub1)this.aClass3_Sub12_2544).aByteArray3030.length << 8;
+      return this.anInt3474 < 0 || this.anInt3474 >= ((PcmSound)this.aSound_2544).aByteArray3030.length << 8;
    }
 
    final boolean method445() {
@@ -1378,8 +1378,8 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
       return var5 >> 1;
    }
 
-   private Class3_Sub24_Sub1(Class3_Sub12_Sub1 var1, int var2, int var3) {
-      this.aClass3_Sub12_2544 = var1;
+   private Class3_Sub24_Sub1(PcmSound var1, int var2, int var3) {
+      this.aSound_2544 = var1;
       this.anInt3473 = var1.anInt3033;
       this.anInt3482 = var1.anInt3032;
       this.aBoolean3477 = var1.aBoolean3031;
@@ -1398,8 +1398,8 @@ final class Class3_Sub24_Sub1 extends Class3_Sub24 {
       return var1 < 0?-var0:(int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D);
    }
 
-   private Class3_Sub24_Sub1(Class3_Sub12_Sub1 var1, int var2, int var3, int var4) {
-      this.aClass3_Sub12_2544 = var1;
+   private Class3_Sub24_Sub1(PcmSound var1, int var2, int var3, int var4) {
+      this.aSound_2544 = var1;
       this.anInt3473 = var1.anInt3033;
       this.anInt3482 = var1.anInt3032;
       this.aBoolean3477 = var1.aBoolean3031;
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java
index 2db33ad29..6be3790c8 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java
@@ -45,9 +45,9 @@ final class Class3_Sub24_Sub3 extends Class3_Sub24 {
             var1.anInt2516 = 1048575 & var4 * var3 + var1.anInt2516;
             if(var5 <= var3) {
                if(0 == this.aClass3_Sub24_Sub4_3493.anIntArray3519[var1.anInt2514]) {
-                  var1.aClass3_Sub24_Sub1_2507 = Class3_Sub24_Sub1.method432(var1.aClass3_Sub12_Sub1_2509, var1.aClass3_Sub24_Sub1_2507.method438(), var1.aClass3_Sub24_Sub1_2507.method425(), var1.aClass3_Sub24_Sub1_2507.method451());
+                  var1.aClass3_Sub24_Sub1_2507 = Class3_Sub24_Sub1.method432(var1.aPcmSound_2509, var1.aClass3_Sub24_Sub1_2507.method438(), var1.aClass3_Sub24_Sub1_2507.method425(), var1.aClass3_Sub24_Sub1_2507.method451());
                } else {
-                  var1.aClass3_Sub24_Sub1_2507 = Class3_Sub24_Sub1.method432(var1.aClass3_Sub12_Sub1_2509, var1.aClass3_Sub24_Sub1_2507.method438(), 0, var1.aClass3_Sub24_Sub1_2507.method451());
+                  var1.aClass3_Sub24_Sub1_2507 = Class3_Sub24_Sub1.method432(var1.aPcmSound_2509, var1.aClass3_Sub24_Sub1_2507.method438(), 0, var1.aClass3_Sub24_Sub1_2507.method451());
                   this.aClass3_Sub24_Sub4_3493.method501(var1, var1.aClass3_Sub15_2527.aShortArray2434[var1.anInt2520] < 0, (byte)-101);
                }
 
@@ -190,9 +190,9 @@ final class Class3_Sub24_Sub3 extends Class3_Sub24 {
 
                var2.anInt2516 += var7 * var8 + -1048576;
                if(this.aClass3_Sub24_Sub4_3493.anIntArray3519[var2.anInt2514] == 0) {
-                  var2.aClass3_Sub24_Sub1_2507 = Class3_Sub24_Sub1.method432(var2.aClass3_Sub12_Sub1_2509, var11.method438(), var11.method425(), var11.method451());
+                  var2.aClass3_Sub24_Sub1_2507 = Class3_Sub24_Sub1.method432(var2.aPcmSound_2509, var11.method438(), var11.method425(), var11.method451());
                } else {
-                  var2.aClass3_Sub24_Sub1_2507 = Class3_Sub24_Sub1.method432(var2.aClass3_Sub12_Sub1_2509, var11.method438(), 0, var11.method451());
+                  var2.aClass3_Sub24_Sub1_2507 = Class3_Sub24_Sub1.method432(var2.aPcmSound_2509, var11.method438(), 0, var11.method451());
                   this.aClass3_Sub24_Sub4_3493.method501(var2, var2.aClass3_Sub15_2527.aShortArray2434[var2.anInt2520] < 0, (byte)-88);
                   var2.aClass3_Sub24_Sub1_2507.method431(var9, var11.method425());
                }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java
index 389d83bd6..263088a0b 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java
@@ -501,10 +501,10 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 {
 
          Class3_Sub15 var11 = (Class3_Sub15)this.aHashTable_3508.get(this.anIntArray3515[var2]);
          if(var11 != null) {
-            Class3_Sub12_Sub1 var12 = var11.aClass3_Sub12_Sub1Array2431[var4];
+            PcmSound var12 = var11.aPcmSoundArray2431[var4];
             if(var12 != null) {
                Class3_Sub22 var7 = new Class3_Sub22();
-               var7.aClass3_Sub12_Sub1_2509 = var12;
+               var7.aPcmSound_2509 = var12;
                var7.aClass3_Sub15_2527 = var11;
                var7.anInt2514 = var2;
                var7.aClass166_2504 = var11.aClass166Array2435[var4];
@@ -1089,7 +1089,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 {
             var3 += (int)((double)var5 * var7);
          }
 
-         var5 = (int)(0.5D + (double)(256 * var2.aClass3_Sub12_Sub1_2509.anInt3034) * Math.pow(2.0D, (double)var3 * 3.255208333333333E-4D) / (double)Class21.anInt443);
+         var5 = (int)(0.5D + (double)(256 * var2.aPcmSound_2509.anInt3034) * Math.pow(2.0D, (double)var3 * 3.255208333333333E-4D) / (double)Class21.anInt443);
 
          return var5 >= 1?var5:1;
       } catch (RuntimeException var9) {
@@ -1133,10 +1133,10 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 {
 
    final void method501(Class3_Sub22 var1, boolean var2, byte var3) {
       try {
-         int var4 = var1.aClass3_Sub12_Sub1_2509.aByteArray3030.length;
+         int var4 = var1.aPcmSound_2509.aByteArray3030.length;
          int var5;
-         if(var2 && var1.aClass3_Sub12_Sub1_2509.aBoolean3031) {
-            int var6 = var4 + (var4 - var1.aClass3_Sub12_Sub1_2509.anInt3033);
+         if(var2 && var1.aPcmSound_2509.aBoolean3031) {
+            int var6 = var4 + (var4 - var1.aPcmSound_2509.anInt3033);
             var4 <<= 8;
             var5 = (int)((long)var6 * (long)this.anIntArray3519[var1.anInt2514] >> 6);
             if(var4 <= var5) {
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub25.java b/Client/src/main/java/org/runite/client/Class3_Sub25.java
index 6af82808e..609fccb7c 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub25.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub25.java
@@ -7,7 +7,6 @@ final class Class3_Sub25 extends Linkable {
 
    int[] anIntArray2547 = new int[]{-1};
    static short[] aShortArray2548;
-   static int[] anIntArray2550 = new int[50];
    int[] anIntArray2551 = new int[]{0};
    static Class129 aClass129_2552;
 
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub20.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub20.java
index 42819fb8f..89fa25610 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub20.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub20.java
@@ -310,12 +310,12 @@ final class Class3_Sub28_Sub20 extends Node {
                }
 
                if(1 == Class133.anInt1753) {
-                  if((4 & Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][Class102.player.anInt2819 >> 7][Class102.player.anInt2829 >> 7]) != 0) {
-                     Class140_Sub7.method2031((byte)-85, false, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7, Class75_Sub2.aClass3_Sub2ArrayArrayArray2638, 0);
+                  if((4 & Unsorted.aByteArrayArrayArray113[WorldListCountry.localPlane][Class102.player.xAxis >> 7][Class102.player.zAxis >> 7]) != 0) {
+                     Class140_Sub7.method2031((byte)-85, false, Class102.player.xAxis >> 7, Class102.player.zAxis >> 7, Class75_Sub2.aClass3_Sub2ArrayArrayArray2638, 0);
                   }
 
                   if(Class139.anInt1823 < 310) {
-                     int var7 = Class102.player.anInt2829 >> 7;
+                     int var7 = Class102.player.zAxis >> 7;
                      var5 = Class77.anInt1111 >> 7;
                      int var9;
                      if(var5 < var7) {
@@ -325,7 +325,7 @@ final class Class3_Sub28_Sub20 extends Node {
                      }
 
                      var4 = NPC.anInt3995 >> 7;
-                     int var6 = Class102.player.anInt2819 >> 7;
+                     int var6 = Class102.player.xAxis >> 7;
                      int var8;
                      if(var4 < var6) {
                         var8 = -var4 + var6;
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub5.java b/Client/src/main/java/org/runite/client/Class3_Sub5.java
index bbd094c1a..137dbc9b7 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub5.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub5.java
@@ -203,7 +203,7 @@ final class Class3_Sub5 extends Linkable {
     static void method116(boolean var0) {
         try {
             int var2 = Class159.localPlayerCount;
-            if (Class65.anInt987 == Class102.player.anInt2819 >> 7 && Class45.anInt733 == Class102.player.anInt2829 >> 7) {
+            if (Class65.anInt987 == Class102.player.xAxis >> 7 && Class45.anInt733 == Class102.player.zAxis >> 7) {
                 Class65.anInt987 = 0;
             }
 
@@ -229,16 +229,16 @@ final class Class3_Sub5 extends Linkable {
                     int var5 = var4.getSize();
                     int var6;
                     if (var5 == 1) {
-                        if ((127 & var4.anInt2819) == 64 && 64 == (127 & var4.anInt2829)) {
-                            var6 = var4.anInt2819 >> 7;
-                            var7 = var4.anInt2829 >> 7;
+                        if ((127 & var4.xAxis) == 64 && 64 == (127 & var4.zAxis)) {
+                            var6 = var4.xAxis >> 7;
+                            var7 = var4.zAxis >> 7;
                             if (var6 >= 0 && var6 < 104 && var7 >= 0 && var7 < 104) {
                                 ++Class163_Sub1_Sub1.anIntArrayArray4010[var6][var7];
                             }
                         }
-                    } else if (((1 & var5) != 0 || (var4.anInt2819 & 127) == 0 && (127 & var4.anInt2829) == 0) && ((1 & var5) != 1 || (var4.anInt2819 & 127) == 64 && (127 & var4.anInt2829) == 64)) {
-                        var6 = var4.anInt2819 + -(var5 * 64) >> 7;
-                        var7 = var4.anInt2829 + -(var5 * 64) >> 7;
+                    } else if (((1 & var5) != 0 || (var4.xAxis & 127) == 0 && (127 & var4.zAxis) == 0) && ((1 & var5) != 1 || (var4.xAxis & 127) == 64 && (127 & var4.zAxis) == 64)) {
+                        var6 = var4.xAxis + -(var5 * 64) >> 7;
+                        var7 = var4.zAxis + -(var5 * 64) >> 7;
                         var8 = var4.getSize() + var6;
                         if (104 < var8) {
                             var8 = 104;
@@ -282,9 +282,9 @@ final class Class3_Sub5 extends Linkable {
 
                     var7 = var4.getSize();
                     if (var7 == 1) {
-                        if (64 == (127 & var4.anInt2819) && (127 & var4.anInt2829) == 64) {
-                            var8 = var4.anInt2819 >> 7;
-                            var9 = var4.anInt2829 >> 7;
+                        if (64 == (127 & var4.xAxis) && (127 & var4.zAxis) == 64) {
+                            var8 = var4.xAxis >> 7;
+                            var9 = var4.zAxis >> 7;
                             if (var8 < 0 || var8 >= 104 || var9 < 0 || 104 <= var9) {
                                 continue;
                             }
@@ -294,10 +294,10 @@ final class Class3_Sub5 extends Linkable {
                                 continue;
                             }
                         }
-                    } else if ((1 & var7) == 0 && (127 & var4.anInt2819) == 0 && (var4.anInt2829 & 127) == 0 || 1 == (1 & var7) && (127 & var4.anInt2819) == 64 && (var4.anInt2829 & 127) == 0) {
-                        var8 = var4.anInt2819 + -(64 * var7) >> 7;
+                    } else if ((1 & var7) == 0 && (127 & var4.xAxis) == 0 && (var4.zAxis & 127) == 0 || 1 == (1 & var7) && (127 & var4.xAxis) == 64 && (var4.zAxis & 127) == 0) {
+                        var8 = var4.xAxis + -(64 * var7) >> 7;
                         var10 = var7 + var8;
-                        var9 = -(var7 * 64) + var4.anInt2829 >> 7;
+                        var9 = -(var7 * 64) + var4.zAxis >> 7;
                         if (var10 > 104) {
                             var10 = 104;
                         }
@@ -346,11 +346,11 @@ final class Class3_Sub5 extends Linkable {
 
                     if (null != var4.anObject2796 && var4.anInt2797 <= Class44.anInt719 && Class44.anInt719 < var4.anInt2778) {
                         var4.aBoolean3968 = false;
-                        var4.anInt2831 = Class121.method1736(WorldListCountry.localPlane, 1, var4.anInt2819, var4.anInt2829);
-                        TextureOperation28.method292(WorldListCountry.localPlane, var4.anInt2819, var4.anInt2829, var4.anInt2831, var4, var4.anInt2785, var16, var4.anInt2788, var4.anInt2777, var4.anInt2818, var4.anInt2817);
+                        var4.anInt2831 = Class121.method1736(WorldListCountry.localPlane, 1, var4.xAxis, var4.zAxis);
+                        TextureOperation28.method292(WorldListCountry.localPlane, var4.xAxis, var4.zAxis, var4.anInt2831, var4, var4.anInt2785, var16, var4.anInt2788, var4.anInt2777, var4.anInt2818, var4.anInt2817);
                     } else {
-                        var4.anInt2831 = Class121.method1736(WorldListCountry.localPlane, 1, var4.anInt2819, var4.anInt2829);
-                        Class20.method907(WorldListCountry.localPlane, var4.anInt2819, var4.anInt2829, var4.anInt2831, 64 * (var7 - 1) + 60, var4, var4.anInt2785, var16, var4.aBoolean2810);
+                        var4.anInt2831 = Class121.method1736(WorldListCountry.localPlane, 1, var4.xAxis, var4.zAxis);
+                        Class20.method907(WorldListCountry.localPlane, var4.xAxis, var4.zAxis, var4.anInt2831, 64 * (var7 - 1) + 60, var4, var4.anInt2785, var16, var4.aBoolean2810);
                     }
                 }
             }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub8.java b/Client/src/main/java/org/runite/client/Class3_Sub8.java
index 8c59c1041..c9bcd382d 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub8.java
+++ b/Client/src/main/java/org/runite/client/Class3_Sub8.java
@@ -8,8 +8,7 @@ import java.util.Objects;
 
 final class Class3_Sub8 extends Linkable {
 
-    static int[] anIntArray3083 = new int[50];
-    int anInt2296;
+   int anInt2296;
    Class64[] aClass64Array2298;
    int[] anIntArray2299;
    int[] anIntArray2300;
@@ -129,96 +128,4 @@ final class Class3_Sub8 extends Linkable {
       }
    }
 
-   static void method132() {
-      try {
-         for(int var1 = 0; var1 < AudioHandler.currentSoundEffectCount; ++var1) {
-            --Unsorted.anIntArray2157[var1];
-            if(Unsorted.anIntArray2157[var1] < -10) {
-               --AudioHandler.currentSoundEffectCount;
-
-               for(int var2 = var1; var2 < AudioHandler.currentSoundEffectCount; ++var2) {
-                  Class3_Sub25.anIntArray2550[var2] = Class3_Sub25.anIntArray2550[var2 - -1];
-                  Class102.aClass135Array2131[var2] = Class102.aClass135Array2131[var2 + 1];
-                  Class166.anIntArray2068[var2] = Class166.anIntArray2068[1 + var2];
-                  Unsorted.anIntArray2157[var2] = Unsorted.anIntArray2157[1 + var2];
-                  anIntArray3083[var2] = anIntArray3083[var2 - -1];
-               }
-
-               --var1;
-            } else {
-               Class135 var11 = Class102.aClass135Array2131[var1];
-               if(null == var11) {
-                  var11 = Class135.method1811(CacheIndex.soundFXIndex, Class3_Sub25.anIntArray2550[var1], 0);
-                  if(null == var11) {
-                     continue;
-                  }
-
-                  Unsorted.anIntArray2157[var1] += var11.method1813();
-                  Class102.aClass135Array2131[var1] = var11;
-               }
-
-               if(0 > Unsorted.anIntArray2157[var1]) {
-                  int var3;
-                  if(anIntArray3083[var1] == 0) {
-                     var3 = AudioHandler.soundEffectVolume;
-                  } else {
-                     int var4 = 128 * (255 & anIntArray3083[var1]);
-                     int var7 = anIntArray3083[var1] >> 8 & 0xFF;
-                     int var5 = 255 & anIntArray3083[var1] >> 16;
-                     int var8 = -Class102.player.anInt2829 + 64 + 128 * var7;
-                     if(var8 < 0) {
-                        var8 = -var8;
-                     }
-
-                     int var6 = -Class102.player.anInt2819 + 64 + var5 * 128;
-                     if(0 > var6) {
-                        var6 = -var6;
-                     }
-
-                     int var9 = -128 + var6 + var8;
-                     if(var9 > var4) {
-                        Unsorted.anIntArray2157[var1] = -100;
-                        continue;
-                     }
-
-                     if(var9 < 0) {
-                        var9 = 0;
-                     }
-
-                     var3 = Sprites.anInt340 * (var4 + -var9) / var4;
-                  }
-
-                  if(var3 > 0) {
-                     Class3_Sub12_Sub1 var12 = var11.method1812().method151(Class27.aClass157_524);
-                     Class3_Sub24_Sub1 var13 = Class3_Sub24_Sub1.method437(var12, var3);
-                     Objects.requireNonNull(var13).method429(Class166.anIntArray2068[var1] + -1);
-                     Class3_Sub26.aClass3_Sub24_Sub2_2563.method457(var13);
-                  }
-
-                  Unsorted.anIntArray2157[var1] = -100;
-               }
-            }
-         }
-
-         if((byte) -92 != -92) {
-            method126(true, 36, 42, 14, 51);
-         }
-
-         if(Class83.aBoolean1158 && Class79.method1391(-1)) {
-            if(0 != Unsorted.anInt120 && Class129.anInt1691 != -1) {
-               Class70.method1285(CacheIndex.musicIndex, Class129.anInt1691, Unsorted.anInt120);
-            }
-
-            Class83.aBoolean1158 = false;
-         } else if(Unsorted.anInt120 != 0 && Class129.anInt1691 != -1 && Class79.method1391((byte) -92 + 91)) {
-            TextureOperation12.outgoingBuffer.putOpcode(137);
-            TextureOperation12.outgoingBuffer.writeInt(Class129.anInt1691);
-            Class129.anInt1691 = -1;
-         }
-
-      } catch (RuntimeException var10) {
-         throw ClientErrorException.clientError(var10, "ed.C(" + (byte) -92 + ')');
-      }
-   }
-
 }
diff --git a/Client/src/main/java/org/runite/client/Class49.java b/Client/src/main/java/org/runite/client/Class49.java
index 0f42db134..41441260b 100644
--- a/Client/src/main/java/org/runite/client/Class49.java
+++ b/Client/src/main/java/org/runite/client/Class49.java
@@ -274,7 +274,7 @@ public final class Class49 {
                     }
                 }
 
-                LinkedList.method1214(Class106.anInt1446, Class102.player.anInt2819, Class102.player.anInt2829, WorldListCountry.localPlane);
+                LinkedList.method1214(Class106.anInt1446, Class102.player.xAxis, Class102.player.zAxis, WorldListCountry.localPlane);
                 Class106.anInt1446 = 0;
             }
         } catch (RuntimeException var3) {
diff --git a/Client/src/main/java/org/runite/client/Class60.java b/Client/src/main/java/org/runite/client/Class60.java
index 5edbe5bbe..8865a9cab 100644
--- a/Client/src/main/java/org/runite/client/Class60.java
+++ b/Client/src/main/java/org/runite/client/Class60.java
@@ -7,21 +7,6 @@ final class Class60 {
     static int anInt934;
     static int anInt936;
 
-    static void method1207() {
-        try {
-            for (int var1 = 0; Class163.localNPCCount > var1; ++var1) {
-                int var2 = Class15.localNPCIndexes[var1];
-                NPC var3 = NPC.npcs[var2];
-                if (null != var3) {
-                    Unsorted.method68(var3.definition.size, var3);
-                }
-            }
-
-        } catch (RuntimeException var4) {
-            throw ClientErrorException.clientError(var4, "ig.A(" + -72 + ')');
-        }
-    }
-
     static void method1208(byte var0, int var1) {
         try {
             if (-1 != var1) {
diff --git a/Client/src/main/java/org/runite/client/Class75_Sub1.java b/Client/src/main/java/org/runite/client/Class75_Sub1.java
index 84e63fb1d..27aa7509c 100644
--- a/Client/src/main/java/org/runite/client/Class75_Sub1.java
+++ b/Client/src/main/java/org/runite/client/Class75_Sub1.java
@@ -50,7 +50,7 @@ final class Class75_Sub1 extends Class75 {
                               var12.anInt1893 = 0;
                               var12.anInt1900 = var8;
                               var12.anInt1897 = 0;
-                              Unsorted.method1470(var2.anInt2829, var10, 183921384, var2.anInt2819, var2 == Class102.player, 0);
+                              Unsorted.method1470(var2.zAxis, var10, 183921384, var2.xAxis, var2 == Class102.player, 0);
                            } else if (var11 == 2) {
                               var12.anInt1894 = 0;
                            }
@@ -67,7 +67,7 @@ final class Class75_Sub1 extends Class75 {
                         var12.anInt1900 = var8;
                         var12.anInt1893 = 0;
                         var12.anInt1894 = 0;
-                        Unsorted.method1470(var2.anInt2829, var10, 183921384, var2.anInt2819, var2 == Class102.player, 0);
+                        Unsorted.method1470(var2.zAxis, var10, 183921384, var2.xAxis, var2 == Class102.player, 0);
                      }
                   }
                }
diff --git a/Client/src/main/java/org/runite/client/Class79.java b/Client/src/main/java/org/runite/client/Class79.java
index 633a06817..49ae23654 100644
--- a/Client/src/main/java/org/runite/client/Class79.java
+++ b/Client/src/main/java/org/runite/client/Class79.java
@@ -114,10 +114,10 @@ final class Class79 {
                             AudioHandler.soundEffectVolume = 127;
                         }
 
-                        Unsorted.anInt120 = var0.readUnsignedByte();
-                        Sprites.anInt340 = var0.readUnsignedByte();
-                        if (Sprites.anInt340 > 127) {
-                            Sprites.anInt340 = 127;
+                        AudioHandler.musicVolume = var0.readUnsignedByte();
+                        Sprites.ambientVolume = var0.readUnsignedByte();
+                        if (Sprites.ambientVolume > 127) {
+                            Sprites.ambientVolume = 127;
                         }
 
                         if (var2 >= 1) {
diff --git a/Client/src/main/java/org/runite/client/Class83.java b/Client/src/main/java/org/runite/client/Class83.java
index 86a9ede0b..ab69e1c36 100644
--- a/Client/src/main/java/org/runite/client/Class83.java
+++ b/Client/src/main/java/org/runite/client/Class83.java
@@ -6,7 +6,6 @@ import org.rs09.client.rendering.Toolkit;
 public final class Class83 {
 
     static int[] anIntArray1161;
-    static boolean aBoolean1158 = false;
     private final CacheIndex aClass153_1153;
     private final HashTable aHashTable_1155 = new HashTable(256);
     private final CacheIndex aClass153_1157;
@@ -333,22 +332,22 @@ public final class Class83 {
         }
     }
 
-    private Class3_Sub12_Sub1 method1412(int[] var1, int var3, int var4) {
+    private PcmSound method1412(int[] var1, int var3, int var4) {
         try {
             int var5 = var4 ^ (var3 >>> 12 | var3 << 4 & '\ufff3');
             var5 |= var3 << 16;
             long var6 = var5;
-            Class3_Sub12_Sub1 var8 = (Class3_Sub12_Sub1) this.aHashTable_1159.get(var6);
+            PcmSound var8 = (PcmSound) this.aHashTable_1159.get(var6);
             if (var8 != null) {
                 return var8;
             } else if (null != var1 && var1[0] <= 0) {
                 return null;
             } else {
-                Class135 var9 = Class135.method1811(this.aClass153_1153, var3, var4);
+                SynthSound var9 = SynthSound.create(this.aClass153_1153, var3, var4);
                 if (null == var9) {
                     return null;
                 } else {
-                    var8 = var9.method1812();
+                    var8 = var9.toPCMSound();
                     this.aHashTable_1159.put(var6, var8);
                     if (var1 != null) {
                         var1[0] -= var8.aByteArray3030.length;
@@ -362,7 +361,7 @@ public final class Class83 {
         }
     }
 
-    final Class3_Sub12_Sub1 method1413(int var1, int[] var3) {
+    final PcmSound method1413(int var1, int[] var3) {
         try {
             if (1 == this.aClass153_1153.method2121()) {
                 return this.method1412(var3, 0, var1);
@@ -377,12 +376,12 @@ public final class Class83 {
         }
     }
 
-    private Class3_Sub12_Sub1 method1415(int var1, int[] var2, int var3) {
+    private PcmSound method1415(int var1, int[] var2, int var3) {
         try {
             int var5 = var3 ^ (var1 >>> 12 | '\ufff3' & var1 << 4);
             var5 |= var1 << 16;
             long var6 = (long) var5 ^ 4294967296L;
-            Class3_Sub12_Sub1 var8 = (Class3_Sub12_Sub1) this.aHashTable_1159.get(var6);
+            PcmSound var8 = (PcmSound) this.aHashTable_1159.get(var6);
             if (null != var8) {
                 return var8;
             } else if (var2 != null && var2[0] <= 0) {
@@ -414,7 +413,7 @@ public final class Class83 {
         }
     }
 
-    final Class3_Sub12_Sub1 method1416(int var2, int[] var3) {
+    final PcmSound method1416(int var2, int[] var3) {
         try {
             if (this.aClass153_1157.method2121() == 1) {
                 return this.method1415(0, var3, var2);
diff --git a/Client/src/main/java/org/runite/client/Class84.java b/Client/src/main/java/org/runite/client/Class84.java
index f4587fc2b..47b5cae95 100644
--- a/Client/src/main/java/org/runite/client/Class84.java
+++ b/Client/src/main/java/org/runite/client/Class84.java
@@ -80,7 +80,7 @@ public final class Class84 {
     static int method1421() {
         try {
 
-            return ((TextureOperation17.aBoolean3184 ? 1 : 0) << 19) + (((Class38.aBoolean661 ? 1 : 0) << 16) + ((!Class128.aBoolean1685 ? 0 : 1) << 15) + ((!Class106.aBoolean1441 ? 0 : 1) << 13) + ((Class140_Sub6.aBoolean2910 ? 1 : 0) << 10) + ((Unsorted.aBoolean3275 ? 1 : 0) << 9) + ((RSInterface.aBoolean236 ? 1 : 0) << 7) + ((!Class25.aBoolean488 ? 0 : 1) << 6) + ((KeyboardListener.aBoolean1905 ? 1 : 0) << 5) + (((!Unsorted.aBoolean3665 ? 0 : 1) << 3) + (Unsorted.anInt3625 & 7) - (-((!Unsorted.aBoolean3604 ? 0 : 1) << 4) + -((WorldListEntry.aBoolean2623 ? 1 : 0) << 8)) - (-(Unsorted.anInt1137 << 11 & 6144) + -((AudioHandler.soundEffectVolume == 0 ? 0 : 1) << 20) - (((Unsorted.anInt120 != 0 ? 1 : 0) << 21) + ((Sprites.anInt340 == 0 ? 0 : 1) << 22)))) - -(Class127_Sub1.method1757() << 23));
+            return ((TextureOperation17.aBoolean3184 ? 1 : 0) << 19) + (((Class38.aBoolean661 ? 1 : 0) << 16) + ((!Class128.aBoolean1685 ? 0 : 1) << 15) + ((!Class106.aBoolean1441 ? 0 : 1) << 13) + ((Class140_Sub6.aBoolean2910 ? 1 : 0) << 10) + ((Unsorted.aBoolean3275 ? 1 : 0) << 9) + ((RSInterface.aBoolean236 ? 1 : 0) << 7) + ((!Class25.aBoolean488 ? 0 : 1) << 6) + ((KeyboardListener.aBoolean1905 ? 1 : 0) << 5) + (((!Unsorted.aBoolean3665 ? 0 : 1) << 3) + (Unsorted.anInt3625 & 7) - (-((!Unsorted.aBoolean3604 ? 0 : 1) << 4) + -((WorldListEntry.aBoolean2623 ? 1 : 0) << 8)) - (-(Unsorted.anInt1137 << 11 & 6144) + -((AudioHandler.soundEffectVolume == 0 ? 0 : 1) << 20) - (((AudioHandler.musicVolume != 0 ? 1 : 0) << 21) + ((Sprites.ambientVolume == 0 ? 0 : 1) << 22)))) - -(Class127_Sub1.method1757() << 23));
         } catch (RuntimeException var2) {
             throw ClientErrorException.clientError(var2, "lf.F(" + -2 + ')');
         }
diff --git a/Client/src/main/java/org/runite/client/Class97.java b/Client/src/main/java/org/runite/client/Class97.java
index 40af4adc3..cfcb1f1cd 100644
--- a/Client/src/main/java/org/runite/client/Class97.java
+++ b/Client/src/main/java/org/runite/client/Class97.java
@@ -49,8 +49,8 @@ public final class Class97 {
 
     static void method1591(Class3_Sub24 var1) {
         try {
-            if (var1.aClass3_Sub12_2544 != null) {
-                var1.aClass3_Sub12_2544.anInt2374 = 0;
+            if (var1.aSound_2544 != null) {
+                var1.aSound_2544.anInt2374 = 0;
             }
 
             var1.aBoolean2545 = false;
diff --git a/Client/src/main/java/org/runite/client/Client.java b/Client/src/main/java/org/runite/client/Client.java
index 102109ba1..c003d93dd 100644
--- a/Client/src/main/java/org/runite/client/Client.java
+++ b/Client/src/main/java/org/runite/client/Client.java
@@ -744,7 +744,7 @@ public final class Client extends GameShell {
         try {
             if (Class143.gameStage != 1000) {
                 boolean var2 = NPC.method1988();
-                if (var2 && Class83.aBoolean1158 && WorldListEntry.aClass155_2627 != null) {
+                if (var2 && AudioHandler.musicEffectPlaying && WorldListEntry.aClass155_2627 != null) {
                     WorldListEntry.aClass155_2627.method2158();
                 }
 
@@ -884,10 +884,10 @@ public final class Client extends GameShell {
                 }
 
                 DeveloperConsole.INSTANCE.postDraw();
-//				if (DeveloperConsole.INSTANCE.getOpen()) {
-//				    DeveloperConsole.INSTANCE.draw();
-////					System.out.println("Draw developer console");
-//				}
+				if (DeveloperConsole.INSTANCE.getOpen()) {
+				    DeveloperConsole.INSTANCE.draw();
+//					System.out.println("Draw developer console");
+				}
                 DiscordRPC.discordRunCallbacks();
             }
         } catch (RuntimeException var9) {
@@ -1184,10 +1184,10 @@ public final class Client extends GameShell {
                             int var7 = (int) Math.round(Math.random() * 2.0D - 1.0D);
                             if (var6 != 0 || 0 != var7) {
                                 var4.aByteArray2795[0] = 1;
-                                var4.anIntArray2767[0] = var6 + (var4.anInt2819 >> 7);
-                                var4.anIntArray2755[0] = var7 + (var4.anInt2829 >> 7);
-                                AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1502(var4.anInt2819 >> 7, var4.getSize(), false, 0, var4.getSize(), var4.anInt2829 >> 7);
-                                if (0 <= var4.anIntArray2767[0] && var4.anIntArray2767[0] <= 104 + -var4.getSize() && 0 <= var4.anIntArray2755[0] && var4.anIntArray2755[0] <= 104 - var4.getSize() && AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1500(var4.anInt2829 >> 7, var4.anIntArray2755[0], var4.anIntArray2767[0], var4.anInt2819 >> 7)) {
+                                var4.anIntArray2767[0] = var6 + (var4.xAxis >> 7);
+                                var4.anIntArray2755[0] = var7 + (var4.zAxis >> 7);
+                                AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1502(var4.xAxis >> 7, var4.getSize(), false, 0, var4.getSize(), var4.zAxis >> 7);
+                                if (0 <= var4.anIntArray2767[0] && var4.anIntArray2767[0] <= 104 + -var4.getSize() && 0 <= var4.anIntArray2755[0] && var4.anIntArray2755[0] <= 104 - var4.getSize() && AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1500(var4.zAxis >> 7, var4.anIntArray2755[0], var4.anIntArray2767[0], var4.xAxis >> 7)) {
                                     if (var4.getSize() > 1) {
                                         for (int var8 = var4.anIntArray2767[0]; var8 < var4.anIntArray2767[0] - -var4.getSize(); ++var8) {
                                             for (int var9 = var4.anIntArray2755[0]; var4.anIntArray2755[0] + var4.getSize() > var9; ++var9) {
@@ -1206,7 +1206,7 @@ public final class Client extends GameShell {
                         Unsorted.method1180((byte) -122, var4);
                         Class17.method904(65536, var4);
                         RenderAnimationDefinition.method900(var4, (byte) 1 ^ -11974);
-                        AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1489(var4.anInt2819 >> 7, false, (byte) 85, var4.anInt2829 >> 7, var4.getSize(), var4.getSize());
+                        AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1489(var4.xAxis >> 7, false, (byte) 85, var4.zAxis >> 7, var4.getSize(), var4.getSize());
                     }
                 }
             }
@@ -1529,7 +1529,7 @@ public final class Client extends GameShell {
                         Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.gameSignlink, GameShell.canvas, 1);
                         Class3_Sub26.aClass3_Sub24_Sub2_2563 = new Class3_Sub24_Sub2();
                         Class3_Sub21.aClass155_2491.method2154(-128, Class3_Sub26.aClass3_Sub24_Sub2_2563);
-                        Class27.aClass157_524 = new Class157(22050, Class21.anInt443);
+                        Class27.resampler = new Class157(22050, Class21.anInt443);
                         KeyboardListener.loginThemeSongArchiveID = CacheIndex.musicIndex.getArchiveForName(RSString.parse(GameConfig.LOGIN_THEME));
                         LoadingStageNumber = 30;
                         anInt1354 = 50;
diff --git a/Client/src/main/java/org/runite/client/DataBuffer.java b/Client/src/main/java/org/runite/client/DataBuffer.java
index 7d791df36..2a1de4f47 100644
--- a/Client/src/main/java/org/runite/client/DataBuffer.java
+++ b/Client/src/main/java/org/runite/client/DataBuffer.java
@@ -467,7 +467,7 @@ public class DataBuffer extends Linkable {
     }
 
     // TODO
-    final int getSmart(int var1) {
+    final int getByteOrShort() {
         int var2 = this.buffer[this.index] & 0xFF;
         return var2 < 128 ? -64 + this.readUnsignedByte() : this.readUnsignedShort() - '\uc000';
     }
diff --git a/Client/src/main/java/org/runite/client/Envelope.java b/Client/src/main/java/org/runite/client/Envelope.java
new file mode 100644
index 000000000..6a2ad479a
--- /dev/null
+++ b/Client/src/main/java/org/runite/client/Envelope.java
@@ -0,0 +1,67 @@
+package org.runite.client;
+
+final class Envelope {
+
+    int waveTable;
+    int minInterval;
+    int maxInterval;
+    private int stages = 2;
+    private int[] levels = new int[2];
+    private int[] times = new int[2];
+    private int phaseIndex;
+    private int level;
+    private int slope;
+    private int nextTime;
+    private int time;
+
+    public Envelope() {
+        this.times[0] = 0;
+        this.times[1] = 65535;
+        this.levels[0] = 0;
+        this.levels[1] = 65535;
+    }
+
+    final int nextLevel(int duration) {
+        if (this.time >= this.nextTime) {
+            this.level = this.levels[this.phaseIndex++] << 15;
+            if (this.phaseIndex >= this.stages) {
+                this.phaseIndex = this.stages - 1;
+            }
+
+            this.nextTime = (int) ((double) this.times[this.phaseIndex] / 65536.0D * (double) duration);
+            if (this.nextTime > this.time) {
+                this.slope = ((this.levels[this.phaseIndex] << 15) - this.level) / (this.nextTime - this.time);
+            }
+        }
+
+        this.level += this.slope;
+        ++this.time;
+        return this.level - this.slope >> 15;
+    }
+
+    final void reset() {
+        this.nextTime = 0;
+        this.phaseIndex = 0;
+        this.slope = 0;
+        this.level = 0;
+        this.time = 0;
+    }
+
+    final void decodeStages(DataBuffer buffer) {
+        this.stages = buffer.readUnsignedByte();
+        this.times = new int[this.stages];
+        this.levels = new int[this.stages];
+
+        for (int var2 = 0; var2 < this.stages; ++var2) {
+            this.times[var2] = buffer.readUnsignedShort();
+            this.levels[var2] = buffer.readUnsignedShort();
+        }
+    }
+
+    final void decode(DataBuffer buffer) {
+        this.waveTable = buffer.readUnsignedByte();
+        this.minInterval = buffer.readInt();
+        this.maxInterval = buffer.readInt();
+        this.decodeStages(buffer);
+    }
+}
diff --git a/Client/src/main/java/org/runite/client/Class103.java b/Client/src/main/java/org/runite/client/Filter.java
similarity index 81%
rename from Client/src/main/java/org/runite/client/Class103.java
rename to Client/src/main/java/org/runite/client/Filter.java
index cddd2e195..44224a734 100644
--- a/Client/src/main/java/org/runite/client/Class103.java
+++ b/Client/src/main/java/org/runite/client/Filter.java
@@ -1,23 +1,23 @@
 package org.runite.client;
 
-final class Class103 {
+final class Filter {
 
     private static final float[][] aFloatArrayArray1431 = new float[2][8];
     private static float aFloat1433;
     private final int[][][] anIntArrayArrayArray1430 = new int[2][2][4];
     private final int[][][] anIntArrayArrayArray1432 = new int[2][2][4];
     private final int[] anIntArray1437 = new int[2];
-    int[] anIntArray1434 = new int[2];
+    int[] pairs = new int[2];
 
     private static float method1621(float var0) {
         float var1 = 32.703197F * (float) Math.pow(2.0D, var0);
         return var1 * 3.1415927F / 11025.0F;
     }
 
-    final void method1620(DataBuffer var1, Class34 var2) {
+    final void decode(DataBuffer var1, Envelope var2) {
         int var3 = var1.readUnsignedByte();
-        this.anIntArray1434[0] = var3 >> 4;
-        this.anIntArray1434[1] = var3 & 15;
+        this.pairs[0] = var3 >> 4;
+        this.pairs[1] = var3 & 15;
         if (var3 == 0) {
             this.anIntArray1437[0] = this.anIntArray1437[1] = 0;
         } else {
@@ -28,14 +28,14 @@ final class Class103 {
             int var5;
             int var6;
             for (var5 = 0; var5 < 2; ++var5) {
-                for (var6 = 0; var6 < this.anIntArray1434[var5]; ++var6) {
+                for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
                     this.anIntArrayArrayArray1430[var5][0][var6] = var1.readUnsignedShort();
                     this.anIntArrayArrayArray1432[var5][0][var6] = var1.readUnsignedShort();
                 }
             }
 
             for (var5 = 0; var5 < 2; ++var5) {
-                for (var6 = 0; var6 < this.anIntArray1434[var5]; ++var6) {
+                for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
                     if ((var4 & 1 << var5 * 4 << var6) == 0) {
                         this.anIntArrayArrayArray1430[var5][1][var6] = this.anIntArrayArrayArray1430[var5][0][var6];
                         this.anIntArrayArrayArray1432[var5][1][var6] = this.anIntArrayArrayArray1432[var5][0][var6];
@@ -47,22 +47,22 @@ final class Class103 {
             }
 
             if (var4 != 0 || this.anIntArray1437[1] != this.anIntArray1437[0]) {
-                var2.method1009(var1);
+                var2.decodeStages(var1);
             }
         }
 
     }
 
-    final int method1622(int var1, float var2) {
+    final int compute(int var1, float var2) {
         float var3;
         if (var1 == 0) {
             var3 = (float) this.anIntArray1437[0] + (float) (this.anIntArray1437[1] - this.anIntArray1437[0]) * var2;
             var3 *= 0.0030517578F;
             aFloat1433 = (float) Math.pow(0.1D, var3 / 20.0F);
-            Class116.anInt1436 = (int) (aFloat1433 * 65536.0F);
+            SynthInstrument.inverseA0 = (int) (aFloat1433 * 65536.0F);
         }
 
-        if (this.anIntArray1434[var1] == 0) {
+        if (this.pairs[var1] == 0) {
             return 0;
         } else {
             var3 = this.method1624(var1, 0, var2);
@@ -70,7 +70,7 @@ final class Class103 {
             aFloatArrayArray1431[var1][1] = var3 * var3;
 
             int var4;
-            for (var4 = 1; var4 < this.anIntArray1434[var1]; ++var4) {
+            for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
                 var3 = this.method1624(var1, var4, var2);
                 float var5 = -2.0F * var3 * (float) Math.cos(this.method1625(var1, var4, var2));
                 float var6 = var3 * var3;
@@ -86,16 +86,16 @@ final class Class103 {
             }
 
             if (var1 == 0) {
-                for (var4 = 0; var4 < this.anIntArray1434[0] * 2; ++var4) {
+                for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
                     aFloatArrayArray1431[0][var4] *= aFloat1433;
                 }
             }
 
-            for (var4 = 0; var4 < this.anIntArray1434[var1] * 2; ++var4) {
-                Class116.anIntArrayArray1435[var1][var4] = (int) (aFloatArrayArray1431[var1][var4] * 65536.0F);
+            for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
+                SynthInstrument.coefficency[var1][var4] = (int) (aFloatArrayArray1431[var1][var4] * 65536.0F);
             }
 
-            return this.anIntArray1434[var1] * 2;
+            return this.pairs[var1] * 2;
         }
     }
 
diff --git a/Client/src/main/java/org/runite/client/HDToolKit.java b/Client/src/main/java/org/runite/client/HDToolKit.java
index 8fdaff194..ef4a17b86 100644
--- a/Client/src/main/java/org/runite/client/HDToolKit.java
+++ b/Client/src/main/java/org/runite/client/HDToolKit.java
@@ -114,7 +114,11 @@ public final class HDToolKit {
     }
 
     public static void bufferSwap() {
-        glDrawable.swapBuffers();
+        try {
+            glDrawable.swapBuffers();
+        } catch (GLException ignore) {
+            //TODO: This may be the cause of the display failing sometimes.
+        }
     }
 
     static void method1827(boolean var0) {
@@ -246,7 +250,7 @@ public final class HDToolKit {
             var3.release();
             var3.destroy();
             var2.setRealized(false);
-        } catch (Throwable var4) {
+        } catch (GLException var4) {
         }
 
     }
@@ -392,7 +396,7 @@ public final class HDToolKit {
         if (gl != null) {
             try {
                 Class101.method1609();
-            } catch (Throwable var4) {
+            } catch (GLException var4) {
             }
 
             gl = null;
@@ -405,12 +409,12 @@ public final class HDToolKit {
                 if (javax.media.opengl.GLContext.getCurrent() == glContext) {
                     glContext.release();
                 }
-            } catch (Throwable var3) {
+            } catch (GLException var3) {
             }
 
             try {
                 glContext.destroy();
-            } catch (Throwable var2) {
+            } catch (GLException var2) {
             }
 
             glContext = null;
@@ -419,7 +423,7 @@ public final class HDToolKit {
         if (glDrawable != null) {
             try {
                 glDrawable.setRealized(false);
-            } catch (Throwable var1) {
+            } catch (GLException var1) {
             }
 
             glDrawable = null;
@@ -570,6 +574,12 @@ public final class HDToolKit {
 
         try {
             if (canvas.isDisplayable()) {
+
+                /*
+                    Edited out here is the old JOGL implementation. It was removed due to lack of
+                    support for MacOS + Linux. There was a problem with the threads and Linux users
+                    were unable to interact with the canvas.
+                 */
                 //GLProfile.initSingleton();
 //                GLCapabilities glCapabilities = new GLCapabilities(GLProfile.getDefault());
 //                System.out.println("Scene MSAASamples = " + SceneMSAASamples);
@@ -587,7 +597,7 @@ public final class HDToolKit {
                 GLCapabilities var2 = new GLCapabilities();
                 if (SceneMSAASamples > 0) {
                     var2.setSampleBuffers(true);
-                    var2.setNumSamples(SceneMSAASamples);
+                    var2.setNumSamples(SceneMSAASamples * 128);
                 }
 
                 GLDrawableFactory var3 = GLDrawableFactory.getFactory();
@@ -604,7 +614,7 @@ public final class HDToolKit {
                         if (var5 != 0) {
                             break;
                         }
-                    } catch (Exception var8) {
+                    } catch (GLException var8) {
                     }
 
                     if (var4++ > 5) {
@@ -631,7 +641,7 @@ public final class HDToolKit {
                         try {
                             glDrawable.swapBuffers();
                             break;
-                        } catch (Exception var7) {
+                        } catch (GLException var7) {
                             if (var4++ > 5) {
                                 method1842();
                                 return;
@@ -647,7 +657,7 @@ public final class HDToolKit {
                 }
             } else {
             }
-        } catch (Throwable var9) {
+        } catch (GLException var9) {
             System.err.println("Failed to enter HD");
             method1842();
         }
diff --git a/Client/src/main/java/org/runite/client/LinkedList.java b/Client/src/main/java/org/runite/client/LinkedList.java
index 76a1f0c6d..7cbe68649 100644
--- a/Client/src/main/java/org/runite/client/LinkedList.java
+++ b/Client/src/main/java/org/runite/client/LinkedList.java
@@ -90,10 +90,10 @@ public final class LinkedList {
                     var5.anInt2322 = var6;
                 }
 
-                var5.anInt2326 = var5.aClass140_Sub4_Sub2_2324.anInt2819;
-                var5.anInt2321 = var5.aClass140_Sub4_Sub2_2324.anInt2819 + var5.aClass140_Sub4_Sub2_2324.getSize() * 64;
-                var5.anInt2308 = var5.aClass140_Sub4_Sub2_2324.anInt2829;
-                var5.anInt2307 = var5.aClass140_Sub4_Sub2_2324.anInt2829 + var5.aClass140_Sub4_Sub2_2324.getSize() * 64;
+                var5.anInt2326 = var5.aClass140_Sub4_Sub2_2324.xAxis;
+                var5.anInt2321 = var5.aClass140_Sub4_Sub2_2324.xAxis + var5.aClass140_Sub4_Sub2_2324.getSize() * 64;
+                var5.anInt2308 = var5.aClass140_Sub4_Sub2_2324.zAxis;
+                var5.anInt2307 = var5.aClass140_Sub4_Sub2_2324.zAxis + var5.aClass140_Sub4_Sub2_2324.getSize() * 64;
                 Unsorted.method606(var1, var5, var3, var0, var2, 1 ^ 113);
             }
 
@@ -124,10 +124,10 @@ public final class LinkedList {
                     var5.anInt2322 = var6;
                 }
 
-                var5.anInt2326 = var5.aClass140_Sub4_Sub1_2327.anInt2819;
-                var5.anInt2321 = var5.aClass140_Sub4_Sub1_2327.anInt2819 + 64 * var5.aClass140_Sub4_Sub1_2327.getSize();
-                var5.anInt2308 = var5.aClass140_Sub4_Sub1_2327.anInt2829;
-                var5.anInt2307 = var5.aClass140_Sub4_Sub1_2327.anInt2829 + var5.aClass140_Sub4_Sub1_2327.getSize() * 64;
+                var5.anInt2326 = var5.aClass140_Sub4_Sub1_2327.xAxis;
+                var5.anInt2321 = var5.aClass140_Sub4_Sub1_2327.xAxis + 64 * var5.aClass140_Sub4_Sub1_2327.getSize();
+                var5.anInt2308 = var5.aClass140_Sub4_Sub1_2327.zAxis;
+                var5.anInt2307 = var5.aClass140_Sub4_Sub1_2327.zAxis + var5.aClass140_Sub4_Sub1_2327.getSize() * 64;
                 Unsorted.method606(var1, var5, var3, var0, var2, 110);
             }
 
diff --git a/Client/src/main/java/org/runite/client/Model_Sub1.java b/Client/src/main/java/org/runite/client/Model_Sub1.java
index 7a9c3632c..d160e2227 100644
--- a/Client/src/main/java/org/runite/client/Model_Sub1.java
+++ b/Client/src/main/java/org/runite/client/Model_Sub1.java
@@ -981,17 +981,17 @@ final class Model_Sub1 extends GameObject {
             var54 = var2.readUnsignedByte();
             var55 = 0;
             if ((var54 & 1) != 0) {
-                var55 = var3.getSmart(-21208);
+                var55 = var3.getByteOrShort();
             }
 
             var56 = 0;
             if ((var54 & 2) != 0) {
-                var56 = var4.getSmart(-21208);
+                var56 = var4.getByteOrShort();
             }
 
             var57 = 0;
             if ((var54 & 4) != 0) {
-                var57 = var5.getSmart(-21208);
+                var57 = var5.getByteOrShort();
             }
 
             this.anIntArray2885[var53] = var50 + var55;
@@ -1055,9 +1055,9 @@ final class Model_Sub1 extends GameObject {
         for (var57 = 0; var57 < var10; ++var57) {
             var58 = var3.readUnsignedByte();
             if (var58 == 1) {
-                var53 = var2.getSmart(-21208) + var56;
-                var54 = var2.getSmart(-21208) + var53;
-                var55 = var2.getSmart(-21208) + var54;
+                var53 = var2.getByteOrShort() + var56;
+                var54 = var2.getByteOrShort() + var53;
+                var55 = var2.getByteOrShort() + var54;
                 var56 = var55;
                 this.anIntArray2865[var57] = var53;
                 this.anIntArray2878[var57] = var54;
@@ -1066,7 +1066,7 @@ final class Model_Sub1 extends GameObject {
 
             if (var58 == 2) {
                 var54 = var55;
-                var55 = var2.getSmart(-21208) + var56;
+                var55 = var2.getByteOrShort() + var56;
                 var56 = var55;
                 this.anIntArray2865[var57] = var53;
                 this.anIntArray2878[var57] = var54;
@@ -1075,7 +1075,7 @@ final class Model_Sub1 extends GameObject {
 
             if (var58 == 3) {
                 var53 = var55;
-                var55 = var2.getSmart(-21208) + var56;
+                var55 = var2.getByteOrShort() + var56;
                 var56 = var55;
                 this.anIntArray2865[var57] = var53;
                 this.anIntArray2878[var57] = var54;
@@ -1086,7 +1086,7 @@ final class Model_Sub1 extends GameObject {
                 int var59 = var53;
                 var53 = var54;
                 var54 = var59;
-                var55 = var2.getSmart(-21208) + var56;
+                var55 = var2.getByteOrShort() + var56;
                 var56 = var55;
                 this.anIntArray2865[var57] = var53;
                 this.anIntArray2878[var57] = var59;
@@ -1602,17 +1602,17 @@ final class Model_Sub1 extends GameObject {
             var39 = var4.readUnsignedByte();
             var40 = 0;
             if ((var39 & 1) != 0) {
-                var40 = var5.getSmart(-21208);
+                var40 = var5.getByteOrShort();
             }
 
             var41 = 0;
             if ((var39 & 2) != 0) {
-                var41 = var6.getSmart(-21208);
+                var41 = var6.getByteOrShort();
             }
 
             var42 = 0;
             if ((var39 & 4) != 0) {
-                var42 = var7.getSmart(-21208);
+                var42 = var7.getByteOrShort();
             }
 
             this.anIntArray2885[var38] = var35 + var40;
@@ -1681,9 +1681,9 @@ final class Model_Sub1 extends GameObject {
         for (var42 = 0; var42 < var10; ++var42) {
             var43 = var5.readUnsignedByte();
             if (var43 == 1) {
-                var38 = var4.getSmart(-21208) + var41;
-                var39 = var4.getSmart(-21208) + var38;
-                var40 = var4.getSmart(-21208) + var39;
+                var38 = var4.getByteOrShort() + var41;
+                var39 = var4.getByteOrShort() + var38;
+                var40 = var4.getByteOrShort() + var39;
                 var41 = var40;
                 this.anIntArray2865[var42] = var38;
                 this.anIntArray2878[var42] = var39;
@@ -1692,7 +1692,7 @@ final class Model_Sub1 extends GameObject {
 
             if (var43 == 2) {
                 var39 = var40;
-                var40 = var4.getSmart(-21208) + var41;
+                var40 = var4.getByteOrShort() + var41;
                 var41 = var40;
                 this.anIntArray2865[var42] = var38;
                 this.anIntArray2878[var42] = var39;
@@ -1701,7 +1701,7 @@ final class Model_Sub1 extends GameObject {
 
             if (var43 == 3) {
                 var38 = var40;
-                var40 = var4.getSmart(-21208) + var41;
+                var40 = var4.getByteOrShort() + var41;
                 var41 = var40;
                 this.anIntArray2865[var42] = var38;
                 this.anIntArray2878[var42] = var39;
@@ -1712,7 +1712,7 @@ final class Model_Sub1 extends GameObject {
                 var44 = var38;
                 var38 = var39;
                 var39 = var44;
-                var40 = var4.getSmart(-21208) + var41;
+                var40 = var4.getByteOrShort() + var41;
                 var41 = var40;
                 this.anIntArray2865[var42] = var38;
                 this.anIntArray2878[var42] = var44;
diff --git a/Client/src/main/java/org/runite/client/NPC.java b/Client/src/main/java/org/runite/client/NPC.java
index b07ce3934..9b9befd0e 100644
--- a/Client/src/main/java/org/runite/client/NPC.java
+++ b/Client/src/main/java/org/runite/client/NPC.java
@@ -133,7 +133,7 @@ public final class NPC extends Class140_Sub4 {
                             var12.anInt1891 = 1;
                             var12.anInt1897 = 0;
                             var12.anInt1900 = var8;
-                            Unsorted.method1470(var2.anInt2829, var10, 183921384, var2.anInt2819, false, 0);
+                            Unsorted.method1470(var2.zAxis, var10, 183921384, var2.xAxis, false, 0);
                          } else if(var11 == 2) {
                             var12.anInt1894 = 0;
                          }
@@ -147,7 +147,7 @@ public final class NPC extends Class140_Sub4 {
                          var12.animationId = var6;
                          var12.anInt1894 = 0;
                          var12.anInt1893 = 0;
-                         Unsorted.method1470(var2.anInt2829, var10, 183921384, var2.anInt2819, false, 0);
+                         Unsorted.method1470(var2.zAxis, var10, 183921384, var2.xAxis, false, 0);
                       }
                    }
                 }
@@ -189,7 +189,7 @@ public final class NPC extends Class140_Sub4 {
 
                     Model var17;
                     if (Class140_Sub6.aBoolean2910 && Objects.requireNonNull(var16).aBoolean1249) {
-                        var17 = Class140_Sub3.method1957(this.definition.aByte1287, this.aBoolean2810, null == var14 ? var13 : var14, this.anInt2819, this.definition.aShort1256, this.anInt2829, this.definition.aShort1286, this.definition.size, var15, var1, null != var14 ? this.anInt2813 : this.anInt2832, this.anInt2831, this.definition.aByte1275);
+                        var17 = Class140_Sub3.method1957(this.definition.aByte1287, this.aBoolean2810, null == var14 ? var13 : var14, this.xAxis, this.definition.aShort1256, this.zAxis, this.definition.aShort1286, this.definition.size, var15, var1, null != var14 ? this.anInt2813 : this.anInt2832, this.anInt2831, this.definition.aByte1275);
                         if (HDToolKit.highDetail) {
                             float var18 = HDToolKit.method1852();
                             float var19 = HDToolKit.method1839();
diff --git a/Client/src/main/java/org/runite/client/NPCRendering.java b/Client/src/main/java/org/runite/client/NPCRendering.java
index 2394b65fc..58f8123f5 100644
--- a/Client/src/main/java/org/runite/client/NPCRendering.java
+++ b/Client/src/main/java/org/runite/client/NPCRendering.java
@@ -264,7 +264,7 @@ public final class NPCRendering {
                            if (var8 != -1) {
                                SequenceDefinition var9 = SequenceDefinition.getAnimationDefinition(var8);
                                if (var9.frames != null) {
-                                   Unsorted.method1470(npc.anInt2829, var9, 183921384, npc.anInt2819, false, 0);
+                                   Unsorted.method1470(npc.zAxis, var9, 183921384, npc.xAxis, false, 0);
                                }
                            }
                        }
@@ -323,4 +323,19 @@ public final class NPCRendering {
            throw ClientErrorException.clientError(var11, "ta.M(" + ')');
        }
    }
+
+    static void updateNPCAreaArray() {
+        try {
+            for (int var1 = 0; Class163.localNPCCount > var1; ++var1) {
+                int var2 = Class15.localNPCIndexes[var1];
+                NPC var3 = NPC.npcs[var2];
+                if (null != var3) {
+                    Unsorted.method68(var3.definition.size, var3);
+                }
+            }
+
+        } catch (RuntimeException var4) {
+            throw ClientErrorException.clientError(var4, "ig.A(" + -72 + ')');
+        }
+    }
 }
diff --git a/Client/src/main/java/org/runite/client/PacketParser.java b/Client/src/main/java/org/runite/client/PacketParser.java
index 3399badf6..e8e89234f 100644
--- a/Client/src/main/java/org/runite/client/PacketParser.java
+++ b/Client/src/main/java/org/runite/client/PacketParser.java
@@ -589,7 +589,7 @@ public final class PacketParser {
                                                                     if (var33 != -1) {
                                                                         var53 = SequenceDefinition.getAnimationDefinition(var33);
                                                                         if (null != var53.frames) {
-                                                                            Unsorted.method1470(var62.anInt2829, var53, 183921384, var62.anInt2819, false, 0);
+                                                                            Unsorted.method1470(var62.zAxis, var53, 183921384, var62.xAxis, false, 0);
                                                                         }
                                                                     }
                                                                 }
@@ -627,7 +627,7 @@ public final class PacketParser {
                                                                     if (var33 != -1) {
                                                                         var53 = SequenceDefinition.getAnimationDefinition(var33);
                                                                         if (null != var53.frames) {
-                                                                            Unsorted.method1470(var60.anInt2829, var53, 183921384, var60.anInt2819, var60 == Class102.player, 0);
+                                                                            Unsorted.method1470(var60.zAxis, var53, 183921384, var60.xAxis, var60 == Class102.player, 0);
                                                                         }
                                                                     }
                                                                 }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub12_Sub1.java b/Client/src/main/java/org/runite/client/PcmSound.java
similarity index 79%
rename from Client/src/main/java/org/runite/client/Class3_Sub12_Sub1.java
rename to Client/src/main/java/org/runite/client/PcmSound.java
index 12f446b6d..a2defff93 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub12_Sub1.java
+++ b/Client/src/main/java/org/runite/client/PcmSound.java
@@ -1,6 +1,6 @@
 package org.runite.client;
 
-final class Class3_Sub12_Sub1 extends Class3_Sub12 {
+final class PcmSound extends Sound {
 
    byte[] aByteArray3030;
    boolean aBoolean3031;
@@ -9,7 +9,7 @@ final class Class3_Sub12_Sub1 extends Class3_Sub12 {
    int anInt3034;
 
 
-   final Class3_Sub12_Sub1 method151(Class157 var1) {
+   final PcmSound method151(Class157 var1) {
       this.aByteArray3030 = var1.method2173(this.aByteArray3030);
       this.anInt3034 = var1.method2177(this.anInt3034);
       if(this.anInt3033 == this.anInt3032) {
@@ -25,14 +25,14 @@ final class Class3_Sub12_Sub1 extends Class3_Sub12 {
       return this;
    }
 
-   Class3_Sub12_Sub1(byte[] var2, int var3, int var4) {
+   PcmSound(byte[] var2, int var3, int var4) {
       this.anInt3034 = 22050;
       this.aByteArray3030 = var2;
       this.anInt3033 = var3;
       this.anInt3032 = var4;
    }
 
-   Class3_Sub12_Sub1(int var1, byte[] var2, int var3, int var4, boolean var5) {
+   PcmSound(int var1, byte[] var2, int var3, int var4, boolean var5) {
       this.anInt3034 = var1;
       this.aByteArray3030 = var2;
       this.anInt3033 = var3;
diff --git a/Client/src/main/java/org/runite/client/Player.java b/Client/src/main/java/org/runite/client/Player.java
index 85c0a63b6..9fefd6f2d 100644
--- a/Client/src/main/java/org/runite/client/Player.java
+++ b/Client/src/main/java/org/runite/client/Player.java
@@ -118,8 +118,8 @@ public final class Player extends Class140_Sub4 {
             int[] look = new int[12];
             this.setSize(1 + (var3 >> 3 & 7), 2);
             this.anInt3958 = 3 & var3 >> 6;
-            this.anInt2819 += (-var7 + this.getSize()) * 64;
-            this.anInt2829 += 64 * (this.getSize() + -var7);
+            this.xAxis += (-var7 + this.getSize()) * 64;
+            this.zAxis += 64 * (this.getSize() + -var7);
             this.skullIcon = buffer.readSignedByte();
             this.headIcon = buffer.readSignedByte();
             this.teamId = 0;
@@ -212,8 +212,8 @@ public final class Player extends Class140_Sub4 {
             var14 = this.class52.pnpcId;
             this.class52.method1161(colors, npcId, var4 == 1, look, this.renderAnimationId);
             if (npcId != var14) {
-                this.anInt2819 = 128 * this.anIntArray2767[0] + this.getSize() * 64;
-                this.anInt2829 = 128 * this.anIntArray2755[0] - -(64 * this.getSize());
+                this.xAxis = 128 * this.anIntArray2767[0] + this.getSize() * 64;
+                this.zAxis = 128 * this.anIntArray2755[0] - -(64 * this.getSize());
             }
         } catch (RuntimeException var18) {
             throw ClientErrorException.clientError(var18, "e.P(" + var1 + ',' + (buffer != null ? "{...}" : "null") + ')');
@@ -247,7 +247,7 @@ public final class Player extends Class140_Sub4 {
                     this.anInt2820 = var15.method1871();
                     Model var23;
                     if (Class140_Sub6.aBoolean2910 && (-1 == this.class52.pnpcId || NPCDefinition.getNPCDefinition(this.class52.pnpcId).aBoolean1249)) {
-                        var23 = Class140_Sub3.method1957(160, this.aBoolean2810, var14 == null ? var13 : var14, this.anInt2819, 0, this.anInt2829, 0, 1, var15, var1, null != var14 ? this.anInt2813 : this.anInt2832, this.anInt2831, 240);
+                        var23 = Class140_Sub3.method1957(160, this.aBoolean2810, var14 == null ? var13 : var14, this.xAxis, 0, this.zAxis, 0, 1, var15, var1, null != var14 ? this.anInt2813 : this.anInt2832, this.anInt2831, 240);
                         if (HDToolKit.highDetail) {
                             float var18 = HDToolKit.method1852();
                             float var19 = HDToolKit.method1839();
@@ -270,23 +270,23 @@ public final class Player extends Class140_Sub4 {
                                 if (var27.anInt1360 == 1 && 0 <= var27.anInt1359 && var27.anInt1359 < NPC.npcs.length) {
                                     NPC var24 = NPC.npcs[var27.anInt1359];
                                     if (null != var24) {
-                                        var20 = var24.anInt2819 / 32 - Class102.player.anInt2819 / 32;
-                                        var21 = -(Class102.player.anInt2829 / 32) + var24.anInt2829 / 32;
+                                        var20 = var24.xAxis / 32 - Class102.player.xAxis / 32;
+                                        var21 = -(Class102.player.zAxis / 32) + var24.zAxis / 32;
                                         this.method1979(null, var21, var15, var20, var6, var11, var1, var8, var5, var4, var2, var27.anInt1355, var3, var7);
                                     }
                                 }
 
                                 if (var27.anInt1360 == 2) {
-                                    int var29 = 4 * (-Class131.anInt1716 + var27.anInt1356) + 2 + -(Class102.player.anInt2819 / 32);
-                                    var20 = 2 + (4 * (var27.anInt1347 - Texture.anInt1152) - Class102.player.anInt2829 / 32);
+                                    int var29 = 4 * (-Class131.anInt1716 + var27.anInt1356) + 2 + -(Class102.player.xAxis / 32);
+                                    var20 = 2 + (4 * (var27.anInt1347 - Texture.anInt1152) - Class102.player.zAxis / 32);
                                     this.method1979(null, var20, var15, var29, var6, var11, var1, var8, var5, var4, var2, var27.anInt1355, var3, var7);
                                 }
 
                                 if (var27.anInt1360 == 10 && var27.anInt1359 >= 0 && var27.anInt1359 < Unsorted.players.length) {
                                     Player var28 = Unsorted.players[var27.anInt1359];
                                     if (null != var28) {
-                                        var20 = -(Class102.player.anInt2819 / 32) + var28.anInt2819 / 32;
-                                        var21 = var28.anInt2829 / 32 + -(Class102.player.anInt2829 / 32);
+                                        var20 = -(Class102.player.xAxis / 32) + var28.xAxis / 32;
+                                        var21 = var28.zAxis / 32 + -(Class102.player.zAxis / 32);
                                         this.method1979(null, var21, var15, var20, var6, var11, var1, var8, var5, var4, var2, var27.anInt1355, var3, var7);
                                     }
                                 }
@@ -331,7 +331,7 @@ public final class Player extends Class140_Sub4 {
                                 var25 = (Model) this.anObject2796;
                             }
 
-                            Objects.requireNonNull(var25).method1897(this.anInt2782 + -this.anInt2819, this.anInt2812 + -this.anInt2831, this.anInt2833 + -this.anInt2829);
+                            Objects.requireNonNull(var25).method1897(this.anInt2782 + -this.xAxis, this.anInt2812 + -this.anInt2831, this.anInt2833 + -this.zAxis);
                             if (this.anInt2806 == 512) {
                                 var25.method1900();
                             } else if (this.anInt2806 == 1024) {
@@ -371,7 +371,7 @@ public final class Player extends Class140_Sub4 {
                             var25.method1900();
                         }
 
-                        var25.method1897(-this.anInt2782 + this.anInt2819, -this.anInt2812 + this.anInt2831, -this.anInt2833 + this.anInt2829);
+                        var25.method1897(-this.anInt2782 + this.xAxis, -this.anInt2812 + this.anInt2831, -this.anInt2833 + this.zAxis);
                     }
 
                 }
@@ -386,7 +386,7 @@ public final class Player extends Class140_Sub4 {
             int var16 = var4 * var4 - -(var2 * var2);
             if (var16 >= 16 && var16 <= 360000) {
                 int var17 = (int) (325.949D * Math.atan2(var4, var2)) & 0x7FF;
-                Model var18 = Class128.method1763(var17, this.anInt2829, var13, this.anInt2819, var3, this.anInt2831);
+                Model var18 = Class128.method1763(var17, this.zAxis, var13, this.xAxis, var3, this.anInt2831);
                 if (var18 != null) {
                     if (HDToolKit.highDetail) {
                         float var19 = HDToolKit.method1852();
diff --git a/Client/src/main/java/org/runite/client/PlayerRendering.java b/Client/src/main/java/org/runite/client/PlayerRendering.java
index 0e6a38b65..468b58669 100644
--- a/Client/src/main/java/org/runite/client/PlayerRendering.java
+++ b/Client/src/main/java/org/runite/client/PlayerRendering.java
@@ -377,7 +377,7 @@ public final class PlayerRendering {
                         if (var7 != -1) {
                             SequenceDefinition var24 = SequenceDefinition.getAnimationDefinition(var7);
                             if (var24.frames != null) {
-                                Unsorted.method1470(var3.anInt2829, var24, 183921384, var3.anInt2819, var3 == Class102.player, 0);
+                                Unsorted.method1470(var3.zAxis, var24, 183921384, var3.xAxis, var3 == Class102.player, 0);
                             }
                         }
                     }
@@ -407,7 +407,7 @@ public final class PlayerRendering {
                     var3.anInt2776 = 1;
                     var3.anInt2832 = 0;
                     var3.anInt2773 = 0;
-                    Unsorted.method1470(var3.anInt2829, var4, 183921384, var3.anInt2819, Class102.player == var3, var3.anInt2832);
+                    Unsorted.method1470(var3.zAxis, var4, 183921384, var3.xAxis, Class102.player == var3, var3.anInt2832);
                 }
 
                 if (var5 == 2) {
@@ -422,7 +422,7 @@ public final class PlayerRendering {
                 var3.anInt2760 = 0;
                 var3.anInt2771 = var2;
                 if (var3.anInt2771 != -1) {
-                    Unsorted.method1470(var3.anInt2829, SequenceDefinition.getAnimationDefinition(var3.anInt2771), 183921384, var3.anInt2819, var3 == Class102.player, var3.anInt2832);
+                    Unsorted.method1470(var3.zAxis, SequenceDefinition.getAnimationDefinition(var3.anInt2771), 183921384, var3.xAxis, var3 == Class102.player, var3.anInt2832);
                 }
             }
 
@@ -484,4 +484,25 @@ public final class PlayerRendering {
             throw ClientErrorException.clientError(var8, "bg.G(" + (byte) 81 + ')');
         }
     }
+
+    static void updatePlayerAreaArray() {
+        try {
+            for (int var1 = -1; Class159.localPlayerCount > var1; ++var1) {
+                int var2;
+                if (var1 == -1) {
+                    var2 = 2047;
+                } else {
+                    var2 = Class56.localPlayerIndexes[var1];
+                }
+
+                Player var3 = Unsorted.players[var2];
+                if (var3 != null) {
+                    Unsorted.method68(var3.getSize(), var3);
+                }
+            }
+
+        } catch (RuntimeException var4) {
+            throw ClientErrorException.clientError(var4, "fk.G(" + -102 + ')');
+        }
+    }
 }
diff --git a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java
index bf314cfec..8e97971d2 100644
--- a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java
+++ b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java
@@ -73,13 +73,13 @@ final class RenderAnimationDefinition {
                         var0.anInt2802 = 1;
                         ++var0.anInt2813;
                         ++var0.anInt2793;
-                        Unsorted.method1470(var0.anInt2829, var2, 183921384, var0.anInt2819, var0 == Class102.player, var0.anInt2813);
+                        Unsorted.method1470(var0.zAxis, var2, 183921384, var0.xAxis, var0 == Class102.player, var0.anInt2813);
                     }
 
                     if (var2.frames.length <= var0.anInt2813) {
                         var0.anInt2813 = 0;
                         var0.anInt2802 = 0;
-                        Unsorted.method1470(var0.anInt2829, var2, 183921384, var0.anInt2819, Class102.player == var0, var0.anInt2813);
+                        Unsorted.method1470(var0.zAxis, var2, 183921384, var0.xAxis, Class102.player == var0, var0.anInt2813);
                     }
 
                     var0.anInt2793 = var0.anInt2813 - -1;
@@ -101,14 +101,14 @@ final class RenderAnimationDefinition {
                     } else {
                         if (0 > var0.anInt2805) {
                             var0.anInt2805 = 0;
-                            Unsorted.method1470(var0.anInt2829, var3, 183921384, var0.anInt2819, Class102.player == var0, 0);
+                            Unsorted.method1470(var0.zAxis, var3, 183921384, var0.xAxis, Class102.player == var0, 0);
                         }
 
                         ++var0.anInt2761;
                         if (var0.anInt2805 < var3.frames.length && var0.anInt2761 > var3.duration[var0.anInt2805]) {
                             ++var0.anInt2805;
                             var0.anInt2761 = 1;
-                            Unsorted.method1470(var0.anInt2829, var3, var1 ^ -183911469, var0.anInt2819, Class102.player == var0, var0.anInt2805);
+                            Unsorted.method1470(var0.zAxis, var3, var1 ^ -183911469, var0.xAxis, Class102.player == var0, var0.anInt2805);
                         }
 
                         if (var0.anInt2805 >= var3.frames.length) {
@@ -141,7 +141,7 @@ final class RenderAnimationDefinition {
                         if (var2.frames.length > var0.anInt2832 && var0.anInt2760 > var2.duration[var0.anInt2832]) {
                             var0.anInt2760 = 1;
                             ++var0.anInt2832;
-                            Unsorted.method1470(var0.anInt2829, var2, 183921384, var0.anInt2819, var0 == Class102.player, var0.anInt2832);
+                            Unsorted.method1470(var0.zAxis, var2, 183921384, var0.xAxis, var0 == Class102.player, var0.anInt2832);
                         }
 
                         if (var2.frames.length <= var0.anInt2832) {
@@ -149,7 +149,7 @@ final class RenderAnimationDefinition {
                             ++var0.anInt2773;
                             if (var2.maxLoops > var0.anInt2773) {
                                 if (var0.anInt2832 >= 0 && var0.anInt2832 < var2.frames.length) {
-                                    Unsorted.method1470(var0.anInt2829, var2, var1 ^ -183911469, var0.anInt2819, Class102.player == var0, var0.anInt2832);
+                                    Unsorted.method1470(var0.zAxis, var2, var1 ^ -183911469, var0.xAxis, Class102.player == var0, var0.anInt2832);
                                 } else {
                                     var0.anInt2771 = -1;
                                 }
@@ -190,7 +190,7 @@ final class RenderAnimationDefinition {
                                 if (var7.anInt1893 < var4.frames.length && var7.anInt1897 > var4.duration[var7.anInt1893]) {
                                     ++var7.anInt1893;
                                     var7.anInt1897 = 1;
-                                    Unsorted.method1470(var0.anInt2829, var4, 183921384, var0.anInt2819, var0 == Class102.player, var7.anInt1893);
+                                    Unsorted.method1470(var0.zAxis, var4, 183921384, var0.xAxis, var0 == Class102.player, var7.anInt1893);
                                 }
 
                                 if (var7.anInt1893 >= var4.frames.length) {
@@ -198,7 +198,7 @@ final class RenderAnimationDefinition {
                                     var7.anInt1893 -= var4.anInt1865;
                                     if (var4.maxLoops > var7.anInt1894) {
                                         if (var7.anInt1893 >= 0 && var4.frames.length > var7.anInt1893) {
-                                            Unsorted.method1470(var0.anInt2829, var4, 183921384, var0.anInt2819, Class102.player == var0, var7.anInt1893);
+                                            Unsorted.method1470(var0.zAxis, var4, 183921384, var0.xAxis, Class102.player == var0, var7.anInt1893);
                                         } else {
                                             var0.aClass145Array2809[var6] = null;
                                         }
diff --git a/Client/src/main/java/org/runite/client/Class3_Sub12.java b/Client/src/main/java/org/runite/client/Sound.java
similarity index 64%
rename from Client/src/main/java/org/runite/client/Class3_Sub12.java
rename to Client/src/main/java/org/runite/client/Sound.java
index 2b6afc967..da65318c3 100644
--- a/Client/src/main/java/org/runite/client/Class3_Sub12.java
+++ b/Client/src/main/java/org/runite/client/Sound.java
@@ -2,7 +2,7 @@ package org.runite.client;
 
 import org.rs09.client.Linkable;
 
-abstract class Class3_Sub12 extends Linkable {
+abstract class Sound extends Linkable {
 
    int anInt2374;
 
diff --git a/Client/src/main/java/org/runite/client/Sprites.java b/Client/src/main/java/org/runite/client/Sprites.java
index 8326207d6..e30f99bb7 100644
--- a/Client/src/main/java/org/runite/client/Sprites.java
+++ b/Client/src/main/java/org/runite/client/Sprites.java
@@ -8,7 +8,7 @@ final class Sprites {
     public static int hintMapEdgeSpriteArchive;
     public static AbstractIndexedSprite[] nameIconsSpriteArray;
     static boolean aBoolean337;
-    static int anInt340 = 127;
+    static int ambientVolume = 127;
     static int p11FullSpriteArchive;
     static int p12FullSpriteArchive;
     static int b12FullSpriteArchive;
diff --git a/Client/src/main/java/org/runite/client/SynthInstrument.java b/Client/src/main/java/org/runite/client/SynthInstrument.java
new file mode 100644
index 000000000..724898b8d
--- /dev/null
+++ b/Client/src/main/java/org/runite/client/SynthInstrument.java
@@ -0,0 +1,304 @@
+package org.runite.client;
+
+import org.rs09.client.util.ArrayUtils;
+
+import java.util.Random;
+
+final class SynthInstrument {
+
+    private static final int[] anIntArray1591;
+    private static final int[] anIntArray1594 = new int[32768];
+    private static final int[] output;
+    private static final int[] anIntArray1599;
+    private static final int[] anIntArray1600;
+    private static final int[] anIntArray1601;
+    private static final int[] anIntArray1602;
+    private static final int[] anIntArray1603;
+    static int[][] coefficency = new int[2][8];
+    static int inverseA0;
+
+    static {
+        Random var0 = new Random(0L);
+
+        int var1;
+        for (var1 = 0; var1 < 32768; ++var1) {
+            anIntArray1594[var1] = (var0.nextInt() & 2) - 1;
+        }
+
+        anIntArray1591 = new int[32768];
+
+        for (var1 = 0; var1 < 32768; ++var1) {
+            anIntArray1591[var1] = (int) (Math.sin((double) var1 / 5215.1903D) * 16384.0D);
+        }
+
+        output = new int[220500];
+        anIntArray1599 = new int[5];
+        anIntArray1600 = new int[5];
+        anIntArray1601 = new int[5];
+        anIntArray1603 = new int[5];
+        anIntArray1602 = new int[5];
+    }
+
+    private final int[] oscillatorAmplitudes = new int[]{0, 0, 0, 0, 0};
+    private final int[] oscillatorStartMillis = new int[]{0, 0, 0, 0, 0};
+    private final int[] anIntArray1605 = new int[]{0, 0, 0, 0, 0};
+    int duration = 500;
+    int start = 0;
+    private Envelope amplitudeModulationAmplitudeEnvelope;
+    private Envelope gateClosedPhaseEnvelope;
+    private Envelope amplitudeEnvelope;
+    private Envelope gateOpenPhaseEnvelope;
+    private Envelope phaseEnvelope;
+    private int delayTime = 0;
+    private Envelope filterEnvelope;
+    private Envelope amplitudeModulationEnvelope;
+    private int delayMix = 100;
+    private Filter filter;
+    private Envelope pitch_mod_amp_env;
+    private Envelope pitch_mod_env;
+
+    private int method1716(int var1, int var2, int var3) {
+        return var3 == 1 ? ((var1 & 32767) < 16384 ? var2 : -var2) : (var3 == 2 ? anIntArray1591[var1 & 32767] * var2 >> 14 : (var3 == 3 ? ((var1 & 32767) * var2 >> 14) - var2 : (var3 == 4 ? anIntArray1594[var1 / 2607 & 32767] * var2 : 0)));
+    }
+
+    final int[] synthesize(int num_samples, int dt) {
+        ArrayUtils.zero(output, 0, num_samples);
+        if (dt >= 10) {
+            double sample_rate = (double) num_samples / ((double) dt + 0.0D);
+            this.phaseEnvelope.reset();
+            this.amplitudeEnvelope.reset();
+            int pm_phase_delta = 0;
+            int pm_phase_delta_base = 0;
+            int pm_phase = 0;
+            if (this.pitch_mod_env != null) {
+                this.pitch_mod_env.reset();
+                this.pitch_mod_amp_env.reset();
+                pm_phase_delta = (int) ((double) (this.pitch_mod_env.maxInterval - this.pitch_mod_env.minInterval) * 32.768D / sample_rate);
+                pm_phase_delta_base = (int) ((double) this.pitch_mod_env.minInterval * 32.768D / sample_rate);
+            }
+
+            int var8 = 0;
+            int var9 = 0;
+            int var10 = 0;
+            if (this.amplitudeModulationEnvelope != null) {
+                this.amplitudeModulationEnvelope.reset();
+                this.amplitudeModulationAmplitudeEnvelope.reset();
+                var8 = (int) ((double) (this.amplitudeModulationEnvelope.maxInterval - this.amplitudeModulationEnvelope.minInterval) * 32.768D / sample_rate);
+                var9 = (int) ((double) this.amplitudeModulationEnvelope.minInterval * 32.768D / sample_rate);
+            }
+
+            int var11;
+            for (var11 = 0; var11 < 5; ++var11) {
+                if (this.oscillatorAmplitudes[var11] != 0) {
+                    anIntArray1601[var11] = 0;
+                    anIntArray1602[var11] = (int) ((double) this.oscillatorStartMillis[var11] * sample_rate);
+                    anIntArray1603[var11] = (this.oscillatorAmplitudes[var11] << 14) / 100;
+                    anIntArray1599[var11] = (int) ((double) (this.phaseEnvelope.maxInterval - this.phaseEnvelope.minInterval) * 32.768D * Math.pow(1.0057929410678534D, this.anIntArray1605[var11]) / sample_rate);
+                    anIntArray1600[var11] = (int) ((double) this.phaseEnvelope.minInterval * 32.768D / sample_rate);
+                }
+            }
+
+            int var12;
+            int var13;
+            int var14;
+            int delay;
+            for (var11 = 0; var11 < num_samples; ++var11) {
+                var12 = this.phaseEnvelope.nextLevel(num_samples);
+                var13 = this.amplitudeEnvelope.nextLevel(num_samples);
+                if (this.pitch_mod_env != null) {
+                    var14 = this.pitch_mod_env.nextLevel(num_samples);
+                    delay = this.pitch_mod_amp_env.nextLevel(num_samples);
+                    var12 += this.method1716(pm_phase, delay, this.pitch_mod_env.waveTable) >> 1;
+                    pm_phase += (var14 * pm_phase_delta >> 16) + pm_phase_delta_base;
+                }
+
+                if (this.amplitudeModulationEnvelope != null) {
+                    var14 = this.amplitudeModulationEnvelope.nextLevel(num_samples);
+                    delay = this.amplitudeModulationAmplitudeEnvelope.nextLevel(num_samples);
+                    var13 = var13 * ((this.method1716(var10, delay, this.amplitudeModulationEnvelope.waveTable) >> 1) + 32768) >> 15;
+                    var10 += (var14 * var8 >> 16) + var9;
+                }
+
+                for (var14 = 0; var14 < 5; ++var14) {
+                    if (this.oscillatorAmplitudes[var14] != 0) {
+                        delay = var11 + anIntArray1602[var14];
+                        if (delay < num_samples) {
+                            output[delay] += this.method1716(anIntArray1601[var14], var13 * anIntArray1603[var14] >> 15, this.phaseEnvelope.waveTable);
+                            anIntArray1601[var14] += (var12 * anIntArray1599[var14] >> 16) + anIntArray1600[var14];
+                        }
+                    }
+                }
+            }
+
+            int var16;
+            if (this.gateClosedPhaseEnvelope != null) {
+                this.gateClosedPhaseEnvelope.reset();
+                this.gateOpenPhaseEnvelope.reset();
+                var11 = 0;
+
+                for (var14 = 0; var14 < num_samples; ++var14) {
+                    delay = this.gateClosedPhaseEnvelope.nextLevel(num_samples);
+                    var16 = this.gateOpenPhaseEnvelope.nextLevel(num_samples);
+                    var12 = this.gateClosedPhaseEnvelope.minInterval + ((this.gateClosedPhaseEnvelope.maxInterval - this.gateClosedPhaseEnvelope.minInterval) * delay >> 8);
+                    var11 += 256;
+                    if (var11 >= var12) {
+                        var11 = 0;
+                    } else {
+                        output[var14] = 0;
+                    }
+                }
+            }
+
+            if (this.delayTime > 0 && this.delayMix > 0) {
+                var11 = (int) ((double) this.delayTime * sample_rate);
+
+                for (var12 = var11; var12 < num_samples; ++var12) {
+                    output[var12] += output[var12 - var11] * this.delayMix / 100;
+                }
+            }
+
+            if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) {
+                this.filterEnvelope.reset();
+                var11 = this.filterEnvelope.nextLevel(num_samples + 1);
+                var12 = this.filter.compute(0, (float) var11 / 65536.0F);
+                var13 = this.filter.compute(1, (float) var11 / 65536.0F);
+                if (num_samples >= var12 + var13) {
+                    var14 = 0;
+                    delay = var13;
+                    if (var13 > num_samples - var12) {
+                        delay = num_samples - var12;
+                    }
+
+                    int var17;
+                    while (var14 < delay) {
+                        var16 = (int) ((long) output[var14 + var12] * (long) inverseA0 >> 16);
+
+                        for (var17 = 0; var17 < var12; ++var17) {
+                            var16 += (int) ((long) output[var14 + var12 - 1 - var17] * (long) coefficency[0][var17] >> 16);
+                        }
+
+                        for (var17 = 0; var17 < var14; ++var17) {
+                            var16 -= (int) ((long) output[var14 - 1 - var17] * (long) coefficency[1][var17] >> 16);
+                        }
+
+                        output[var14] = var16;
+                        var11 = this.filterEnvelope.nextLevel(num_samples + 1);
+                        ++var14;
+                    }
+
+                    delay = 128;
+
+                    while (true) {
+                        if (delay > num_samples - var12) {
+                            delay = num_samples - var12;
+                        }
+
+                        while (var14 < delay) {
+                            var16 = (int) ((long) output[var14 + var12] * (long) inverseA0 >> 16);
+
+                            for (var17 = 0; var17 < var12; ++var17) {
+                                var16 += (int) ((long) output[var14 + var12 - 1 - var17] * (long) coefficency[0][var17] >> 16);
+                            }
+
+                            for (var17 = 0; var17 < var13; ++var17) {
+                                var16 -= (int) ((long) output[var14 - 1 - var17] * (long) coefficency[1][var17] >> 16);
+                            }
+
+                            output[var14] = var16;
+                            var11 = this.filterEnvelope.nextLevel(num_samples + 1);
+                            ++var14;
+                        }
+
+                        if (var14 >= num_samples - var12) {
+                            while (var14 < num_samples) {
+                                var16 = 0;
+
+                                for (var17 = var14 + var12 - num_samples; var17 < var12; ++var17) {
+                                    var16 += (int) ((long) output[var14 + var12 - 1 - var17] * (long) coefficency[0][var17] >> 16);
+                                }
+
+                                for (var17 = 0; var17 < var13; ++var17) {
+                                    var16 -= (int) ((long) output[var14 - 1 - var17] * (long) coefficency[1][var17] >> 16);
+                                }
+
+                                output[var14] = var16;
+                                this.filterEnvelope.nextLevel(num_samples + 1);
+                                ++var14;
+                            }
+                            break;
+                        }
+
+                        var12 = this.filter.compute(0, (float) var11 / 65536.0F);
+                        var13 = this.filter.compute(1, (float) var11 / 65536.0F);
+                        delay += 128;
+                    }
+                }
+            }
+
+            for (var11 = 0; var11 < num_samples; ++var11) {
+                if (output[var11] < -32768) {
+                    output[var11] = -32768;
+                }
+
+                if (output[var11] > 32767) {
+                    output[var11] = 32767;
+                }
+            }
+
+        }
+        return output;
+    }
+
+    final void decode(DataBuffer buffer) {
+        this.phaseEnvelope = new Envelope();
+        this.phaseEnvelope.decode(buffer);
+        this.amplitudeEnvelope = new Envelope();
+        this.amplitudeEnvelope.decode(buffer);
+
+        int phaseModulationWaveTable = buffer.readUnsignedByte();
+        if (phaseModulationWaveTable != 0) {
+            --buffer.index;
+            this.pitch_mod_env = new Envelope();
+            this.pitch_mod_env.decode(buffer);
+            this.pitch_mod_amp_env = new Envelope();
+            this.pitch_mod_amp_env.decode(buffer);
+        }
+
+        int amplitudeModulationWaveTable = buffer.readUnsignedByte();
+        if (amplitudeModulationWaveTable != 0) {
+            --buffer.index;
+            this.amplitudeModulationEnvelope = new Envelope();
+            this.amplitudeModulationEnvelope.decode(buffer);
+            this.amplitudeModulationAmplitudeEnvelope = new Envelope();
+            this.amplitudeModulationAmplitudeEnvelope.decode(buffer);
+        }
+
+        int gateWaveTable = buffer.readUnsignedByte();
+        if (gateWaveTable != 0) {
+            --buffer.index;
+            this.gateClosedPhaseEnvelope = new Envelope();
+            this.gateClosedPhaseEnvelope.decode(buffer);
+            this.gateOpenPhaseEnvelope = new Envelope();
+            this.gateOpenPhaseEnvelope.decode(buffer);
+        }
+
+        for (int var3 = 0; var3 < 10; ++var3) {
+            int amplitude = buffer.getSmart();
+            if (amplitude == 0) {
+                break;
+            }
+
+            this.oscillatorAmplitudes[var3] = amplitude;
+            this.anIntArray1605[var3] = buffer.getByteOrShort();
+            this.oscillatorStartMillis[var3] = buffer.getSmart();
+        }
+
+        this.delayTime = buffer.getSmart();
+        this.delayMix = buffer.getSmart();
+        this.duration = buffer.readUnsignedShort();
+        this.start = buffer.readUnsignedShort();
+        this.filter = new Filter();
+        this.filterEnvelope = new Envelope();
+        this.filter.decode(buffer, this.filterEnvelope);
+    }
+}
diff --git a/Client/src/main/java/org/runite/client/SynthSound.java b/Client/src/main/java/org/runite/client/SynthSound.java
new file mode 100644
index 000000000..2006fb520
--- /dev/null
+++ b/Client/src/main/java/org/runite/client/SynthSound.java
@@ -0,0 +1,101 @@
+package org.runite.client;
+
+final class SynthSound {
+
+    private final SynthInstrument[] synthInstruments = new SynthInstrument[10];
+    private int end;
+    private int start;
+
+    private SynthSound(DataBuffer buffer) {
+        for (int var2 = 0; var2 < 10; ++var2) {
+            int waveTable = buffer.readUnsignedByte();
+            if (waveTable != 0) {
+                --buffer.index;
+                this.synthInstruments[var2] = new SynthInstrument();
+                this.synthInstruments[var2].decode(buffer);
+            }
+        }
+
+        this.start = buffer.readUnsignedShort();
+        this.end = buffer.readUnsignedShort();
+    }
+
+    static SynthSound create(CacheIndex var0, int var1, int var2) {
+        byte[] var3 = var0.getFile(var1, var2);
+        return var3 == null ? null : new SynthSound(new DataBuffer(var3));
+    }
+
+    private byte[] getSamples() {
+        int var1 = 0;
+
+        int var2;
+        for (var2 = 0; var2 < 10; ++var2) {
+            if (this.synthInstruments[var2] != null && this.synthInstruments[var2].duration + this.synthInstruments[var2].start > var1) {
+                var1 = this.synthInstruments[var2].duration + this.synthInstruments[var2].start;
+            }
+        }
+
+        if (var1 == 0) {
+            return new byte[0];
+        } else {
+            var2 = 22050 * var1 / 1000;
+            byte[] var3 = new byte[var2];
+
+            for (int var4 = 0; var4 < 10; ++var4) {
+                if (this.synthInstruments[var4] != null) {
+                    int var5 = this.synthInstruments[var4].duration * 22050 / 1000;
+                    int var6 = this.synthInstruments[var4].start * 22050 / 1000;
+                    int[] var7 = this.synthInstruments[var4].synthesize(var5, this.synthInstruments[var4].duration);
+
+                    for (int var8 = 0; var8 < var5; ++var8) {
+                        int var9 = var3[var8 + var6] + (var7[var8] >> 8);
+                        if ((var9 + 128 & -256) != 0) {
+                            var9 = var9 >> 31 ^ 127;
+                        }
+
+                        var3[var8 + var6] = (byte) var9;
+                    }
+                }
+            }
+
+            return var3;
+        }
+    }
+
+    final PcmSound toPCMSound() {
+        byte[] var1 = this.getSamples();
+        return new PcmSound(var1, 22050 * this.start / 1000, 22050 * this.end / 1000);
+    }
+
+    final int getStart() {
+        int start = 9999999;
+
+        for (int var2 = 0; var2 < 10; ++var2) {
+            if (this.synthInstruments[var2] != null && this.synthInstruments[var2].start / 20 < start) {
+                start = this.synthInstruments[var2].start / 20;
+            }
+        }
+
+        if (this.start < this.end && this.start / 20 < start) {
+            start = this.start / 20;
+        }
+
+        if (start == 9999999 || start == 0) {
+            return 0;
+        } else {
+            for (int var2 = 0; var2 < 10; ++var2) {
+                if (this.synthInstruments[var2] != null) {
+                    this.synthInstruments[var2].start -= start * 20;
+                }
+            }
+
+            if (this.start < this.end) {
+                this.start -= start * 20;
+                this.end -= start * 20;
+            }
+
+            return start;
+        }
+    }
+
+}
diff --git a/Client/src/main/java/org/runite/client/TextureOperation1.java b/Client/src/main/java/org/runite/client/TextureOperation1.java
index e0f6b8007..a38d40277 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation1.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation1.java
@@ -80,8 +80,8 @@ final class TextureOperation1 extends TextureOperation {
          Class3_Sub28_Sub5.anInt3590 = -1;
          TextureOperation20.method229(Class161.anInt2027);
          Class102.player = new Player();
-         Class102.player.anInt2829 = 3000;
-         Class102.player.anInt2819 = 3000;
+         Class102.player.zAxis = 3000;
+         Class102.player.xAxis = 3000;
          if(HDToolKit.highDetail) {
             if(Class133.anInt1753 == 2) {
                NPC.anInt3995 = Unsorted.anInt30 << 7;
diff --git a/Client/src/main/java/org/runite/client/TextureOperation10.java b/Client/src/main/java/org/runite/client/TextureOperation10.java
index 2923811c1..9bea24269 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation10.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation10.java
@@ -326,8 +326,8 @@ final class TextureOperation10 extends TextureOperation {
       try {
          PacketParser.inTutorialIsland = 0;
 
-         int var1 = Class131.anInt1716 + (Class102.player.anInt2819 >> 7);
-         int var2 = (Class102.player.anInt2829 >> 7) - -Texture.anInt1152;
+         int var1 = Class131.anInt1716 + (Class102.player.xAxis >> 7);
+         int var2 = (Class102.player.zAxis >> 7) - -Texture.anInt1152;
          if(var1 >= 3053 && var1 <= 3156 && var2 >= 3056 && var2 <= 3136) {
             PacketParser.inTutorialIsland = 1;
          }
diff --git a/Client/src/main/java/org/runite/client/TextureOperation20.java b/Client/src/main/java/org/runite/client/TextureOperation20.java
index 032ed3946..d3a04fa88 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation20.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation20.java
@@ -428,13 +428,13 @@ final class TextureOperation20 extends TextureOperation {
                if(Class143.gameStage == 30) {
                   MouseListeningClass.method2087();
                   Class115.method1713();
-                  Class3_Sub8.method132();
+                  AudioHandler.method132();
                   ++AbstractSprite.anInt3699;
                   if(AbstractSprite.anInt3699 > 750) {
                      breakClientConnection();
                   } else {
-                     Class38.method1028();
-                     Class60.method1207();
+                     PlayerRendering.updatePlayerAreaArray();
+                     NPCRendering.updateNPCAreaArray();
                      TextureOperation34.method189();
                      if(Class3_Sub28_Sub3.aClass11_3551 != null) {
                         Unsorted.method848();
diff --git a/Client/src/main/java/org/runite/client/TextureOperation26.java b/Client/src/main/java/org/runite/client/TextureOperation26.java
index 8c976a6dd..e44d59dc7 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation26.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation26.java
@@ -139,7 +139,7 @@ final class TextureOperation26 extends TextureOperation {
 
    static void method196() {
       try {
-         Class3_Sub8.anIntArray3083 = null;
+         AudioHandler.soundEffectCoordinates = null;
 
       } catch (RuntimeException var2) {
          throw ClientErrorException.clientError(var2, "ca.B(" + ')');
diff --git a/Client/src/main/java/org/runite/client/TextureOperation32.java b/Client/src/main/java/org/runite/client/TextureOperation32.java
index e067dee7c..bac5934f3 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation32.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation32.java
@@ -109,8 +109,8 @@ final class TextureOperation32 extends TextureOperation {
                if(Class44.anInt719 >= var2.anInt2925) {
                   if(var2.anInt2919 > 0) {
                      NPC var3 = NPC.npcs[-1 + var2.anInt2919];
-                     if(null != var3 && var3.anInt2819 >= 0 && 13312 > var3.anInt2819 && var3.anInt2829 >= 0 && var3.anInt2829 < 13312) {
-                        var2.method2024(var3.anInt2829, Class44.anInt719, Class121.method1736(var2.anInt2907, 1, var3.anInt2819, var3.anInt2829) + -var2.anInt2903, var3.anInt2819);
+                     if(null != var3 && var3.xAxis >= 0 && 13312 > var3.xAxis && var3.zAxis >= 0 && var3.zAxis < 13312) {
+                        var2.method2024(var3.zAxis, Class44.anInt719, Class121.method1736(var2.anInt2907, 1, var3.xAxis, var3.zAxis) + -var2.anInt2903, var3.xAxis);
                      }
                   }
 
@@ -123,8 +123,8 @@ final class TextureOperation32 extends TextureOperation {
                         var6 = Unsorted.players[var4];
                      }
 
-                     if(null != var6 && var6.anInt2819 >= 0 && var6.anInt2819 < 13312 && var6.anInt2829 >= 0 && var6.anInt2829 < 13312) {
-                        var2.method2024(var6.anInt2829, Class44.anInt719, Class121.method1736(var2.anInt2907, 1, var6.anInt2819, var6.anInt2829) - var2.anInt2903, var6.anInt2819);
+                     if(null != var6 && var6.xAxis >= 0 && var6.xAxis < 13312 && var6.zAxis >= 0 && var6.zAxis < 13312) {
+                        var2.method2024(var6.zAxis, Class44.anInt719, Class121.method1736(var2.anInt2907, 1, var6.xAxis, var6.zAxis) - var2.anInt2903, var6.xAxis);
                      }
                   }
 
diff --git a/Client/src/main/java/org/runite/client/TextureOperation36.java b/Client/src/main/java/org/runite/client/TextureOperation36.java
index 0f097b34a..ae55018cb 100644
--- a/Client/src/main/java/org/runite/client/TextureOperation36.java
+++ b/Client/src/main/java/org/runite/client/TextureOperation36.java
@@ -135,14 +135,14 @@ public final class TextureOperation36 extends TextureOperation {
                 int var37;
                 if(var14 == 1) {
                    NPC var31 = NPC.npcs[var15];
-                   if((var31.definition.size & 1) == 0 && (127 & var31.anInt2819) == 0 && (var31.anInt2829 & 127) == 0 || 1 == (var31.definition.size & 1) && (127 & var31.anInt2819) == 64 && (var31.anInt2829 & 127) == 64) {
-                      var33 = var31.anInt2819 - -64 - 64 * var31.definition.size;
-                      var18 = -((-1 + var31.definition.size) * 64) + var31.anInt2829;
+                   if((var31.definition.size & 1) == 0 && (127 & var31.xAxis) == 0 && (var31.zAxis & 127) == 0 || 1 == (var31.definition.size & 1) && (127 & var31.xAxis) == 64 && (var31.zAxis & 127) == 64) {
+                      var33 = var31.xAxis - -64 - 64 * var31.definition.size;
+                      var18 = -((-1 + var31.definition.size) * 64) + var31.zAxis;
 
                       for(var37 = 0; var37 < Class163.localNPCCount; ++var37) {
                          var36 = NPC.npcs[Class15.localNPCIndexes[var37]];
-                         var21 = -(var36.definition.size * 64) - -64 + var36.anInt2819;
-                         var22 = var36.anInt2829 + -(var36.definition.size * 64) - -64;
+                         var21 = -(var36.definition.size * 64) - -64 + var36.xAxis;
+                         var22 = var36.zAxis + -(var36.definition.size * 64) - -64;
                          if(var31 != var36 && var33 <= var21 && var31.definition.size - (-var33 + var21 >> 7) >= var36.definition.size && var18 <= var22 && var36.definition.size <= -(-var18 + var22 >> 7) + var31.definition.size) {
                             Unsorted.drawNpcRightClickOptions(var36.definition, var12, -126, Class15.localNPCIndexes[var37], var27);
                          }
@@ -150,8 +150,8 @@ public final class TextureOperation36 extends TextureOperation {
 
                       for(var37 = 0; var37 < Class159.localPlayerCount; ++var37) {
                          var38 = Unsorted.players[Class56.localPlayerIndexes[var37]];
-                         var21 = var38.anInt2819 + 64 + -(64 * var38.getSize());
-                         var22 = var38.anInt2829 - (var38.getSize() * 64 + -64);
+                         var21 = var38.xAxis + 64 + -(64 * var38.getSize());
+                         var22 = var38.zAxis - (var38.getSize() * 64 + -64);
                          if(var21 >= var33 && var31.definition.size - (var21 - var33 >> 7) >= var38.getSize() && var18 <= var22 && var38.getSize() <= -(-var18 + var22 >> 7) + var31.definition.size) {
                             TextureOperation13.method312(Class56.localPlayerIndexes[var37], 5, var27, var38, var12);
                          }
@@ -163,14 +163,14 @@ public final class TextureOperation36 extends TextureOperation {
 
                 if(var14 == 0) {
                    Player var30 = Unsorted.players[var15];
-                   if((127 & var30.anInt2819) == 64 && 64 == (127 & var30.anInt2829)) {
-                      var33 = var30.anInt2819 + -(64 * (-1 + var30.getSize()));
-                      var18 = var30.anInt2829 + 64 + -(var30.getSize() * 64);
+                   if((127 & var30.xAxis) == 64 && 64 == (127 & var30.zAxis)) {
+                      var33 = var30.xAxis + -(64 * (-1 + var30.getSize()));
+                      var18 = var30.zAxis + 64 + -(var30.getSize() * 64);
 
                       for(var37 = 0; var37 < Class163.localNPCCount; ++var37) {
                          var36 = NPC.npcs[Class15.localNPCIndexes[var37]];
-                         var21 = var36.anInt2819 + -(var36.definition.size * 64) - -64;
-                         var22 = var36.anInt2829 - 64 * var36.definition.size - -64;
+                         var21 = var36.xAxis + -(var36.definition.size * 64) - -64;
+                         var22 = var36.zAxis - 64 * var36.definition.size - -64;
                          if(var21 >= var33 && var36.definition.size <= -(var21 - var33 >> 7) + var30.getSize() && var18 <= var22 && -(-var18 + var22 >> 7) + var30.getSize() >= var36.definition.size) {
                             Unsorted.drawNpcRightClickOptions(var36.definition, var12, -121, Class15.localNPCIndexes[var37], var27);
                          }
@@ -178,8 +178,8 @@ public final class TextureOperation36 extends TextureOperation {
 
                       for(var37 = 0; var37 < Class159.localPlayerCount; ++var37) {
                          var38 = Unsorted.players[Class56.localPlayerIndexes[var37]];
-                         var21 = var38.anInt2819 - (var38.getSize() + -1) * 64;
-                         var22 = var38.anInt2829 - (-64 + 64 * var38.getSize());
+                         var21 = var38.xAxis - (var38.getSize() + -1) * 64;
+                         var22 = var38.zAxis - (-64 + 64 * var38.getSize());
                          if(var38 != var30 && var21 >= var33 && var38.getSize() <= var30.getSize() - (var21 - var33 >> 7) && var18 <= var22 && -(var22 + -var18 >> 7) + var30.getSize() >= var38.getSize()) {
                             TextureOperation13.method312(Class56.localPlayerIndexes[var37], 9, var27, var38, var12);
                          }
diff --git a/Client/src/main/java/org/runite/client/Unsorted.java b/Client/src/main/java/org/runite/client/Unsorted.java
index fa71534bc..9df84e4be 100644
--- a/Client/src/main/java/org/runite/client/Unsorted.java
+++ b/Client/src/main/java/org/runite/client/Unsorted.java
@@ -24,11 +24,9 @@ public class Unsorted {
     public static int anInt2148 = 0;
     public static boolean aBoolean2150;
     public static boolean aBoolean2154;
-    public static int[] anIntArray2157 = new int[50];
     public static int[] anIntArray882 = new int[200];
     public static int anInt144;
     public static int anInt136 = 0;
-    public static int anInt120 = 255;
     public static byte[][][] aByteArrayArrayArray113 = new byte[4][104][104];
     public static int[] anIntArray39;
     public static int anInt40 = 0;
@@ -176,8 +174,8 @@ public class Unsorted {
 
     static void method2086() {
         try {
-            int var1 = Class102.player.anInt2819 + TextureOperation20.anInt3216;
-            int var2 = Class102.player.anInt2829 - -anInt42;
+            int var1 = Class102.player.xAxis + TextureOperation20.anInt3216;
+            int var2 = Class102.player.zAxis - -anInt42;
             if (-var1 + anInt3155 < -500 || -var1 + anInt3155 > 500 || anInt942 + -var2 < -500 || -var2 + anInt942 > 500) {
                 anInt3155 = var1;
                 anInt942 = var2;
@@ -864,23 +862,23 @@ public class Unsorted {
                 Class140_Sub2.method1950(var2);
             }
 
-            if (var2.anInt2819 < 128 || var2.anInt2829 < 128 || var2.anInt2819 >= 13184 || var2.anInt2829 >= 13184) {
+            if (var2.xAxis < 128 || var2.zAxis < 128 || var2.xAxis >= 13184 || var2.zAxis >= 13184) {
                 var2.anInt2771 = -1;
                 var2.anInt2842 = -1;
                 var2.anInt2800 = 0;
                 var2.anInt2790 = 0;
-                var2.anInt2819 = 128 * var2.anIntArray2767[0] - -(64 * var2.getSize());
-                var2.anInt2829 = var2.anIntArray2755[0] * 128 + var2.getSize() * 64;
+                var2.xAxis = 128 * var2.anIntArray2767[0] - -(64 * var2.getSize());
+                var2.zAxis = var2.anIntArray2755[0] * 128 + var2.getSize() * 64;
                 var2.method1973(2279 + -2395);
             }
 
-            if (var2 == Class102.player && (var2.anInt2819 < 1536 || var2.anInt2829 < 1536 || var2.anInt2819 >= 11776 || var2.anInt2829 >= 11776)) {
+            if (var2 == Class102.player && (var2.xAxis < 1536 || var2.zAxis < 1536 || var2.xAxis >= 11776 || var2.zAxis >= 11776)) {
                 var2.anInt2842 = -1;
                 var2.anInt2800 = 0;
                 var2.anInt2790 = 0;
                 var2.anInt2771 = -1;
-                var2.anInt2819 = var2.anIntArray2767[0] * 128 + var2.getSize() * 64;
-                var2.anInt2829 = 128 * var2.anIntArray2755[0] + 64 * var2.getSize();
+                var2.xAxis = var2.anIntArray2767[0] * 128 + var2.getSize() * 64;
+                var2.zAxis = 128 * var2.anIntArray2755[0] + 64 * var2.getSize();
                 var2.method1973(-98);
             }
 
@@ -912,14 +910,14 @@ public class Unsorted {
                             AudioHandler.soundEffectHandler(var8, var7, 0);
                         }
 
-                    } else if (0 != Sprites.anInt340) {
-                        Class3_Sub25.anIntArray2550[AudioHandler.currentSoundEffectCount] = var7;
-                        Class166.anIntArray2068[AudioHandler.currentSoundEffectCount] = var8;
+                    } else if (0 != Sprites.ambientVolume) {
+                        AudioHandler.soundEffectIDs[AudioHandler.currentSoundEffectCount] = var7;
+                        AudioHandler.soundEffectVolumeArray[AudioHandler.currentSoundEffectCount] = var8;
                         int var11 = (-64 + var0) / 128;
                         var10 = (var3 + -64) / 128;
-                        anIntArray2157[AudioHandler.currentSoundEffectCount] = 0;
-                        Class102.aClass135Array2131[AudioHandler.currentSoundEffectCount] = null;
-                        Class3_Sub8.anIntArray3083[AudioHandler.currentSoundEffectCount] = var9 + (var10 << 16) + (var11 << 8);
+                        AudioHandler.anIntArray2157[AudioHandler.currentSoundEffectCount] = 0;
+                        AudioHandler.soundEffects[AudioHandler.currentSoundEffectCount] = null;
+                        AudioHandler.soundEffectCoordinates[AudioHandler.currentSoundEffectCount] = var9 + (var10 << 16) + (var11 << 8);
                         if (var2 != 183921384) {
                             aClass33_1238 = null;
                         }
@@ -1030,21 +1028,6 @@ public class Unsorted {
         }
     }
 
-    public static void method2099(int var1, CacheIndex var3, int var5) {
-        try {
-            Class101.aClass153_1423 = var3;
-            Class132.anInt1741 = 0;
-            TextureOperation8.anInt3463 = var1;
-            aBoolean2311 = false;
-            anInt154 = 1;
-            GraphicDefinition.anInt546 = 2;
-
-            TextureOperation36.anInt3423 = var5;
-        } catch (RuntimeException var8) {
-            throw ClientErrorException.clientError(var8, "v.Q(" + true + ',' + var1 + ',' + 0 + ',' + (var3 != null ? "{...}" : "null") + ',' + false + ',' + var5 + ',' + 2 + ')');
-        }
-    }
-
     public static boolean method2103(int var0, int var1) {
         try {
             return var1 >= -78 || (var0 == 198 || 230 == var0 || var0 == 156 || var0 == 140 || 223 == var0);
@@ -1171,7 +1154,7 @@ public class Unsorted {
                     var3.anInt2760 = 0;
                     var3.anInt2773 = 0;
                     var3.anInt2828 = plane;
-                    method1470(var3.anInt2829, var4, 183921384, var3.anInt2819, false, var3.anInt2832);
+                    method1470(var3.zAxis, var4, 183921384, var3.xAxis, false, var3.anInt2832);
                 }
 
                 if (var5 == 2) {
@@ -1186,7 +1169,7 @@ public class Unsorted {
                 var3.anInt2811 = var3.anInt2816;
                 var3.anInt2832 = 0;
                 if (var3.anInt2771 != -1) {
-                    method1470(var3.anInt2829, SequenceDefinition.getAnimationDefinition(var3.anInt2771), dummy + 183921345, var3.anInt2819, false, var3.anInt2832);
+                    method1470(var3.zAxis, SequenceDefinition.getAnimationDefinition(var3.anInt2771), dummy + 183921345, var3.xAxis, false, var3.anInt2832);
                 }
             }
 
@@ -2123,9 +2106,9 @@ public class Unsorted {
                     for (var11 = 0; var11 < 32768; ++var11) {
                         var12 = NPC.npcs[var11];
                         if (null != var12) {
-                            var12.anInt2819 -= 128 * var9;
-                            var12.anInt2829 -= 128 * var10;
-                            if (var12.anInt2819 >= 0 && var12.anInt2819 <= 13184 && var12.anInt2829 >= 0 && var12.anInt2829 <= 13184) {
+                            var12.xAxis -= 128 * var9;
+                            var12.zAxis -= 128 * var10;
+                            if (var12.xAxis >= 0 && var12.xAxis <= 13184 && var12.zAxis >= 0 && var12.zAxis <= 13184) {
                                 for (var13 = 0; 10 > var13; ++var13) {
                                     var12.anIntArray2767[var13] -= var9;
                                     var12.anIntArray2755[var13] -= var10;
@@ -2147,8 +2130,8 @@ public class Unsorted {
                                 var12.anIntArray2755[var13] -= var10;
                             }
 
-                            var12.anInt2819 -= 128 * var9;
-                            var12.anInt2829 -= var10 * 128;
+                            var12.xAxis -= 128 * var9;
+                            var12.zAxis -= var10 * 128;
                         }
                     }
                 }
@@ -2161,8 +2144,8 @@ public class Unsorted {
                             var23.anIntArray2755[var13] -= var10;
                         }
 
-                        var23.anInt2819 -= 128 * var9;
-                        var23.anInt2829 -= 128 * var10;
+                        var23.xAxis -= 128 * var9;
+                        var23.zAxis -= 128 * var10;
                     }
                 }
 
@@ -2869,18 +2852,18 @@ public class Unsorted {
                         var6 += -var1.anInt2307 + var4;
                     }
 
-                    if (0 != var1.anInt2328 && var6 - 64 <= var1.anInt2328 && 0 != Sprites.anInt340 && var2 == var1.anInt2314) {
+                    if (0 != var1.anInt2328 && var6 - 64 <= var1.anInt2328 && 0 != Sprites.ambientVolume && var2 == var1.anInt2314) {
                         var6 -= 64;
                         if (var6 < 0) {
                             var6 = 0;
                         }
 
-                        int var7 = (-var6 + var1.anInt2328) * Sprites.anInt340 / var1.anInt2328;
+                        int var7 = (-var6 + var1.anInt2328) * Sprites.ambientVolume / var1.anInt2328;
                         if (var1.aClass3_Sub24_Sub1_2312 == null) {
                             if (var1.anInt2332 >= 0) {
-                                Class135 var8 = Class135.method1811(CacheIndex.soundFXIndex, var1.anInt2332, 0);
+                                SynthSound var8 = SynthSound.create(CacheIndex.soundFXIndex, var1.anInt2332, 0);
                                 if (null != var8) {
-                                    Class3_Sub12_Sub1 var9 = var8.method1812().method151(Class27.aClass157_524);
+                                    PcmSound var9 = var8.toPCMSound().method151(Class27.resampler);
                                     Class3_Sub24_Sub1 var10 = Class3_Sub24_Sub1.method437(var9, var7);
                                     Objects.requireNonNull(var10).method429(-1);
                                     Class3_Sub26.aClass3_Sub24_Sub2_2563.method457(var10);
@@ -2898,9 +2881,9 @@ public class Unsorted {
                             }
                         } else if (var1.anIntArray2333 != null && ((var1.anInt2316 -= var3) <= 0)) {
                             int var13 = (int) ((double) var1.anIntArray2333.length * Math.random());
-                            Class135 var14 = Class135.method1811(CacheIndex.soundFXIndex, var1.anIntArray2333[var13], 0);
+                            SynthSound var14 = SynthSound.create(CacheIndex.soundFXIndex, var1.anIntArray2333[var13], 0);
                             if (null != var14) {
-                                Class3_Sub12_Sub1 var15 = var14.method1812().method151(Class27.aClass157_524);
+                                PcmSound var15 = var14.toPCMSound().method151(Class27.resampler);
                                 Class3_Sub24_Sub1 var11 = Class3_Sub24_Sub1.method437(var15, var7);
                                 Objects.requireNonNull(var11).method429(0);
                                 Class3_Sub26.aClass3_Sub24_Sub2_2563.method457(var11);
@@ -2952,13 +2935,13 @@ public class Unsorted {
                     }
                 }
 
-                int var18 = var1.anInt2819;
-                int var4 = var1.anInt2829;
+                int var18 = var1.xAxis;
+                int var4 = var1.zAxis;
                 int var5 = var1.anIntArray2767[-1 + var1.anInt2816] * 128 - -(var1.getSize() * 64);
                 int var6 = 128 * var1.anIntArray2755[-1 + var1.anInt2816] - -(var1.getSize() * 64);
                 if (var5 + -var18 > 256 || -var18 + var5 < -256 || var6 - var4 > 256 || -256 > var6 - var4) {
-                    var1.anInt2819 = var5;
-                    var1.anInt2829 = var6;
+                    var1.xAxis = var5;
+                    var1.zAxis = var6;
                     return;
                 }
 
@@ -3077,9 +3060,9 @@ public class Unsorted {
                 if (var2.movement_acceleration != -1) {
                     var9 <<= 7;
                     if (var1.anInt2816 == 1) {
-                        int var13 = (var1.anInt2819 <= var5 ? var5 - var1.anInt2819 : -var5 + var1.anInt2819) << 7;
+                        int var13 = (var1.xAxis <= var5 ? var5 - var1.xAxis : -var5 + var1.xAxis) << 7;
                         int var12 = var1.anInt2758 * var1.anInt2758;
-                        int var14 = (var1.anInt2829 > var6 ? -var6 + var1.anInt2829 : -var1.anInt2829 + var6) << 7;
+                        int var14 = (var1.zAxis > var6 ? -var6 + var1.zAxis : -var1.zAxis + var6) << 7;
                         int var15 = var13 > var14 ? var13 : var14;
                         int var16 = var2.movement_acceleration * 2 * var15;
                         if (var12 <= var16) {
@@ -3116,32 +3099,32 @@ public class Unsorted {
                 }
 
                 if (var5 > var18) {
-                    var1.anInt2819 += var9;
-                    if (var1.anInt2819 > var5) {
-                        var1.anInt2819 = var5;
+                    var1.xAxis += var9;
+                    if (var1.xAxis > var5) {
+                        var1.xAxis = var5;
                     }
                 } else if (var18 > var5) {
-                    var1.anInt2819 -= var9;
-                    if (var1.anInt2819 < var5) {
-                        var1.anInt2819 = var5;
+                    var1.xAxis -= var9;
+                    if (var1.xAxis < var5) {
+                        var1.xAxis = var5;
                     }
                 }
 
                 if (var4 >= var6) {
                     if (var6 < var4) {
-                        var1.anInt2829 -= var9;
-                        if (var6 > var1.anInt2829) {
-                            var1.anInt2829 = var6;
+                        var1.zAxis -= var9;
+                        if (var6 > var1.zAxis) {
+                            var1.zAxis = var6;
                         }
                     }
                 } else {
-                    var1.anInt2829 += var9;
-                    if (var6 < var1.anInt2829) {
-                        var1.anInt2829 = var6;
+                    var1.zAxis += var9;
+                    if (var6 < var1.zAxis) {
+                        var1.zAxis = var6;
                     }
                 }
 
-                if (var5 == var1.anInt2819 && var6 == var1.anInt2829) {
+                if (var5 == var1.xAxis && var6 == var1.zAxis) {
                     --var1.anInt2816;
                     if (0 < var1.anInt2811) {
                         --var1.anInt2811;
@@ -3809,8 +3792,8 @@ public class Unsorted {
                                     var25 = (Class164_Sub2.anInt3020 - -256) * var25 >> 8;
                                     var47 = -(var24 * var20) + var25 * var21 >> 11;
                                     var26 = var21 * var24 - -(var20 * var25) >> 11;
-                                    var28 = Class102.player.anInt2819 + var26 >> 7;
-                                    var29 = -var47 + Class102.player.anInt2829 >> 7;
+                                    var28 = Class102.player.xAxis + var26 >> 7;
+                                    var29 = -var47 + Class102.player.zAxis >> 7;
                                     if (GameObject.aBoolean1837 && 0 != (Class164.anInt2051 & 64)) {
                                         RSInterface var53 = AbstractSprite.method638(BufferedDataStream.anInt872, RSInterface.anInt278);
                                         if (null == var53) {
@@ -4786,14 +4769,14 @@ public class Unsorted {
             KeyboardListener.aBoolean1905 = true;
             WorldListEntry.aBoolean2623 = true;
             RSInterface.aBoolean236 = true;
-            Sprites.anInt340 = 127;
+            Sprites.ambientVolume = 127;
             Class38.aBoolean661 = true;
             Class140_Sub6.aBoolean2910 = true;
             TextureOperation.anInt2378 = 0;
             anInt1137 = 2;
             aBoolean3275 = true;
             Class106.aBoolean1441 = true;
-            anInt120 = 255;
+            AudioHandler.musicVolume = 255;
             Class25.aBoolean488 = true;
             anInt3671 = 0;
             RandomAccessFileWrapper var2 = null;
@@ -5059,7 +5042,7 @@ public class Unsorted {
                 var6 = 128 + Class166.anIntArray2073[4];
              }
 
-             Class140_Sub2.method1952(anInt3155, var1, Class121.method1736(WorldListCountry.localPlane, 1, Class102.player.anInt2819, Class102.player.anInt2829) + -50, Client.ZOOM - -(var6 * 3), var7, anInt942, var6);
+             Class140_Sub2.method1952(anInt3155, var1, Class121.method1736(WorldListCountry.localPlane, 1, Class102.player.xAxis, Class102.player.zAxis) + -50, Client.ZOOM - -(var6 * 3), var7, anInt942, var6);
           }
 
           var7 = Class7.anInt2162;
@@ -5148,7 +5131,7 @@ public class Unsorted {
              HDToolKit.clearScreen(var12);
              ClientErrorException.method2285(Class139.anInt1823, Class77.anInt1111, Class7.anInt2162, NPC.anInt3995, TextureOperation28.anInt3315);
              HDToolKit.anInt1791 = Class44.anInt719;
-             Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, TextureOperation28.anInt3315, Class158.aByteArrayArrayArray2008, anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane + 1, var19, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7);
+             Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, TextureOperation28.anInt3315, Class158.aByteArrayArrayArray2008, anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane + 1, var19, Class102.player.xAxis >> 7, Class102.player.zAxis >> 7);
              aBoolean47 = true;
              Class68.method1265();
              ClientErrorException.method2285(0, 0, 0, 0, 0);
@@ -5158,7 +5141,7 @@ public class Unsorted {
              Class163_Sub2_Sub1.method2221(var4, var3, var1, anInt1705, anInt1705, var5);
           } else {
              Toolkit.JAVA_TOOLKIT.method934(var3, var5, var4, var1, 0);
-             Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, TextureOperation28.anInt3315, Class158.aByteArrayArrayArray2008, anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane - -1, var19, Class102.player.anInt2819 >> 7, Class102.player.anInt2829 >> 7);
+             Class3_Sub22.method398(NPC.anInt3995, Class7.anInt2162, Class77.anInt1111, Class139.anInt1823, TextureOperation28.anInt3315, Class158.aByteArrayArrayArray2008, anIntArray686, Class129_Sub1.anIntArray2696, Class159.anIntArray2021, Player.anIntArray3959, SequenceDefinition.anIntArray1871, WorldListCountry.localPlane - -1, var19, Class102.player.xAxis >> 7, Class102.player.zAxis >> 7);
              Class58.method1194();
              method1775();
              Texture.method1405(var5, var4, var3, 256, var1, 256, -6403 + -994);
diff --git a/Client/src/main/java/org/runite/client/WorldMap.java b/Client/src/main/java/org/runite/client/WorldMap.java
index ef61b4e01..dfe57a706 100644
--- a/Client/src/main/java/org/runite/client/WorldMap.java
+++ b/Client/src/main/java/org/runite/client/WorldMap.java
@@ -65,9 +65,9 @@ final class WorldMap extends Node {
                     /* End Minimap Zoom */
 
 
-                    int var1 = -TextureOperation37.anInt3256 + (Class102.player.anInt2819 >> 7) + Class131.anInt1716;
+                    int var1 = -TextureOperation37.anInt3256 + (Class102.player.xAxis >> 7) + Class131.anInt1716;
                     var1 += -5 + (int) (Math.random() * 10.0D);
-                    int var2 = -Texture.anInt1152 + -(Class102.player.anInt2829 >> 7) + Unsorted.anInt65 + -1 + Class108.anInt1460;
+                    int var2 = -Texture.anInt1152 + -(Class102.player.zAxis >> 7) + Unsorted.anInt65 + -1 + Class108.anInt1460;
                     var2 += -5 + (int) (Math.random() * 10.0D);
                     if (var1 >= 0 && var1 < Class23.anInt455 && 0 <= var2 && Class108.anInt1460 > var2) {
                         Class3_Sub28_Sub1.anInt3536 = var1;
diff --git a/Client/src/main/java/org/runite/client/drawcalls/Minimap.java b/Client/src/main/java/org/runite/client/drawcalls/Minimap.java
index 43d5fafd0..06d22e96b 100644
--- a/Client/src/main/java/org/runite/client/drawcalls/Minimap.java
+++ b/Client/src/main/java/org/runite/client/drawcalls/Minimap.java
@@ -18,8 +18,8 @@ public class Minimap {
 
           if(2 != Class161.anInt2028 && 5 != Class161.anInt2028 && Class49.aAbstractSprite_812 != null) {
              int var19 = TextureOperation9.anInt3102 + GraphicDefinition.CAMERA_DIRECTION & 0x7FF;//Region Rotation (relative to player camera)
-             int var6 = Class102.player.anInt2819 / 32 + 48;//Minimap X Axis (relative to player) Used as offset
-             int var7 = -(Class102.player.anInt2829 / 32) + 464;//Minimap Y Axis (relative to player) Used as offset
+             int var6 = Class102.player.xAxis / 32 + 48;//Minimap X Axis (relative to player) Used as offset
+             int var7 = -(Class102.player.zAxis / 32) + 464;//Minimap Y Axis (relative to player) Used as offset
              if(HDToolKit.highDetail) {
                 ((HDSprite)Class49.aAbstractSprite_812).drawMinimapRegion(var3, var2, var4.width, var4.height, var6, var7, var19, Class164_Sub2.anInt3020 + 256, (HDSprite)var4.method866(false));
              } else {
@@ -37,12 +37,12 @@ public class Minimap {
              if(null != TextureOperation22.aClass131_3421) {
                 for(int var8 = 0; var8 < TextureOperation22.aClass131_3421.anInt1720; ++var8) {
                    if(TextureOperation22.aClass131_3421.method1789(var8, var1 ^ 553)) {
-                      var9 = 2 + 4 * (TextureOperation22.aClass131_3421.aShortArray1727[var8] + -Class131.anInt1716) + -(Class102.player.anInt2819 / 32);
+                      var9 = 2 + 4 * (TextureOperation22.aClass131_3421.aShortArray1727[var8] + -Class131.anInt1716) + -(Class102.player.xAxis / 32);
                       var11 = Class51.anIntArray840[var19];
                       var12 = Class51.anIntArray851[var19];
                       Font var15 = FontType.smallFont;
                       var11 = var11 * 256 / (256 + Class164_Sub2.anInt3020);
-                      var10 = 2 + 4 * (-Texture.anInt1152 + TextureOperation22.aClass131_3421.aShortArray1718[var8]) - Class102.player.anInt2829 / 32;
+                      var10 = 2 + 4 * (-Texture.anInt1152 + TextureOperation22.aClass131_3421.aShortArray1718[var8]) - Class102.player.zAxis / 32;
                       var12 = var12 * 256 / (256 + Class164_Sub2.anInt3020);
                       var14 = -(var9 * var11) + var10 * var12 >> 16;
                       if(TextureOperation22.aClass131_3421.method1791(var8, var1 + -51) == 1) {
@@ -80,8 +80,8 @@ public class Minimap {
              }
 
              for(var9 = 0; MouseListeningClass.anInt1924 > var9; ++var9) {
-                var10 = -(Class102.player.anInt2819 / 32) + 2 + 4 * Class84.anIntArray1163[var9];
-                var11 = -(Class102.player.anInt2829 / 32) + 2 + (Unsorted.anIntArray4050[var9] * 4);
+                var10 = -(Class102.player.xAxis / 32) + 2 + 4 * Class84.anIntArray1163[var9];
+                var11 = -(Class102.player.zAxis / 32) + 2 + (Unsorted.anIntArray4050[var9] * 4);
                 ObjectDefinition var20 = ObjectDefinition.getObjectDefinition(Class3_Sub19.anIntArray3693[var9]);
                 if(null != var20.ChildrenIds) {
                    var20 = var20.method1685(var1 + -59);
@@ -97,8 +97,8 @@ public class Minimap {
                 for(var10 = 0; var10 < 104; ++var10) {
                    LinkedList var25 = Class39.aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var9][var10];
                    if(null != var25) {
-                      var12 = 2 + var9 * 4 + -(Class102.player.anInt2819 / 32);
-                      var13 = -(Class102.player.anInt2829 / 32) + 2 + 4 * var10;
+                      var12 = 2 + var9 * 4 + -(Class102.player.xAxis / 32);
+                      var13 = -(Class102.player.zAxis / 32) + 2 + 4 * var10;
                       Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[0], var13, var12, var2, var3);
                    }
                 }
@@ -113,8 +113,8 @@ public class Minimap {
                    }
 
                    if(var22 != null && var22.aBoolean1285 && var22.aBoolean1270) {
-                      var12 = var21.anInt2819 / 32 - Class102.player.anInt2819 / 32;
-                      var13 = var21.anInt2829 / 32 + -(Class102.player.anInt2829 / 32);
+                      var12 = var21.xAxis / 32 - Class102.player.xAxis / 32;
+                      var13 = var21.zAxis / 32 + -(Class102.player.zAxis / 32);
                       if(var22.anInt1283 == -1) {
                          Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[1], var13, var12, var2, var3);
                       } else {
@@ -127,8 +127,8 @@ public class Minimap {
              for(var9 = 0; var9 < Class159.localPlayerCount; ++var9) {
                 Player var23 = Unsorted.players[Class56.localPlayerIndexes[var9]];
                 if(null != var23 && var23.hasDefinitions()) {
-                   var12 = var23.anInt2829 / 32 - Class102.player.anInt2829 / 32;
-                   var11 = -(Class102.player.anInt2819 / 32) + var23.anInt2819 / 32;
+                   var12 = var23.zAxis / 32 - Class102.player.zAxis / 32;
+                   var11 = -(Class102.player.xAxis / 32) + var23.xAxis / 32;
                    long var29 = var23.displayName.toLong();
                    boolean var28 = false;
 
@@ -173,23 +173,23 @@ public class Minimap {
                    if(var26.anInt1360 == 1 && var26.anInt1359 >= 0 && var26.anInt1359 < NPC.npcs.length) {
                       NPC var27 = NPC.npcs[var26.anInt1359];
                       if(null != var27) {
-                         var13 = -(Class102.player.anInt2819 / 32) + var27.anInt2819 / 32;
-                         var14 = var27.anInt2829 / 32 + -(Class102.player.anInt2829 / 32);
+                         var13 = -(Class102.player.xAxis / 32) + var27.xAxis / 32;
+                         var14 = var27.zAxis / 32 + -(Class102.player.zAxis / 32);
                          Class53.method1171(var26.anInt1351, var2, var3, var13, var14, var4);
                       }
                    }
 
                    if(var26.anInt1360 == 2) {
-                      var12 = (-Class131.anInt1716 + var26.anInt1356) * 4 + 2 - Class102.player.anInt2819 / 32;
-                      var13 = -(Class102.player.anInt2829 / 32) + 2 + (-Texture.anInt1152 + var26.anInt1347) * 4;
+                      var12 = (-Class131.anInt1716 + var26.anInt1356) * 4 + 2 - Class102.player.xAxis / 32;
+                      var13 = -(Class102.player.zAxis / 32) + 2 + (-Texture.anInt1152 + var26.anInt1347) * 4;
                       Class53.method1171(var26.anInt1351, var2, var3, var12, var13, var4);
                    }
 
                    if(var26.anInt1360 == 10 && var26.anInt1359 >= 0 && Unsorted.players.length > var26.anInt1359) {
                       Player var30 = Unsorted.players[var26.anInt1359];
                       if(null != var30) {
-                         var14 = var30.anInt2829 / 32 + -(Class102.player.anInt2829 / 32);
-                         var13 = var30.anInt2819 / 32 + -(Class102.player.anInt2819 / 32);
+                         var14 = var30.zAxis / 32 + -(Class102.player.zAxis / 32);
+                         var13 = var30.xAxis / 32 + -(Class102.player.xAxis / 32);
                          Class53.method1171(var26.anInt1351, var2, var3, var13, var14, var4);
                       }
                    }
@@ -197,8 +197,8 @@ public class Minimap {
              }
 
              if(Class65.anInt987 != 0) {
-                var9 = 4 * Class65.anInt987 + (2 - Class102.player.anInt2819 / 32);
-                var10 = 2 + 4 * Class45.anInt733 - Class102.player.anInt2829 / 32;
+                var9 = 4 * Class65.anInt987 + (2 - Class102.player.xAxis / 32);
+                var10 = 2 + 4 * Class45.anInt733 - Class102.player.zAxis / 32;
                 Class38_Sub1.minimapIcons(var4, Class45.aAbstractSprite_736, var10, var9, var2, var3);
              }
              Toolkit.getActiveToolkit().method934(-1 + (var3 - -(var4.width / 2)), -1 + var2 - -(var4.height / 2), 3, 3, 16777215);