Moved around more static methods, nothing final

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

View file

@ -40,6 +40,10 @@ public final class PlayerAppearance {
public static final PlayerAppearance DEFAULT = new PlayerAppearance();
@OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I")
public static final int[] FEMALE_FEATURES = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 };
@OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;")
public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14];
@OriginalMember(owner = "client!vf", name = "g", descriptor = "[I")
public static final int[] anIntArray515 = new int[14];
@OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S")
public static short[][] aShortArrayArray2;
@OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S")
@ -366,16 +370,16 @@ public final class PlayerAppearance {
local374 = arg0[local353].anInt5399;
local367 = arg0[local353].anInt5398;
local381 = local858.frames[local374];
Static276.aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16);
aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16);
local381 &= 0xFFFF;
Static241.anIntArray520[local353] = local381;
if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) {
local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381);
local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
if (aClass3_Sub2_Sub7Array8[local353] != null) {
local836 |= aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381);
local827 |= aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
local838 |= local858.aBoolean278;
}
if ((local858.tween || SeqType.applyTweening) && local367 != -1 && local367 < local858.frames.length) {
Static262.anIntArray515[local353] = local858.anIntArray474[local374];
anIntArray515[local353] = local858.anIntArray474[local374];
Static73.anIntArray183[local353] = arg0[local353].anInt5404;
local979 = local858.frames[local367];
Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16);
@ -386,7 +390,7 @@ public final class PlayerAppearance {
local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991);
}
} else {
Static262.anIntArray515[local353] = 0;
anIntArray515[local353] = 0;
Static73.anIntArray183[local353] = 0;
Static133.aClass3_Sub2_Sub7Array7[local353] = null;
anIntArray187[local353] = -1;
@ -463,8 +467,8 @@ public final class PlayerAppearance {
local481 = 0;
local598 = 1;
while (local481 < local346) {
if (Static276.aClass3_Sub2_Sub7Array8[local481] != null) {
local1284.method4565(Static276.aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, Static262.anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]);
if (aClass3_Sub2_Sub7Array8[local481] != null) {
local1284.method4565(aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]);
}
local481++;
local598 <<= 0x1;
@ -477,7 +481,7 @@ public final class PlayerAppearance {
local1284.method4558(local1154, local979, local1156, local451, arg4 - 1, local457, arg2.aBoolean278);
}
for (local481 = 0; local481 < local346; local481++) {
Static276.aClass3_Sub2_Sub7Array8[local481] = null;
aClass3_Sub2_Sub7Array8[local481] = null;
Static133.aClass3_Sub2_Sub7Array7[local481] = null;
aClass144Array2[local481] = null;
}