2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2026-08-17 08:25:14 -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

117
client/src/main/java/rt4/Static173.java
View file

@ -9,122 +9,7 @@ public final class Static173 {
@OriginalMember(owner = "client!nk", name = "d", descriptor = "[I")
public static int[] anIntArray367;
@OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V")
public static void method3240(@OriginalArg(1) boolean arg0) {
@Pc(7) int local7;
@Pc(16) Npc local16;
@Pc(107) int local107;
@Pc(113) int local113;
@Pc(133) int local133;
@Pc(149) int local149;
@Pc(158) int local158;
@Pc(171) int local171;
for (local7 = 0; local7 < NpcList.size; local7++) {
local16 = NpcList.npcs[NpcList.ids[local7]];
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
@Pc(42) int local42 = local16.getSize();
@Pc(97) int local97;
if (local42 == 1) {
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local97 = local16.xFine >> 7;
local107 = local16.zFine >> 7;
if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) {
local171 = Static31.anIntArrayArray6[local97][local107]++;
}
}
} else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) {
local97 = local16.xFine - local42 * 64 >> 7;
local107 = local16.zFine - local42 * 64 >> 7;
local113 = local16.getSize() + local97;
if (local97 < 0) {
local97 = 0;
}
if (local113 > 104) {
local113 = 104;
}
local133 = local107 + local16.getSize();
if (local107 < 0) {
local107 = 0;
}
if (local133 > 104) {
local133 = 104;
}
for (local149 = local97; local149 < local113; local149++) {
for (local158 = local107; local158 < local133; local158++) {
local171 = Static31.anIntArrayArray6[local149][local158]++;
}
}
}
}
}
label200: for (local7 = 0; local7 < NpcList.size; local7++) {
local16 = NpcList.npcs[NpcList.ids[local7]];
@Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L;
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
local107 = local16.getSize();
if (local107 == 1) {
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine >> 7;
local133 = local16.zFine >> 7;
if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) {
continue;
}
if (Static31.anIntArrayArray6[local113][local133] > 1) {
local171 = Static31.anIntArrayArray6[local113][local133]--;
continue;
}
}
} else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine - local107 * 64 >> 7;
local133 = local16.zFine - local107 * 64 >> 7;
local158 = local133 + local107;
if (local133 < 0) {
local133 = 0;
}
@Pc(368) boolean local368 = true;
local149 = local113 + local107;
if (local158 > 104) {
local158 = 104;
}
if (local113 < 0) {
local113 = 0;
}
if (local149 > 104) {
local149 = 104;
}
@Pc(396) int local396;
@Pc(401) int local401;
for (local396 = local113; local396 < local149; local396++) {
for (local401 = local133; local401 < local158; local401++) {
if (Static31.anIntArrayArray6[local396][local401] <= 1) {
local368 = false;
break;
}
}
}
if (local368) {
local396 = local113;
while (true) {
if (local396 >= local149) {
continue label200;
}
for (local401 = local133; local401 < local158; local401++) {
local171 = Static31.anIntArrayArray6[local396][local401]--;
}
local396++;
}
}
}
if (!local16.type.aBoolean183) {
local262 |= Long.MIN_VALUE;
}
local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine);
Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
}
}
}
@OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V")
@OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V")
public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) {
Static83.method436(arg0, 0, arg0.length - 1, arg1);
}