clean up

Author: hallowatcher

src/main/java/com/jagex/runescape/cache/def/VarbitDefinition.java

@@ -1,23 +1,18 @@
 package com.jagex.runescape.cache.def;
 
-import com.jagex.runescape.*;
+import com.jagex.runescape.HuffmanEncoding;
 import com.jagex.runescape.cache.CacheArchive;
-import com.jagex.runescape.input.MouseHandler;
 import com.jagex.runescape.io.Buffer;
-import com.jagex.runescape.media.renderable.actor.Player;
-import com.jagex.runescape.media.renderable.actor.PlayerAppearance;
-import com.jagex.runescape.net.PacketBuffer;
 import com.jagex.runescape.node.CachedNode;
+import com.jagex.runescape.node.NodeCache;
 import com.jagex.runescape.scene.GroundItemTile;
 
 public class VarbitDefinition extends CachedNode {
-    public static ProducingGraphicsBuffer gameScreenImageProducer;
-    public static int anInt2359 = 0;
-    public static int[] anIntArray2361 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, 2147483647, -1};
-    public static CacheArchive aCacheArchive_2364;
-    public static int destinationX = 0;
     public static int[] varbitMasks = new int[32];
+    public static NodeCache varbitDefinitionCache = new NodeCache(64);
+    public static CacheArchive gameDefinitionsCacheArchive;
 
+    // Pre-calculate varbit masks
     static {
         int i = 2;
         for(int i_7_ = 0; i_7_ < 32; i_7_++) {
@@ -31,14 +26,14 @@ public class VarbitDefinition extends CachedNode {
     public int mostSignificantBit;
 
     public static VarbitDefinition getDefinition(int varbitId) {
-        VarbitDefinition varbitDefinition = (VarbitDefinition) Class57.varbitDefinitionCache.get(varbitId);
+        VarbitDefinition varbitDefinition = (VarbitDefinition) varbitDefinitionCache.get(varbitId);
         if (varbitDefinition != null)
             return varbitDefinition;
-        byte[] is = RSCanvas.aCacheArchive_61.getFile(14, varbitId);
+        byte[] cacheData = gameDefinitionsCacheArchive.getFile(14, varbitId);
         varbitDefinition = new VarbitDefinition();
-        if (is != null)
-            varbitDefinition.readValues(new Buffer(is));
-        Class57.varbitDefinitionCache.put(varbitId, varbitDefinition);
+        if (cacheData != null)
+            varbitDefinition.readValues(new Buffer(cacheData));
+        varbitDefinitionCache.put(varbitId, varbitDefinition);
         return varbitDefinition;
     }
 
@@ -56,6 +51,27 @@ public static int getVarbitValue(int varbitId) {
         return GroundItemTile.varPlayers[varPlayerIndex] >> leastSignificantBit & mask;
     }
 
+    public static void setVarbitValue(int value, int varbitId) {
+        VarbitDefinition varbitDefinition = getDefinition(varbitId);
+        int index = varbitDefinition.index;
+        int leastSignificantBit = varbitDefinition.leastSignificantBit;
+        int mostSignificantBit = varbitDefinition.mostSignificantBit;
+        int mask = varbitMasks[mostSignificantBit + -leastSignificantBit];
+        if (value < 0 || mask < value)
+            value = 0;
+        mask <<= leastSignificantBit;
+        GroundItemTile.varPlayers[index] = UnderlayDefinition.bitWiseOR(HuffmanEncoding.bitWiseAND(GroundItemTile.varPlayers[index], mask ^ 0xffffffff), HuffmanEncoding.bitWiseAND(mask, value << leastSignificantBit));
+    }
+
+    public static void initializeVarbitDefinitionCache(CacheArchive cacheArchive) {
+        gameDefinitionsCacheArchive = cacheArchive;
+
+    }
+
+    public static void clearVarbitDefinitionCache() {
+        varbitDefinitionCache.clear();
+    }
+
     public void readValues(Buffer buffer) {
         while(true) {
             int opCode = buffer.getUnsignedByte();

src/main/java/com/jagex/runescape/net/IncomingPackets.java

@@ -167,7 +167,7 @@ public static boolean parseIncomingPackets(boolean arg0) {
             }
             if(incomingPacket == 233) { // clear destination X
                 incomingPacket = -1;
-                VarbitDefinition.destinationX = 0;
+                MovedStatics.destinationX = 0;
                 return true;
             }
             if(incomingPacket == 7) { // close cutscene
@@ -857,8 +857,8 @@ public static boolean parseIncomingPackets(boolean arg0) {
                 return true;
             }
             if(incomingPacket == 14) { // reset client configs?
-                for(int varPlayerIndex = 0; Class59.varPlayerConfigSize > varPlayerIndex; varPlayerIndex++) {
-                    VarPlayerDefinition varPlayerDefinition = VarPlayerDefinition.getVarPlayerConfig(varPlayerIndex);
+                for(int varPlayerIndex = 0; VarPlayerDefinition.varPlayerDefinitionsSize > varPlayerIndex; varPlayerIndex++) {
+                    VarPlayerDefinition varPlayerDefinition = VarPlayerDefinition.getDefinition(varPlayerIndex);
                     if(varPlayerDefinition.type == 0) {
                         Buffer.anIntArray1984[varPlayerIndex] = 0;
                         GroundItemTile.varPlayers[varPlayerIndex] = 0;