Skip to content

Commit 54cee35

Browse files
JameskmongerJameskmonger
committed
refactor: move statics off ActorDefinition
1 parent 661ca10 commit 54cee35

File tree

8 files changed

+73
-85
lines changed

8 files changed

+73
-85
lines changed

‎src/main/java/org/runejs/client/ClientScriptRunner.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.runejs.client.util.BitUtils;
1616
import org.runejs.client.util.Signlink;
1717
import org.runejs.client.util.SignlinkNode;
18-
import org.runejs.client.cache.def.ActorDefinition;
1918
import org.runejs.client.cache.def.ItemDefinition;
2019
import org.runejs.client.cache.def.VarPlayerDefinition;
2120
import org.runejs.client.cache.def.VarbitDefinition;
@@ -921,7 +920,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
921920
break;
922921
}
923922
intValueIndex -= 2;
924-
ActorDefinition.playAnimation(scriptIntValues[intValueIndex], scriptIntValues[intValueIndex + 1], Player.localPlayer);
923+
Player.playAnimation(scriptIntValues[intValueIndex], scriptIntValues[intValueIndex + 1], Player.localPlayer);
925924
}
926925
}
927926
} else {

‎src/main/java/org/runejs/client/MovedStatics.java‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import org.runejs.client.media.renderable.Renderable;
3232
import org.runejs.client.scene.*;
3333
import org.runejs.client.scene.camera.CameraRotation;
34-
import org.runejs.client.scene.util.CollisionMap;
3534
import org.runejs.client.sound.MusicSystem;
3635
import org.runejs.client.sound.SoundSystem;
36+
import org.runejs.client.util.BitUtils;
3737
import org.runejs.client.util.Signlink;
3838
import org.runejs.client.util.SignlinkNode;
3939
import org.runejs.client.cache.def.*;
@@ -453,7 +453,7 @@ public static IndexedImage method538() {
453453
class40_sub5_sub14_sub2.imgHeight = Npc.anIntArray3312[0];
454454
class40_sub5_sub14_sub2.palette = Buffer.anIntArray1972;
455455
class40_sub5_sub14_sub2.imgPixels = aByteArrayArray1370[0];
456-
ActorDefinition.method569();
456+
method569();
457457
return class40_sub5_sub14_sub2;
458458
}
459459

@@ -953,7 +953,7 @@ else if(interactiveObjectTemporary.previousId == interactiveObjectTemporary.id &
953953
public static ImageRGB method927(int arg0, CacheArchive arg1, int arg3) {
954954
if(!ImageRGB.spriteExists(arg0, arg3, arg1))
955955
return null;
956-
return ActorDefinition.method578();
956+
return method578();
957957
}
958958

959959
public static void handleInterfaceActions(GameInterfaceArea area, int mouseX, int mouseY, int minX, int minY, int maxX, int maxY, GameInterface[] gameInterfaces, int parentId, int scrollPosition, int scrollWidth) {
@@ -2102,7 +2102,7 @@ public static void method940(String arg1, boolean arg2, String arg3) {
21022102
drawWelcomeScreenGraphics();
21032103
ChatBox.drawChatBoxGraphics();
21042104
drawTabGraphics();
2105-
ActorDefinition.drawMapBack();
2105+
Minimap.drawMapBack();
21062106
Game.method943(ChatBox.tradeMode, fontNormal, ChatBox.privateChatMode, ChatBox.publicChatMode);
21072107
method527(Game.currentTabId, Game.tabWidgetIds, GameInterface.tabAreaInterfaceId == -1, -1);
21082108
showSidePanelRedrawnText = true;
@@ -3291,4 +3291,31 @@ public static void method144(int arg0) {
32913291
loadingBoxImage = null;
32923292

32933293
}
3294+
3295+
public static ImageRGB method578() {
3296+
ImageRGB class40_sub5_sub14_sub4 = new ImageRGB();
3297+
class40_sub5_sub14_sub4.maxWidth = imageMaxWidth;
3298+
class40_sub5_sub14_sub4.maxHeight = imageMaxHeight;
3299+
class40_sub5_sub14_sub4.offsetX = anIntArray1347[0];
3300+
class40_sub5_sub14_sub4.offsetY = anIntArray3111[0];
3301+
class40_sub5_sub14_sub4.imageWidth = anIntArray456[0];
3302+
class40_sub5_sub14_sub4.imageHeight = Npc.anIntArray3312[0];
3303+
byte[] is = aByteArrayArray1370[0];
3304+
int i = class40_sub5_sub14_sub4.imageWidth * class40_sub5_sub14_sub4.imageHeight;
3305+
class40_sub5_sub14_sub4.pixels = new int[i];
3306+
for(int i_5_ = 0; i_5_ < i; i_5_++) {
3307+
class40_sub5_sub14_sub4.pixels[i_5_] = Buffer.anIntArray1972[BitUtils.bitWiseAND(255, is[i_5_])];
3308+
}
3309+
method569();
3310+
return class40_sub5_sub14_sub4;
3311+
}
3312+
3313+
public static void method569() {
3314+
anIntArray456 = null;
3315+
aByteArrayArray1370 = null;
3316+
Npc.anIntArray3312 = null;
3317+
anIntArray3111 = null;
3318+
Buffer.anIntArray1972 = null;
3319+
anIntArray1347 = null;
3320+
}
32943321
}

‎src/main/java/org/runejs/client/cache/def/ActorDefinition.java‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
package org.runejs.client.cache.def;
22

3-
import org.runejs.client.*;
43
import org.runejs.client.cache.CacheArchive;
54
import org.runejs.client.cache.media.AnimationSequence;
6-
import org.runejs.client.cache.media.ImageRGB;
7-
import org.runejs.client.frame.Minimap;
8-
import org.runejs.client.frame.ScreenController;
9-
import org.runejs.client.frame.ScreenMode;
105
import org.runejs.client.io.Buffer;
116
import org.runejs.client.language.English;
127
import org.runejs.client.media.renderable.Model;
13-
import org.runejs.client.media.renderable.actor.Npc;
14-
import org.runejs.client.media.renderable.actor.Player;
158
import org.runejs.client.node.CachedNode;
169
import org.runejs.client.node.NodeCache;
17-
import org.runejs.client.util.BitUtils;
18-
19-
import java.awt.*;
2010

2111
public class ActorDefinition extends CachedNode implements EntityDefinition {
2212

@@ -55,66 +45,6 @@ public class ActorDefinition extends CachedNode implements EntityDefinition {
5545
public int[] modifiedModelColors;
5646
public boolean renderOnMinimap = true;
5747

58-
public static void method569() {
59-
MovedStatics.anIntArray456 = null;
60-
MovedStatics.aByteArrayArray1370 = null;
61-
Npc.anIntArray3312 = null;
62-
MovedStatics.anIntArray3111 = null;
63-
Buffer.anIntArray1972 = null;
64-
MovedStatics.anIntArray1347 = null;
65-
}
66-
67-
public static void playAnimation(int animationId, int animationDelay, Player player) {
68-
if(player.playingAnimation == animationId && animationId != -1) {
69-
int i = AnimationSequence.getAnimationSequence(animationId).replyMode;
70-
if(i == 1) {
71-
player.anInt3104 = 0;
72-
player.anInt3095 = 0;
73-
player.playingAnimationDelay = animationDelay;
74-
player.anInt3115 = 0;
75-
}
76-
if(i == 2) {
77-
player.anInt3095 = 0;
78-
}
79-
} else if(animationId == -1 || player.playingAnimation == -1 || AnimationSequence.getAnimationSequence(animationId).forcedPriority >= AnimationSequence.getAnimationSequence(player.playingAnimation).forcedPriority) {
80-
player.anInt3094 = player.anInt3109;
81-
player.anInt3104 = 0;
82-
player.anInt3115 = 0;
83-
player.anInt3095 = 0;
84-
player.playingAnimationDelay = animationDelay;
85-
player.playingAnimation = animationId;
86-
}
87-
}
88-
89-
public static void drawMapBack() {
90-
try {
91-
if(ScreenController.frameMode == ScreenMode.FIXED) {
92-
Graphics graphics = Game.gameCanvas.getGraphics();
93-
Minimap.mapbackProducingGraphicsBuffer.drawGraphics(550, 4, graphics);
94-
}
95-
} catch(Exception exception) {
96-
Game.gameCanvas.repaint();
97-
}
98-
}
99-
100-
public static ImageRGB method578() {
101-
ImageRGB class40_sub5_sub14_sub4 = new ImageRGB();
102-
class40_sub5_sub14_sub4.maxWidth = MovedStatics.imageMaxWidth;
103-
class40_sub5_sub14_sub4.maxHeight = MovedStatics.imageMaxHeight;
104-
class40_sub5_sub14_sub4.offsetX = MovedStatics.anIntArray1347[0];
105-
class40_sub5_sub14_sub4.offsetY = MovedStatics.anIntArray3111[0];
106-
class40_sub5_sub14_sub4.imageWidth = MovedStatics.anIntArray456[0];
107-
class40_sub5_sub14_sub4.imageHeight = Npc.anIntArray3312[0];
108-
byte[] is = MovedStatics.aByteArrayArray1370[0];
109-
int i = class40_sub5_sub14_sub4.imageWidth * class40_sub5_sub14_sub4.imageHeight;
110-
class40_sub5_sub14_sub4.pixels = new int[i];
111-
for(int i_5_ = 0; i_5_ < i; i_5_++) {
112-
class40_sub5_sub14_sub4.pixels[i_5_] = Buffer.anIntArray1972[BitUtils.bitWiseAND(255, is[i_5_])];
113-
}
114-
method569();
115-
return class40_sub5_sub14_sub4;
116-
}
117-
11848
public static ActorDefinition getDefinition(int id) {
11949
ActorDefinition definition = (ActorDefinition) actorDefinitionCache.get(id);
12050
if(definition != null)

‎src/main/java/org/runejs/client/cache/media/IndexedImage.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.runejs.client.MovedStatics;
44
import org.runejs.client.cache.CacheArchive;
5-
import org.runejs.client.cache.def.ActorDefinition;
65
import org.runejs.client.io.Buffer;
76
import org.runejs.client.media.Rasterizer;
87
import org.runejs.client.media.renderable.actor.Npc;
@@ -54,7 +53,7 @@ public static IndexedImage[] method315() {
5453
class40_sub5_sub14_sub2.palette = Buffer.anIntArray1972;
5554
class40_sub5_sub14_sub2.imgPixels = MovedStatics.aByteArrayArray1370[i];
5655
}
57-
ActorDefinition.method569();
56+
MovedStatics.method569();
5857
return class40_sub5_sub14_sub2s;
5958
}
6059

‎src/main/java/org/runejs/client/cache/media/TypeFace.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.runejs.client.MovedStatics;
44
import org.runejs.client.RSString;
55
import org.runejs.client.cache.CacheArchive;
6-
import org.runejs.client.cache.def.ActorDefinition;
76
import org.runejs.client.cache.media.textUtils.TextColourNode;
87
import org.runejs.client.cache.media.textUtils.TextColourQueue;
98
import org.runejs.client.cache.media.textUtils.TextTagNode;
@@ -99,7 +98,7 @@ public TypeFace(int[] arg0, int[] arg1, int[] arg2, int[] arg3, byte[][] arg4) {
9998

10099
public static TypeFace constructFont() {
101100
TypeFace class40_sub5_sub14_sub1 = new TypeFace(MovedStatics.anIntArray3111, MovedStatics.anIntArray456, Npc.anIntArray3312, Buffer.anIntArray1972, MovedStatics.aByteArrayArray1370);
102-
ActorDefinition.method569();
101+
MovedStatics.method569();
103102
return class40_sub5_sub14_sub1;
104103
}
105104

‎src/main/java/org/runejs/client/frame/Minimap.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import org.runejs.client.media.renderable.actor.Player;
1313
import org.runejs.client.*;
1414

15+
import java.awt.*;
16+
1517
public class Minimap extends FramePieceRenderer {
1618
public static ImageRGB minimapCompass;
1719
public static int minimapState = 0;
@@ -85,7 +87,7 @@ public static void renderMinimap() {
8587
rasterPixels[i] = 0;
8688
}
8789
minimapCompass.shapeImageToPixels(0, 0, 33, 33, 25, 25, Game.getMinimapRotation(), 256, MovedStatics.anIntArray62, MovedStatics.anIntArray66);
88-
ActorDefinition.drawMapBack();
90+
drawMapBack();
8991
return;
9092
}
9193

@@ -182,7 +184,7 @@ else if(isTeammate)
182184
if(MovedStatics.menuOpen && ScreenController.frameMode == ScreenMode.FIXED && MovedStatics.menuScreenArea == 1) {
183185
MovedStatics.drawMenu(550, 4);
184186
}
185-
ActorDefinition.drawMapBack();
187+
drawMapBack();
186188

187189
}
188190

@@ -403,6 +405,17 @@ public static void method299(int arg1) {
403405
}
404406
}
405407

408+
public static void drawMapBack() {
409+
try {
410+
if(ScreenController.frameMode == ScreenMode.FIXED) {
411+
Graphics graphics = Game.gameCanvas.getGraphics();
412+
mapbackProducingGraphicsBuffer.drawGraphics(550, 4, graphics);
413+
}
414+
} catch(Exception exception) {
415+
Game.gameCanvas.repaint();
416+
}
417+
}
418+
406419
public void drawResizableMiniMapArea(int x, int y) {
407420
ScreenController.drawFramePiece(resizableMiniMapimage, x, y);
408421
}

‎src/main/java/org/runejs/client/media/renderable/actor/Player.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.runejs.client.media.renderable.actor;
22

33
import org.runejs.client.*;
4-
import org.runejs.client.cache.def.ActorDefinition;
54
import org.runejs.client.cache.def.ItemDefinition;
65
import org.runejs.client.cache.media.AnimationSequence;
76
import org.runejs.client.cache.def.SpotAnimDefinition;
@@ -110,7 +109,7 @@ public static void parsePlayerUpdateMasks(PacketBuffer appearanceBuffer, Player
110109
if(animationId == 65535)
111110
animationId = -1;
112111
int animationDelay = appearanceBuffer.getUnsignedByte();
113-
ActorDefinition.playAnimation(animationId, animationDelay, player);
112+
playAnimation(animationId, animationDelay, player);
114113
}
115114
if((mask & 0x4) != 0) { // face actor
116115
player.facingActorIndex = appearanceBuffer.getUnsignedShortBE();
@@ -318,6 +317,28 @@ public static boolean hasFriend(String arg0) {
318317
return arg0.equalsIgnoreCase(localPlayer.playerName);
319318
}
320319

320+
public static void playAnimation(int animationId, int animationDelay, Player player) {
321+
if(player.playingAnimation == animationId && animationId != -1) {
322+
int i = AnimationSequence.getAnimationSequence(animationId).replyMode;
323+
if(i == 1) {
324+
player.anInt3104 = 0;
325+
player.anInt3095 = 0;
326+
player.playingAnimationDelay = animationDelay;
327+
player.anInt3115 = 0;
328+
}
329+
if(i == 2) {
330+
player.anInt3095 = 0;
331+
}
332+
} else if(animationId == -1 || player.playingAnimation == -1 || AnimationSequence.getAnimationSequence(animationId).forcedPriority >= AnimationSequence.getAnimationSequence(player.playingAnimation).forcedPriority) {
333+
player.anInt3094 = player.anInt3109;
334+
player.anInt3104 = 0;
335+
player.anInt3115 = 0;
336+
player.anInt3095 = 0;
337+
player.playingAnimationDelay = animationDelay;
338+
player.playingAnimation = animationId;
339+
}
340+
}
341+
321342
public Model getRotatedModel() {
322343
if(playerAppearance == null)
323344
return null;

‎src/main/java/org/runejs/client/scene/InteractiveObjectTemporary.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ private static ImageRGB[] method319() {
313313
for(int i_5_ = 0; i_5_ < i_4_; i_5_++)
314314
class40_sub5_sub14_sub4.pixels[i_5_] = Buffer.anIntArray1972[BitUtils.bitWiseAND(255, is[i_5_])];
315315
}
316-
ActorDefinition.method569();
316+
MovedStatics.method569();
317317
return class40_sub5_sub14_sub4s;
318318
}
319319

0 commit comments

Comments
 (0)