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

21
client/src/main/java/rt4/Static158.java
View file

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static158 {
@OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;")
public static Map aClass3_Sub2_Sub4_3;
@OriginalMember(owner = "client!mh", name = "X", descriptor = "I")
public static int anInt3851 = -1;
@OriginalMember(owner = "client!mg", name = "Q", descriptor = "I")
@ -15,32 +12,32 @@ public final class Static158 {
@OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
public static void decodeNpcFiles() {
@Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length;
@Pc(10) int local10 = LoginManager.npcSpawnsFilesBuffer.length;
for (@Pc(16) int local16 = 0; local16 < local10; local16++) {
if (Static191.npcSpawnsFilesBuffer[local16] != null) {
if (LoginManager.npcSpawnsFilesBuffer[local16] != null) {
@Pc(25) int local25 = -1;
for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) {
if (Static217.anIntArray434[local27] == Static238.regionBitPacked[local16]) {
if (Static217.anIntArray434[local27] == LoginManager.regionBitPacked[local16]) {
local25 = local27;
break;
}
}
if (local25 == -1) {
Static217.anIntArray434[anInt3811] = Static238.regionBitPacked[local16];
Static217.anIntArray434[anInt3811] = LoginManager.regionBitPacked[local16];
local25 = anInt3811++;
}
@Pc(67) int local67 = 0;
@Pc(74) Buffer local74 = new Buffer(Static191.npcSpawnsFilesBuffer[local16]);
while (local74.offset < Static191.npcSpawnsFilesBuffer[local16].length && local67 < 511) {
@Pc(74) Buffer local74 = new Buffer(LoginManager.npcSpawnsFilesBuffer[local16]);
while (local74.offset < LoginManager.npcSpawnsFilesBuffer[local16].length && local67 < 511) {
@Pc(97) int local97 = local67++ << 6 | local25;
@Pc(103) int local103 = local74.g2();
@Pc(107) int local107 = local103 >> 14;
@Pc(113) int local113 = local103 >> 7 & 0x3F;
@Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Camera.originX;
@Pc(125) int local125 = local113 + (LoginManager.regionBitPacked[local16] >> 8) * 64 - Camera.originX;
@Pc(129) int local129 = local103 & 0x3F;
@Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ;
@Pc(142) int local142 = local129 + (LoginManager.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ;
@Pc(148) NpcType local148 = NpcTypeList.get(local74.g2());
if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == LoginManager.centralPlane && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
NpcList.npcs[local97] = new Npc();
@Pc(198) Npc local198 = NpcList.npcs[local97];
NpcList.ids[NpcList.size++] = local97;