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

@ -15,132 +15,7 @@ public final class Static231 {
@OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z")
public static boolean aBoolean252 = false;
@OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIBIII)V")
public static void method3981(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
@Pc(7) int local7 = 0;
@Pc(12) int local12 = arg0 - arg3;
@Pc(14) int local14 = 0;
@Pc(16) int local16 = arg6;
@Pc(20) int local20 = arg6 * arg6;
@Pc(25) int local25 = arg6 - arg3;
@Pc(29) int local29 = arg0 * arg0;
@Pc(33) int local33 = local20 << 1;
@Pc(37) int local37 = local25 * local25;
@Pc(41) int local41 = local12 * local12;
@Pc(45) int local45 = local29 << 1;
@Pc(49) int local49 = local37 << 1;
@Pc(53) int local53 = local41 << 1;
@Pc(57) int local57 = local25 << 1;
@Pc(61) int local61 = arg6 << 1;
@Pc(70) int local70 = local33 + local29 * (1 - local61);
@Pc(79) int local79 = local20 - (local61 - 1) * local45;
@Pc(88) int local88 = local49 + local41 * (1 - local57);
@Pc(96) int local96 = local37 - local53 * (local57 - 1);
@Pc(100) int local100 = local20 << 2;
@Pc(104) int local104 = local29 << 2;
@Pc(108) int local108 = local37 << 2;
@Pc(112) int local112 = local33 * 3;
@Pc(118) int local118 = (local61 - 3) * local45;
@Pc(130) int local130 = local41 << 2;
@Pc(134) int local134 = local49 * 3;
@Pc(140) int local140 = (local57 - 3) * local53;
@Pc(146) int local146 = (arg6 - 1) * local104;
@Pc(148) int local148 = local108;
@Pc(150) int local150 = local100;
@Pc(156) int local156 = (local25 - 1) * local130;
@Pc(174) int local174;
@Pc(183) int local183;
@Pc(192) int local192;
@Pc(201) int local201;
if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
@Pc(166) int[] local166 = Static71.anIntArrayArray10[arg4];
local174 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg0, TextureOp29.anInt4164);
local183 = Static78.method1690(TextureOp29.anInt5063, arg5 + arg0, TextureOp29.anInt4164);
local192 = Static78.method1690(TextureOp29.anInt5063, arg5 - local12, TextureOp29.anInt4164);
local201 = Static78.method1690(TextureOp29.anInt5063, arg5 + local12, TextureOp29.anInt4164);
Static131.method2576(local166, local174, local192, arg2);
Static131.method2576(local166, local192, local201, arg1);
Static131.method2576(local166, local201, local183, arg2);
}
while (local16 > 0) {
if (local70 < 0) {
while (local70 < 0) {
local70 += local112;
local112 += local100;
local7++;
local79 += local150;
local150 += local100;
}
}
@Pc(255) boolean local255 = local16 <= local25;
if (local79 < 0) {
local79 += local150;
local70 += local112;
local7++;
local150 += local100;
local112 += local100;
}
if (local255) {
if (local88 < 0) {
while (local88 < 0) {
local14++;
local96 += local148;
local148 += local108;
local88 += local134;
local134 += local108;
}
}
if (local96 < 0) {
local14++;
local96 += local148;
local88 += local134;
local148 += local108;
local134 += local108;
}
local88 += -local156;
local156 -= local130;
local96 += -local140;
local140 -= local130;
}
local79 += -local118;
local70 += -local146;
local146 -= local104;
local118 -= local104;
local16--;
local183 = arg4 + local16;
local174 = arg4 - local16;
if (TextureOp29.anInt5773 <= local183 && TextureOp29.anInt2869 >= local174) {
local192 = Static78.method1690(TextureOp29.anInt5063, arg5 + local7, TextureOp29.anInt4164);
local201 = Static78.method1690(TextureOp29.anInt5063, arg5 - local7, TextureOp29.anInt4164);
if (local255) {
@Pc(404) int local404 = Static78.method1690(TextureOp29.anInt5063, arg5 + local14, TextureOp29.anInt4164);
@Pc(412) int local412 = Static78.method1690(TextureOp29.anInt5063, arg5 - local14, TextureOp29.anInt4164);
@Pc(420) int[] local420;
if (TextureOp29.anInt5773 <= local174) {
local420 = Static71.anIntArrayArray10[local174];
Static131.method2576(local420, local201, local412, arg2);
Static131.method2576(local420, local412, local404, arg1);
Static131.method2576(local420, local404, local192, arg2);
}
if (local183 <= TextureOp29.anInt2869) {
local420 = Static71.anIntArrayArray10[local183];
Static131.method2576(local420, local201, local412, arg2);
Static131.method2576(local420, local412, local404, arg1);
Static131.method2576(local420, local404, local192, arg2);
}
} else {
if (TextureOp29.anInt5773 <= local174) {
Static131.method2576(Static71.anIntArrayArray10[local174], local201, local192, arg2);
}
if (TextureOp29.anInt2869 >= local183) {
Static131.method2576(Static71.anIntArrayArray10[local183], local201, local192, arg2);
}
}
}
}
}
@OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIII)V")
@OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIII)V")
public static void method3982(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(15) int local15 = arg4 - arg2;
@Pc(19) int local19 = arg1 - arg3;