Skip to content

Commit 43dd070

Browse files
committed
refactor: rename SpotAnim caches
1 parent 22492d9 commit 43dd070

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
public class SpotAnimDefinition extends CachedNode {
1111

12-
public static CacheArchive gameDefinitionsCacheArchive;
13-
public static NodeCache spotAnimDefinitionCache = new NodeCache(64);
14-
public static NodeCache spotAnimModelCache = new NodeCache(30);
15-
public static CacheArchive aCacheArchive_2582;
12+
private static CacheArchive definitionArchive;
13+
private static NodeCache definitionCache = new NodeCache(64);
14+
private static NodeCache modelCache = new NodeCache(30);
15+
private static CacheArchive modelArchive;
1616
public int animationId;
1717
public int modelId;
1818
public int contrast = 0;
@@ -33,26 +33,26 @@ public SpotAnimDefinition() {
3333
}
3434

3535
public static SpotAnimDefinition forId(int id) {
36-
SpotAnimDefinition spotAnimDefinition = (SpotAnimDefinition) spotAnimDefinitionCache.get(id);
36+
SpotAnimDefinition spotAnimDefinition = (SpotAnimDefinition) definitionCache.get(id);
3737
if (spotAnimDefinition != null)
3838
return spotAnimDefinition;
39-
byte[] is = gameDefinitionsCacheArchive.getFile(13, id);
39+
byte[] is = definitionArchive.getFile(13, id);
4040
spotAnimDefinition = new SpotAnimDefinition();
4141
spotAnimDefinition.id = id;
4242
if (is != null)
4343
spotAnimDefinition.readValues(new Buffer(is));
44-
spotAnimDefinitionCache.put(id, spotAnimDefinition);
44+
definitionCache.put(id, spotAnimDefinition);
4545
return spotAnimDefinition;
4646
}
4747

4848
public static void clearSpotAnimCache() {
49-
spotAnimDefinitionCache.clear();
50-
spotAnimModelCache.clear();
49+
definitionCache.clear();
50+
modelCache.clear();
5151
}
5252

5353
public static void initializeSpotAnimCache(CacheArchive arg1, CacheArchive arg2) {
54-
aCacheArchive_2582 = arg1;
55-
gameDefinitionsCacheArchive = arg2;
54+
modelArchive = arg1;
55+
definitionArchive = arg2;
5656
}
5757

5858
public void readValues(Buffer buffer) {
@@ -88,9 +88,9 @@ public void readValue(int opcode, Buffer buffer) {
8888
}
8989

9090
public Model getModel(int arg0) {
91-
Model model = (Model) spotAnimModelCache.get((long) id);
91+
Model model = (Model) modelCache.get((long) id);
9292
if (model == null) {
93-
model = Model.getModel(aCacheArchive_2582, modelId);
93+
model = Model.getModel(modelArchive, modelId);
9494
if (model == null) {
9595
return null;
9696
}
@@ -101,7 +101,7 @@ public Model getModel(int arg0) {
101101
}
102102
model.createBones();
103103
model.applyLighting(64 + ambient, contrast + 850, -30, -50, -30, true);
104-
spotAnimModelCache.put((long) id, model);
104+
modelCache.put((long) id, model);
105105
}
106106
Model class40_sub5_sub17_sub5_0_;
107107
if (animationId == -1 || arg0 == -1) {

0 commit comments

Comments
 (0)