2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2026-08-16 07:55:13 -06:00
Code Issues Projects Releases Packages Wiki Activity

Moved around more static methods, nothing final

Browse source 
Some of these are "incorrect" - I wanted to decrease the # of static classes first by grouping them if they're slightly related.
Then I'll do a second pass in each class to reorganize later.
This commit is contained in:
Pazaz 2022-05-16 01:13:34 -04:00
parent c988509e8e
commit ba4debb0d3
No known key found for this signature in database
GPG key ID: 8658637376F9B835
150 changed files with 2805 additions and 3034 deletions
Download patch file Download diff file Expand all files Collapse all files

139
client/src/main/java/rt4/Static38.java
View file

@ -156,143 +156,4 @@ public final class Static38 {
return -1;
}
@OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V")
public static void method964(@OriginalArg(0) boolean arg0) {
@Pc(3) int local3 = PlayerList.size;
if (Static115.mapFlagX == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == Static84.anInt2255) {
Static115.mapFlagX = 0;
}
if (arg0) {
local3 = 1;
}
@Pc(28) int local28;
@Pc(39) Player local39;
@Pc(82) int local82;
@Pc(182) int local182;
@Pc(200) int local200;
@Pc(214) int local214;
@Pc(223) int local223;
@Pc(106) int local106;
for (local28 = 0; local28 < local3; local28++) {
if (arg0) {
local39 = PlayerList.self;
} else {
local39 = PlayerList.players[PlayerList.ids[local28]];
}
if (local39 != null && local39.method2682()) {
@Pc(55) int local55 = local39.getSize();
@Pc(77) int local77;
if (local55 == 1) {
if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
local77 = local39.xFine >> 7;
local82 = local39.zFine >> 7;
if (local77 >= 0 && local77 < 104 && local82 >= 0 && local82 < 104) {
local106 = Static31.anIntArrayArray6[local77][local82]++;
}
}
} else if (((local55 & 0x1) != 0 || (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0) && ((local55 & 0x1) != 1 || (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64)) {
local77 = local39.xFine - local55 * 64 >> 7;
local82 = local39.zFine - local55 * 64 >> 7;
local182 = local39.getSize() + local77;
if (local182 > 104) {
local182 = 104;
}
if (local77 < 0) {
local77 = 0;
}
local200 = local82 + local39.getSize();
if (local82 < 0) {
local82 = 0;
}
if (local200 > 104) {
local200 = 104;
}
for (local214 = local77; local214 < local182; local214++) {
for (local223 = local82; local223 < local200; local223++) {
local106 = Static31.anIntArrayArray6[local214][local223]++;
}
}
}
}
}
label220: for (local28 = 0; local28 < local3; local28++) {
@Pc(272) long local272;
if (arg0) {
local39 = PlayerList.self;
local272 = 8791798054912L;
} else {
local39 = PlayerList.players[PlayerList.ids[local28]];
local272 = (long) PlayerList.ids[local28] << 32;
}
if (local39 != null && local39.method2682()) {
local39.aBoolean98 = false;
if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId) {
local39.aBoolean98 = true;
}
local82 = local39.getSize();
if (local82 == 1) {
if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
local182 = local39.xFine >> 7;
local200 = local39.zFine >> 7;
if (local182 < 0 || local182 >= 104 || local200 < 0 || local200 >= 104) {
continue;
}
if (Static31.anIntArrayArray6[local182][local200] > 1) {
local106 = Static31.anIntArrayArray6[local182][local200]--;
continue;
}
}
} else if ((local82 & 0x1) == 0 && (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0 || (local82 & 0x1) == 1 && (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 0) {
local182 = local39.xFine - local82 * 64 >> 7;
local214 = local82 + local182;
local200 = local39.zFine - local82 * 64 >> 7;
if (local214 > 104) {
local214 = 104;
}
if (local182 < 0) {
local182 = 0;
}
local223 = local82 + local200;
if (local200 < 0) {
local200 = 0;
}
@Pc(468) boolean local468 = true;
if (local223 > 104) {
local223 = 104;
}
@Pc(476) int local476;
@Pc(485) int local485;
for (local476 = local182; local476 < local214; local476++) {
for (local485 = local200; local485 < local223; local485++) {
if (Static31.anIntArrayArray6[local476][local485] <= 1) {
local468 = false;
break;
}
}
}
if (local468) {
local476 = local182;
while (true) {
if (local476 >= local214) {
continue label220;
}
for (local485 = local200; local485 < local223; local485++) {
local106 = Static31.anIntArrayArray6[local476][local485]--;
}
local476++;
}
}
}
if (local39.attachment == null || client.loop < local39.anInt3390 || local39.anInt3375 <= client.loop) {
local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
Static43.method1141(Player.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171);
} else {
local39.aBoolean98 = false;
local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
Static184.method3387(Player.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.atachmentX0, local39.attachmentZ0, local39.attachmentX1, local39.attachmentZ1);
}
}
}
}
}