refactor: rename floor def caches

Author: Jameskmonger

src/main/java/org/runejs/client/cache/def/OverlayDefinition.java

@@ -7,8 +7,8 @@
 
 public class OverlayDefinition extends CachedNode {
 
-    public static NodeCache overlayDefinitionCache = new NodeCache(64);
-    public static CacheArchive gameDefinitionsCacheArchive;
+    private static NodeCache definitionCache = new NodeCache(64);
+    private static CacheArchive definitionArchive;
 
     public int saturation;
     public int texture;
@@ -28,24 +28,24 @@ public OverlayDefinition() {
     }
 
     public static OverlayDefinition getDefinition(int arg0, int arg1) {
-        OverlayDefinition overlayDefinition = (OverlayDefinition) overlayDefinitionCache.get(arg0);
+        OverlayDefinition overlayDefinition = (OverlayDefinition) definitionCache.get(arg0);
         if(overlayDefinition != null)
             return overlayDefinition;
-        byte[] is = gameDefinitionsCacheArchive.getFile(arg1, arg0);
+        byte[] is = definitionArchive.getFile(arg1, arg0);
         overlayDefinition = new OverlayDefinition();
         if(is != null)
             overlayDefinition.readValues(new Buffer(is));
         overlayDefinition.calculateHsl();
-        overlayDefinitionCache.put(arg0, overlayDefinition);
+        definitionCache.put(arg0, overlayDefinition);
         return overlayDefinition;
     }
 
     public static void initializeOverlayDefinitionCache(CacheArchive cacheArchive) {
-        gameDefinitionsCacheArchive = cacheArchive;
+        definitionArchive = cacheArchive;
     }
 
     public static void clearOverlayDefinitionCache() {
-        overlayDefinitionCache.clear();
+        definitionCache.clear();
     }
 
     public void readValues(Buffer buffer) {

src/main/java/org/runejs/client/cache/def/UnderlayDefinition.java

@@ -6,8 +6,8 @@
 import org.runejs.client.node.NodeCache;
 
 public class UnderlayDefinition extends CachedNode {
-    public static NodeCache underlayDefinitionCache = new NodeCache(64);
-    public static CacheArchive gameDefinitionsCacheArchive;
+    private static NodeCache definitionCache = new NodeCache(64);
+    private static CacheArchive definitionArchive;
 
     public int lightness;
     public int hue;
@@ -16,24 +16,24 @@ public class UnderlayDefinition extends CachedNode {
     public int color = 0;
 
     public static void initializeUnderlayDefinitionCache(CacheArchive cacheArchive) {
-        gameDefinitionsCacheArchive = cacheArchive;
+        definitionArchive = cacheArchive;
     }
 
     public static UnderlayDefinition getDefinition(int underlayId) {
-        UnderlayDefinition underlayDefinition = (UnderlayDefinition) underlayDefinitionCache.get(underlayId);
+        UnderlayDefinition underlayDefinition = (UnderlayDefinition) definitionCache.get(underlayId);
         if (underlayDefinition != null)
             return underlayDefinition;
-        byte[] is = gameDefinitionsCacheArchive.getFile(1, underlayId);
+        byte[] is = definitionArchive.getFile(1, underlayId);
         underlayDefinition = new UnderlayDefinition();
         if (is != null)
             underlayDefinition.readValues(new Buffer(is));
         underlayDefinition.calculateHsl();
-        underlayDefinitionCache.put(underlayId, underlayDefinition);
+        definitionCache.put(underlayId, underlayDefinition);
         return underlayDefinition;
     }
 
     public static void clearUnderlayDefinitionCache() {
-        underlayDefinitionCache.clear();
+        definitionCache.clear();
     }