Skip to content

Commit dd8f450

Browse files
committed
refactor: make caches private
1 parent 43dd070 commit dd8f450

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

src/main/java/org/runejs/client/Landscape.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public static void loadRegion() {
221221
MovedStatics.spawnGroundItem(y, x);
222222
}
223223
clearTemporaryObjects();
224-
GameObjectDefinition.modelCacheStatic.clear();
224+
GameObjectDefinition.clearStaticModelCache();
225225
if(GameShell.clientFrame != null) {
226226
OutgoingPackets.buffer.putPacket(121);
227227
OutgoingPackets.buffer.putIntBE(1057001181);

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public class GameObjectDefinition extends CachedNode implements EntityDefinition
2020
public static int count;
2121
public static int[] OBJECT_TYPES = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3};
2222
public static boolean lowMemory = false;
23-
public static CacheArchive definitionArchive;
24-
public static CacheArchive modelArchive;
23+
private static CacheArchive definitionArchive;
24+
private static CacheArchive modelArchive;
2525
private static NodeCache definitionCache = new NodeCache(64);
26-
public static NodeCache modelCacheStatic = new NodeCache(500);
26+
private static NodeCache modelCacheStatic = new NodeCache(500);
2727
private static Model[] objectModelHolder = new Model[4];
2828
private static NodeCache modelCacheDynamic = new NodeCache(10);
2929
private static NodeCache animatedObjectModelCache = new NodeCache(30);
@@ -186,6 +186,10 @@ public static void clearGameObjectModelCache() {
186186
animatedObjectModelCache.clear();
187187
}
188188

189+
public static void clearStaticModelCache() {
190+
modelCacheStatic.clear();
191+
}
192+
189193
public static void initializeGameObjectDefinitionCache(CacheArchive modelCache, boolean lowMemory, CacheArchive definitionCache) {
190194
GameObjectDefinition.definitionArchive = definitionCache;
191195
count = GameObjectDefinition.definitionArchive.fileLength(6);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
public class ItemDefinition extends CachedNode implements EntityDefinition {
1515
public static int count;
16-
public static CacheArchive definitionArchive;
17-
public static NodeCache definitionCache = new NodeCache(64);
18-
public static NodeCache modelCache = new NodeCache(50);
19-
public static NodeCache imageCache = new NodeCache(100);
20-
public static CacheArchive modelArchive;
16+
private static CacheArchive definitionArchive;
17+
private static NodeCache definitionCache = new NodeCache(64);
18+
private static NodeCache modelCache = new NodeCache(50);
19+
private static NodeCache imageCache = new NodeCache(100);
20+
private static CacheArchive modelArchive;
2121

2222
public int stackable;
2323
public String name;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.runejs.client.node.NodeCache;
77

88
public class VarPlayerDefinition extends CachedNode {
9-
public static NodeCache varPlayerDefinitionCache = new NodeCache(64);
10-
public static CacheArchive gameDefinitionsCacheArchive;
9+
private static NodeCache varPlayerDefinitionCache = new NodeCache(64);
10+
private static CacheArchive gameDefinitionsCacheArchive;
1111
public static int varPlayerDefinitionsSize;
1212
public static int[] varpCache = new int[2000];
1313
public int type = 0;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import org.runejs.client.util.BitUtils;
88

99
public class VarbitDefinition extends CachedNode {
10-
public static NodeCache varbitDefinitionCache = new NodeCache(64);
11-
public static CacheArchive gameDefinitionsCacheArchive;
10+
private static NodeCache varbitDefinitionCache = new NodeCache(64);
11+
private static CacheArchive gameDefinitionsCacheArchive;
1212

1313
/**
1414
* Contains information on the bit mask to use per specified bits.

0 commit comments

Comments
 (0)