Skip to content

Commit d7121a8

Browse files
PromisesPromises
authored
Merge pull request #173 from runejs/move-statics-to-movedstatics-2
refactor: move packetBuffer to OutgoingPackets
2 parents 39e28b9 + 88700f8 commit d7121a8

File tree

14 files changed

+109
-120
lines changed

14 files changed

+109
-120
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ public class Class17 {
1313
public static ProducingGraphicsBuffer aProducingGraphicsBuffer_463;
1414
public static int[] anIntArray466 = new int[256];
1515

16-
public static int method274() {
17-
return Class49.anInt1147++;
18-
}
19-
2016
public static void animatePlayers(int playerIndex) {
2117
for(int currentPlayerIndex = playerIndex; Player.localPlayerCount > currentPlayerIndex; currentPlayerIndex++) {
2218
int actualIndex;

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

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.runejs.client.media.renderable.actor.Npc;
1212
import org.runejs.client.media.renderable.actor.Player;
1313
import org.runejs.client.media.renderable.actor.PlayerAppearance;
14+
import org.runejs.client.net.OutgoingPackets;
1415
import org.runejs.client.scene.Point2d;
1516
import org.runejs.client.scene.SceneCluster;
1617

@@ -233,54 +234,54 @@ else if(i_11_ < 150)
233234

234235
public static void method406(int arg0, int arg1, int arg2) {
235236
if(arg1 == 1) {
236-
SceneCluster.packetBuffer.putPacket(111);
237-
SceneCluster.packetBuffer.putIntBE(arg2);
238-
SceneCluster.packetBuffer.putShortBE(arg0);
237+
OutgoingPackets.buffer.putPacket(111);
238+
OutgoingPackets.buffer.putIntBE(arg2);
239+
OutgoingPackets.buffer.putShortBE(arg0);
239240
}
240241
if(arg1 == 2) {
241-
SceneCluster.packetBuffer.putPacket(9);
242-
SceneCluster.packetBuffer.putIntBE(arg2);
243-
SceneCluster.packetBuffer.putShortBE(arg0);
242+
OutgoingPackets.buffer.putPacket(9);
243+
OutgoingPackets.buffer.putIntBE(arg2);
244+
OutgoingPackets.buffer.putShortBE(arg0);
244245
}
245246
if(arg1 == 3) {
246-
SceneCluster.packetBuffer.putPacket(193);
247-
SceneCluster.packetBuffer.putIntBE(arg2);
248-
SceneCluster.packetBuffer.putShortBE(arg0);
247+
OutgoingPackets.buffer.putPacket(193);
248+
OutgoingPackets.buffer.putIntBE(arg2);
249+
OutgoingPackets.buffer.putShortBE(arg0);
249250
}
250251
if(arg1 == 4) {
251-
SceneCluster.packetBuffer.putPacket(53);
252-
SceneCluster.packetBuffer.putIntBE(arg2);
253-
SceneCluster.packetBuffer.putShortBE(arg0);
252+
OutgoingPackets.buffer.putPacket(53);
253+
OutgoingPackets.buffer.putIntBE(arg2);
254+
OutgoingPackets.buffer.putShortBE(arg0);
254255
}
255256
if(arg1 == 5) {
256-
SceneCluster.packetBuffer.putPacket(94);
257-
SceneCluster.packetBuffer.putIntBE(arg2);
258-
SceneCluster.packetBuffer.putShortBE(arg0);
257+
OutgoingPackets.buffer.putPacket(94);
258+
OutgoingPackets.buffer.putIntBE(arg2);
259+
OutgoingPackets.buffer.putShortBE(arg0);
259260
}
260261
if(arg1 == 6) {
261-
SceneCluster.packetBuffer.putPacket(213);
262-
SceneCluster.packetBuffer.putIntBE(arg2);
263-
SceneCluster.packetBuffer.putShortBE(arg0);
262+
OutgoingPackets.buffer.putPacket(213);
263+
OutgoingPackets.buffer.putIntBE(arg2);
264+
OutgoingPackets.buffer.putShortBE(arg0);
264265
}
265266
if(arg1 == 7) {
266-
SceneCluster.packetBuffer.putPacket(46);
267-
SceneCluster.packetBuffer.putIntBE(arg2);
268-
SceneCluster.packetBuffer.putShortBE(arg0);
267+
OutgoingPackets.buffer.putPacket(46);
268+
OutgoingPackets.buffer.putIntBE(arg2);
269+
OutgoingPackets.buffer.putShortBE(arg0);
269270
}
270271
if(arg1 == 8) {
271-
SceneCluster.packetBuffer.putPacket(130);
272-
SceneCluster.packetBuffer.putIntBE(arg2);
273-
SceneCluster.packetBuffer.putShortBE(arg0);
272+
OutgoingPackets.buffer.putPacket(130);
273+
OutgoingPackets.buffer.putIntBE(arg2);
274+
OutgoingPackets.buffer.putShortBE(arg0);
274275
}
275276
if(arg1 == 9) {
276-
SceneCluster.packetBuffer.putPacket(157);
277-
SceneCluster.packetBuffer.putIntBE(arg2);
278-
SceneCluster.packetBuffer.putShortBE(arg0);
277+
OutgoingPackets.buffer.putPacket(157);
278+
OutgoingPackets.buffer.putIntBE(arg2);
279+
OutgoingPackets.buffer.putShortBE(arg0);
279280
}
280281
if(arg1 == 10) {
281-
SceneCluster.packetBuffer.putPacket(84);
282-
SceneCluster.packetBuffer.putIntBE(arg2);
283-
SceneCluster.packetBuffer.putShortBE(arg0);
282+
OutgoingPackets.buffer.putPacket(84);
283+
OutgoingPackets.buffer.putIntBE(arg2);
284+
OutgoingPackets.buffer.putShortBE(arg0);
284285
}
285286
}
286287

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.runejs.client.frame.Minimap;
55
import org.runejs.client.media.renderable.actor.Player;
66
import org.runejs.client.net.IncomingPackets;
7-
import org.runejs.client.scene.SceneCluster;
7+
import org.runejs.client.net.OutgoingPackets;
88

99
public class Class37 {
1010
public static int anInt876 = 0;
@@ -19,7 +19,7 @@ public static void method434() {
1919
IncomingPackets.opcode = -1;
2020
MovedStatics.menuActionRow = 0;
2121
IncomingPackets.incomingPacketSize = 0;
22-
SceneCluster.packetBuffer.currentPosition = 0;
22+
OutgoingPackets.buffer.currentPosition = 0;
2323
IncomingPackets.lastOpcode = -1;
2424
IncomingPackets.secondLastOpcode = -1;
2525
IncomingPackets.cyclesSinceLastPacket = 0;

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
package org.runejs.client;
22

33
import org.runejs.client.cache.CacheArchive;
4-
import org.runejs.client.input.MouseHandler;
5-
import org.runejs.client.media.renderable.Model;
6-
import org.runejs.client.media.renderable.actor.Player;
7-
import org.runejs.client.scene.SceneCamera;
8-
import org.runejs.client.scene.SceneCluster;
94

105
public class Class49 {
11-
public static volatile int anInt1147 = 0;
126
public static CacheArchive definitionCache;
137
public static int anInt1154;
148

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

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ public static void setConfigToDefaults() {
691691
Class40_Sub5_Sub15.systemUpdateTime = 0;
692692
IncomingPackets.cyclesSinceLastPacket = 0;
693693
Player.headIconDrawType = 0;
694-
SceneCluster.packetBuffer.currentPosition = 0;
694+
OutgoingPackets.buffer.currentPosition = 0;
695695
SceneCluster.idleLogout = 0;
696696
IncomingPackets.thirdLastOpcode = -1;
697697
IncomingPackets.incomingPacketBuffer.currentPosition = 0;
@@ -887,10 +887,10 @@ public static void method364(boolean arg1) {
887887
if(MovedStatics.anInt537 >= 50 || arg1) {
888888
MovedStatics.anInt537 = 0;
889889
if(!aBoolean871 && MovedStatics.gameServerSocket != null) {
890-
SceneCluster.packetBuffer.putPacket(13);
890+
OutgoingPackets.buffer.putPacket(13);
891891
try {
892-
MovedStatics.gameServerSocket.sendDataFromBuffer(SceneCluster.packetBuffer.currentPosition, 0, SceneCluster.packetBuffer.buffer);
893-
SceneCluster.packetBuffer.currentPosition = 0;
892+
MovedStatics.gameServerSocket.sendDataFromBuffer(OutgoingPackets.buffer.currentPosition, 0, OutgoingPackets.buffer.buffer);
893+
OutgoingPackets.buffer.currentPosition = 0;
894894
} catch(java.io.IOException ioexception) {
895895
aBoolean871 = true;
896896
}
@@ -1272,16 +1272,16 @@ public static void updateGame() {
12721272
for(int i = 0; i < Item.obfuscatedKeyStatus.length; i++)
12731273
Item.obfuscatedKeyStatus[i] = false;
12741274
}
1275-
ClientScriptRunner.createClientScriptCheckPacket(205, SceneCluster.packetBuffer);
1275+
ClientScriptRunner.createClientScriptCheckPacket(205, OutgoingPackets.buffer);
12761276
synchronized(mouseCapturer.objectLock) {
12771277
if(MovedStatics.accountFlagged) {
12781278
if(MouseHandler.clickType != 0 || mouseCapturer.coord >= 40) {
12791279
int coordinateCount = 0;
1280-
SceneCluster.packetBuffer.putPacket(210);
1281-
SceneCluster.packetBuffer.putByte(0);
1282-
int originalOffset = SceneCluster.packetBuffer.currentPosition;
1280+
OutgoingPackets.buffer.putPacket(210);
1281+
OutgoingPackets.buffer.putByte(0);
1282+
int originalOffset = OutgoingPackets.buffer.currentPosition;
12831283
for(int c = 0; c < mouseCapturer.coord; c++) {
1284-
if(-originalOffset + SceneCluster.packetBuffer.currentPosition >= 240)
1284+
if(-originalOffset + OutgoingPackets.buffer.currentPosition >= 240)
12851285
break;
12861286
coordinateCount++;
12871287
int pixelOffset = mouseCapturer.coordsY[c];
@@ -1312,18 +1312,18 @@ else if(x > 764)
13121312
if(duplicateClickCount < 8 && differenceX >= -32 && differenceX <= 31 && differenceY >= -32 && differenceY <= 31) {
13131313
differenceX += 32;
13141314
differenceY += 32;
1315-
SceneCluster.packetBuffer.putShortBE(differenceY + (differenceX << 6) + (duplicateClickCount << 12));
1315+
OutgoingPackets.buffer.putShortBE(differenceY + (differenceX << 6) + (duplicateClickCount << 12));
13161316
duplicateClickCount = 0;
13171317
} else if(duplicateClickCount < 8) {
1318-
SceneCluster.packetBuffer.putMediumBE(y + 8388608 + (duplicateClickCount << 19));
1318+
OutgoingPackets.buffer.putMediumBE(y + 8388608 + (duplicateClickCount << 19));
13191319
duplicateClickCount = 0;
13201320
} else {
1321-
SceneCluster.packetBuffer.putIntBE((duplicateClickCount << 19) + -1073741824 + y);
1321+
OutgoingPackets.buffer.putIntBE((duplicateClickCount << 19) + -1073741824 + y);
13221322
duplicateClickCount = 0;
13231323
}
13241324
}
13251325
}
1326-
SceneCluster.packetBuffer.finishVarByte(SceneCluster.packetBuffer.currentPosition + -originalOffset);
1326+
OutgoingPackets.buffer.finishVarByte(OutgoingPackets.buffer.currentPosition + -originalOffset);
13271327
if(coordinateCount < mouseCapturer.coord) {
13281328
mouseCapturer.coord -= coordinateCount;
13291329
for(int i_9_ = 0; mouseCapturer.coord > i_9_; i_9_++) {
@@ -1358,9 +1358,9 @@ else if(x > 764)
13581358
if(l > 4095)
13591359
l = 4095L;
13601360
int i_12_ = (int) l;
1361-
SceneCluster.packetBuffer.putPacket(234);
1361+
OutgoingPackets.buffer.putPacket(234);
13621362
int i_13_ = i_10_ * 765 + i;
1363-
SceneCluster.packetBuffer.putIntLE((i_11_ << 19) + (i_12_ << 20) + i_13_);
1363+
OutgoingPackets.buffer.putIntLE((i_11_ << 19) + (i_12_ << 20) + i_13_);
13641364
}
13651365
if(InteractiveObject.anInt487 > 0)
13661366
InteractiveObject.anInt487--;
@@ -1369,19 +1369,19 @@ else if(x > 764)
13691369
if(MovedStatics.aBoolean565 && InteractiveObject.anInt487 <= 0) {
13701370
InteractiveObject.anInt487 = 20;
13711371
MovedStatics.aBoolean565 = false;
1372-
SceneCluster.packetBuffer.putPacket(58);
1373-
SceneCluster.packetBuffer.putShortBE(Game.playerCamera.getYaw());
1374-
SceneCluster.packetBuffer.putShortBE(Game.playerCamera.getPitch());
1372+
OutgoingPackets.buffer.putPacket(58);
1373+
OutgoingPackets.buffer.putShortBE(Game.playerCamera.getYaw());
1374+
OutgoingPackets.buffer.putShortBE(Game.playerCamera.getPitch());
13751375
}
13761376
if(MovedStatics.aBoolean571 && !aBoolean1735) {
13771377
aBoolean1735 = true;
1378-
SceneCluster.packetBuffer.putPacket(160);
1379-
SceneCluster.packetBuffer.putByte(1);
1378+
OutgoingPackets.buffer.putPacket(160);
1379+
OutgoingPackets.buffer.putByte(1);
13801380
}
13811381
if(!MovedStatics.aBoolean571 && aBoolean1735) {
13821382
aBoolean1735 = false;
1383-
SceneCluster.packetBuffer.putPacket(160);
1384-
SceneCluster.packetBuffer.putByte(0);
1383+
OutgoingPackets.buffer.putPacket(160);
1384+
OutgoingPackets.buffer.putByte(0);
13851385
}
13861386
LinkedList.method910();
13871387
if(Class51.gameStatusCode == 30 || Class51.gameStatusCode == 35) {
@@ -1550,27 +1550,27 @@ else if(ChatBox.dialogueId != -1)
15501550
for(int i_19_ = 0; i_19_ < 5; i_19_++)
15511551
SceneCamera.customCameraTimer[i_19_]++;
15521552
GameInterface.manageTextInputs();
1553-
int i_20_ = Npc.method400(-1);
1554-
int i_21_ = Class17.method274();
1553+
int i_20_ = MouseHandler.resetFramesSinceMouseInput();
1554+
int i_21_ = KeyFocusListener.resetFramesSinceKeyboardInput();
15551555
if(i_20_ > 4500 && i_21_ > 4500) {
15561556
SceneCluster.idleLogout = 250;
15571557
MovedStatics.method650(4000);
1558-
SceneCluster.packetBuffer.putPacket(216);
1558+
OutgoingPackets.buffer.putPacket(216);
15591559
}
15601560

15611561
// antibot camera/minimap randomisation used to happen here
15621562

15631563
MovedStatics.anInt537++;
15641564
if(MovedStatics.anInt537 > 50) {
1565-
SceneCluster.packetBuffer.putPacket(13);
1565+
OutgoingPackets.buffer.putPacket(13);
15661566
}
15671567
do {
15681568
try {
1569-
if(MovedStatics.gameServerSocket == null || SceneCluster.packetBuffer.currentPosition <= 0)
1569+
if(MovedStatics.gameServerSocket == null || OutgoingPackets.buffer.currentPosition <= 0)
15701570
break;
1571-
MovedStatics.gameServerSocket.sendDataFromBuffer(SceneCluster.packetBuffer.currentPosition, 0, SceneCluster.packetBuffer.buffer);
1571+
MovedStatics.gameServerSocket.sendDataFromBuffer(OutgoingPackets.buffer.currentPosition, 0, OutgoingPackets.buffer.buffer);
15721572
MovedStatics.anInt537 = 0;
1573-
SceneCluster.packetBuffer.currentPosition = 0;
1573+
OutgoingPackets.buffer.currentPosition = 0;
15741574
} catch(java.io.IOException ioexception) {
15751575
Class59.dropClient();
15761576
break;
@@ -1615,11 +1615,11 @@ public static void handleLoginScreenActions() {
16151615
}
16161616
if (loginStatus == 2) {
16171617
long l = MovedStatics.aLong853 = RSString.nameToLong(Native.username.toString());
1618-
SceneCluster.packetBuffer.currentPosition = 0;
1619-
SceneCluster.packetBuffer.putByte(14);
1618+
OutgoingPackets.buffer.currentPosition = 0;
1619+
OutgoingPackets.buffer.putByte(14);
16201620
int i = (int) (0x1fL & l >> 16);
1621-
SceneCluster.packetBuffer.putByte(i);
1622-
MovedStatics.gameServerSocket.sendDataFromBuffer(2, 0, SceneCluster.packetBuffer.buffer);
1621+
OutgoingPackets.buffer.putByte(i);
1622+
MovedStatics.gameServerSocket.sendDataFromBuffer(2, 0, OutgoingPackets.buffer.buffer);
16231623
loginStatus = 3;
16241624
IncomingPackets.incomingPacketBuffer.currentPosition = 0;
16251625
}
@@ -1656,17 +1656,17 @@ public static void handleLoginScreenActions() {
16561656
seeds[1] = (int) (Math.random() * 9.9999999E7);
16571657
seeds[2] = (int) (Renderable.aLong2858 >> 32);
16581658
seeds[3] = (int) Renderable.aLong2858;
1659-
SceneCluster.packetBuffer.currentPosition = 0;
1660-
SceneCluster.packetBuffer.putByte(10);
1661-
SceneCluster.packetBuffer.putIntBE(seeds[0]);
1662-
SceneCluster.packetBuffer.putIntBE(seeds[1]);
1663-
SceneCluster.packetBuffer.putIntBE(seeds[2]);
1664-
SceneCluster.packetBuffer.putIntBE(seeds[3]);
1665-
SceneCluster.packetBuffer.putIntBE(signlink.uid);
1666-
SceneCluster.packetBuffer.putLongBE(RSString.nameToLong(Native.username.toString()));
1667-
SceneCluster.packetBuffer.method505(Native.password);
1659+
OutgoingPackets.buffer.currentPosition = 0;
1660+
OutgoingPackets.buffer.putByte(10);
1661+
OutgoingPackets.buffer.putIntBE(seeds[0]);
1662+
OutgoingPackets.buffer.putIntBE(seeds[1]);
1663+
OutgoingPackets.buffer.putIntBE(seeds[2]);
1664+
OutgoingPackets.buffer.putIntBE(seeds[3]);
1665+
OutgoingPackets.buffer.putIntBE(signlink.uid);
1666+
OutgoingPackets.buffer.putLongBE(RSString.nameToLong(Native.username.toString()));
1667+
OutgoingPackets.buffer.method505(Native.password);
16681668
if (Configuration.RSA_ENABLED) {
1669-
SceneCluster.packetBuffer.applyRSA(Configuration.RSA_MODULUS, Configuration.RSA_PUBLIC_KEY);
1669+
OutgoingPackets.buffer.applyRSA(Configuration.RSA_MODULUS, Configuration.RSA_PUBLIC_KEY);
16701670
}
16711671

16721672

@@ -1680,7 +1680,7 @@ public static void handleLoginScreenActions() {
16801680
// New session
16811681
MovedStatics.packetBuffer.putByte(16);
16821682
}
1683-
MovedStatics.packetBuffer.putByte(57 + SceneCluster.packetBuffer.currentPosition);
1683+
MovedStatics.packetBuffer.putByte(57 + OutgoingPackets.buffer.currentPosition);
16841684
MovedStatics.packetBuffer.putIntBE(435);
16851685
MovedStatics.packetBuffer.putByte(VertexNormal.lowMemory ? 1 : 0);
16861686
MovedStatics.packetBuffer.putIntBE(CacheArchive.skeletonCacheArchive.crc8);
@@ -1696,12 +1696,12 @@ public static void handleLoginScreenActions() {
16961696
MovedStatics.packetBuffer.putIntBE(CacheArchive.huffmanCacheArchive.crc8);
16971697
MovedStatics.packetBuffer.putIntBE(CacheArchive.jingleCacheArchive.crc8);
16981698
MovedStatics.packetBuffer.putIntBE(CacheArchive.clientScriptCacheArchive.crc8);
1699-
MovedStatics.packetBuffer.putBytes(0, SceneCluster.packetBuffer.currentPosition, SceneCluster.packetBuffer.buffer);
1699+
MovedStatics.packetBuffer.putBytes(0, OutgoingPackets.buffer.currentPosition, OutgoingPackets.buffer.buffer);
17001700
MovedStatics.gameServerSocket.sendDataFromBuffer(MovedStatics.packetBuffer.currentPosition, 0, MovedStatics.packetBuffer.buffer);
1701-
SceneCluster.packetBuffer.initOutCipher(seeds);
1701+
OutgoingPackets.buffer.initOutCipher(seeds);
17021702

17031703
// TODO (Jameskmonger) this allows the OutgoingPackets to access the ISAAC cipher. This is a hack and should be fixed.
1704-
OutgoingPackets.init(SceneCluster.packetBuffer.outCipher);
1704+
OutgoingPackets.init(OutgoingPackets.buffer.outCipher);
17051705

17061706
for (int i = 0; i < 4; i++) {
17071707
seeds[i] += 50;

0 commit comments

Comments
 (0)