Created TypeList classes and moved static members to them

This commit is contained in:
Pazaz 2022-04-25 02:11:03 -04:00
parent 6ba1f2f808
commit b3a5fdbec9
356 changed files with 6604 additions and 6652 deletions

View file

@ -7,9 +7,6 @@ public final class Static234 {
@OriginalMember(owner = "client!ta", name = "o", descriptor = "[I")
public static int[] anIntArray454;
@OriginalMember(owner = "client!ta", name = "p", descriptor = "[I")
public static int[] anIntArray455;
@OriginalMember(owner = "client!ta", name = "z", descriptor = "[I")
public static final int[] anIntArray456 = new int[] { -1, 0, 8, 0, 2, 0, 0, 0, 0, 12, 0, 1, 0, 3, 7, 0, 15, 6, 0, 0, 4, 7, -2, -1, 2, 0, 2, 8, 0, 0, 0, 0, -2, 5, 0, 0, 8, 3, 6, 0, 0, 0, -1, 0, -1, 0, 0, 6, -2, 0, 12, 0, 0, 0, -1, -2, 10, 0, 0, 0, 3, 0, -1, 0, 0, 5, 6, 0, 0, 8, -1, -1, 0, 8, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 6, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, -2, 0, 0, 0, 0, 0, 12, 2, 0, -2, -2, 20, 0, 0, 10, 0, 15, 0, -1, 0, 8, -2, 0, 0, 0, 8, 0, 12, 0, 0, 7, 0, 0, 0, 0, 0, -1, -1, 0, 4, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 9, 0, 0, 0, 2, -1, 0, -2, 0, 4, 14, 0, 0, 0, 24, 0, -2, 5, 0, 0, 0, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 1, 0, 0, 2, -1, 1, 0, 0, 0, 0, 14, 0, 0, 0, 0, 10, 5, 0, 0, 0, 0, 0, -2, 0, 0, 9, 0, 0, 8, 0, 0, 0, 0, -2, 6, 0, 0, 0, -2, 0, 3, 0, 1, 7, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 3, 0, 0 };
@ -21,46 +18,46 @@ public final class Static234 {
for (@Pc(3) int local3 = 0; local3 < Static116.anInt2951; local3++) {
@Pc(10) int local10 = Static44.anIntArray106[local3];
@Pc(14) Npc local14 = Static175.npcs[local10];
@Pc(18) int local18 = Static57.aClass3_Sub15_Sub1_3.g1();
@Pc(18) int local18 = Protocol.inboundBuffer.g1();
if ((local18 & 0x8) != 0) {
local18 += Static57.aClass3_Sub15_Sub1_3.g1() << 8;
local18 += Protocol.inboundBuffer.g1() << 8;
}
@Pc(43) int local43;
@Pc(47) int local47;
if ((local18 & 0x40) != 0) {
local43 = Static57.aClass3_Sub15_Sub1_3.g1();
local47 = Static57.aClass3_Sub15_Sub1_3.p1neg();
local43 = Protocol.inboundBuffer.g1();
local47 = Protocol.inboundBuffer.p1neg();
local14.method2686(local47, Static83.loop, local43);
local14.anInt3378 = Static83.loop + 300;
local14.anInt3372 = Static57.aClass3_Sub15_Sub1_3.g1ssub();
local14.anInt3372 = Protocol.inboundBuffer.g1ssub();
}
if ((local18 & 0x2) != 0) {
local43 = Static57.aClass3_Sub15_Sub1_3.p1neg();
local47 = Static57.aClass3_Sub15_Sub1_3.g1ssub();
local43 = Protocol.inboundBuffer.p1neg();
local47 = Protocol.inboundBuffer.g1ssub();
local14.method2686(local47, Static83.loop, local43);
}
if ((local18 & 0x10) != 0) {
local43 = Static57.aClass3_Sub15_Sub1_3.g2();
local47 = Static57.aClass3_Sub15_Sub1_3.g1();
local43 = Protocol.inboundBuffer.g2();
local47 = Protocol.inboundBuffer.g1();
if (local43 == 65535) {
local43 = -1;
}
Static223.method3855(local47, local43, local14);
}
if ((local18 & 0x4) != 0) {
local14.anInt3370 = Static57.aClass3_Sub15_Sub1_3.g2sub();
local14.anInt3370 = Protocol.inboundBuffer.g2sub();
if (local14.anInt3370 == 65535) {
local14.anInt3370 = -1;
}
}
if ((local18 & 0x80) != 0) {
local43 = Static57.aClass3_Sub15_Sub1_3.g2sub();
local43 = Protocol.inboundBuffer.g2sub();
if (local43 == 65535) {
local43 = -1;
}
local47 = Static57.aClass3_Sub15_Sub1_3.g4me();
local47 = Protocol.inboundBuffer.g4me();
@Pc(147) boolean local147 = true;
if (local43 != -1 && local14.anInt3432 != -1 && Static36.get(Static34.method877(local43).seqId).anInt5355 < Static36.get(Static34.method877(local14.anInt3432).seqId).anInt5355) {
if (local43 != -1 && local14.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local43).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local14.anInt3432).seqId).anInt5355) {
local147 = false;
}
if (local147) {
@ -74,9 +71,9 @@ public final class Static234 {
local14.anInt3399 = -1;
}
if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.loop) {
@Pc(227) int local227 = Static34.method877(local14.anInt3432).seqId;
@Pc(227) int local227 = SpotAnimTypeList.get(local14.anInt3432).seqId;
if (local227 != -1) {
@Pc(236) SeqType local236 = Static36.get(local227);
@Pc(236) SeqType local236 = SeqTypeList.get(local227);
if (local236 != null && local236.frames != null) {
SoundPlayer.playSeqSound(local14.zFine, local236, local14.xFine, false, 0);
}
@ -88,7 +85,7 @@ public final class Static234 {
if (local14.type.hasAreaSound()) {
Static91.method1877(local14);
}
local14.method2698(Static214.get(Static57.aClass3_Sub15_Sub1_3.g2le()));
local14.method2698(NpcTypeList.get(Protocol.inboundBuffer.g2le()));
local14.method2692(local14.type.soze);
local14.anInt3365 = local14.type.basId;
if (local14.type.hasAreaSound()) {
@ -96,49 +93,36 @@ public final class Static234 {
}
}
if ((local18 & 0x20) != 0) {
local14.aClass100_640 = Static57.aClass3_Sub15_Sub1_3.gjstr();
local14.aClass100_640 = Protocol.inboundBuffer.gjstr();
local14.anInt3408 = 100;
}
if ((local18 & 0x100) != 0) {
local43 = Static57.aClass3_Sub15_Sub1_3.p1neg();
local43 = Protocol.inboundBuffer.p1neg();
@Pc(331) int[] local331 = new int[local43];
@Pc(334) int[] local334 = new int[local43];
@Pc(337) int[] local337 = new int[local43];
for (@Pc(339) int local339 = 0; local339 < local43; local339++) {
@Pc(350) int local350 = Static57.aClass3_Sub15_Sub1_3.g2le();
@Pc(350) int local350 = Protocol.inboundBuffer.g2le();
if (local350 == 65535) {
local350 = -1;
}
local331[local339] = local350;
local334[local339] = Static57.aClass3_Sub15_Sub1_3.g1ssub();
local337[local339] = Static57.aClass3_Sub15_Sub1_3.g2();
local334[local339] = Protocol.inboundBuffer.g1ssub();
local337[local339] = Protocol.inboundBuffer.g2();
}
Static159.method3037(local337, local14, local334, local331);
}
if ((local18 & 0x200) != 0) {
local14.anInt3382 = Static57.aClass3_Sub15_Sub1_3.g2sub();
local14.anInt3363 = Static57.aClass3_Sub15_Sub1_3.g2();
local14.anInt3382 = Protocol.inboundBuffer.g2sub();
local14.anInt3363 = Protocol.inboundBuffer.g2();
}
}
}
@OriginalMember(owner = "client!ta", name = "a", descriptor = "(IZIII)V")
public static void method4017(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
if (Static245.load(arg2)) {
Static266.method4190(-1, arg1, arg3, arg0, Static241.components[arg2]);
}
}
@OriginalMember(owner = "client!ta", name = "a", descriptor = "([Lclient!mm;ILclient!ve;)V")
public static void method4018(@OriginalArg(0) SoftwareSprite[] arg0, @OriginalArg(2) Js5 arg1) {
MapList.archive = arg1;
Static241.aClass3_Sub2_Sub1_Sub1Array13 = arg0;
Static258.aBooleanArray130 = new boolean[Static241.aClass3_Sub2_Sub1_Sub1Array13.length];
Static228.aClass69_120.clear();
@Pc(25) int local25 = MapList.archive.getGroupId(Static54.aClass100_374);
@Pc(30) int[] local30 = MapList.archive.method4503(local25);
for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) {
Static228.aClass69_120.addTail(Static210.method3713(new Buffer(MapList.archive.getFile(local25, local30[local32]))));
if (InterfaceList.load(arg2)) {
Static266.method4190(-1, arg1, arg3, arg0, InterfaceList.components[arg2]);
}
}