Loads of refactoring, renamed Class3_Sub13 to EnumStringEntry too

This commit is contained in:
Pazaz 2022-04-23 16:25:30 -04:00
parent e11ef7d372
commit d2c6c19cb8
263 changed files with 2432 additions and 2436 deletions

View file

@ -15,8 +15,8 @@ public final class Static112 {
@Pc(13) int local13 = Static24.anInt761;
if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
if (Static209.js5Archive8.isFileReady(Static55.anInt1736) && Static209.js5Archive8.isFileReady(Static169.anInt4073)) {
Static39.aClass3_Sub2_Sub1_1 = Static80.method3613(Static209.js5Archive8, Static55.anInt1736);
Static181.aClass3_Sub2_Sub1_9 = Static80.method3613(Static209.js5Archive8, Static169.anInt4073);
Static39.aClass3_Sub2_Sub1_1 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static55.anInt1736);
Static181.aClass3_Sub2_Sub1_9 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static169.anInt4073);
if (GlRenderer.enabled) {
if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
@ -66,9 +66,9 @@ public final class Static112 {
}
}
if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && Static209.js5Archive8.isFileReady(Static85.anInt2261) && Static209.js5Archive8.isFileReady(Static136.anInt3324) && Static209.js5Archive8.isFileReady(Static254.anInt5556)) {
Static165.aClass3_Sub2_Sub1_8 = Static80.method3613(Static209.js5Archive8, Static85.anInt2261);
Static92.aClass3_Sub2_Sub1_6 = Static80.method3613(Static209.js5Archive8, Static136.anInt3324);
Static204.aClass3_Sub2_Sub1_10 = Static80.method3613(Static209.js5Archive8, Static254.anInt5556);
Static165.aClass3_Sub2_Sub1_8 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static85.anInt2261);
Static92.aClass3_Sub2_Sub1_6 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static136.anInt3324);
Static204.aClass3_Sub2_Sub1_10 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static254.anInt5556);
if (GlRenderer.enabled) {
if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
@ -113,19 +113,19 @@ public final class Static112 {
}
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(Lclient!km;I)I")
public static int method2299(@OriginalArg(0) Npc arg0) {
@Pc(13) NpcType local13 = arg0.aClass96_1;
public static int getSound(@OriginalArg(0) Npc arg0) {
@Pc(13) NpcType local13 = arg0.type;
if (local13.anIntArray357 != null) {
local13 = local13.method2932();
local13 = local13.getMultiNpc();
if (local13 == null) {
return -1;
}
}
@Pc(29) int local29 = local13.anInt3747;
@Pc(33) BasType local33 = arg0.method2681();
if (local33.anInt1037 == arg0.anInt3366) {
if (local33.idleAnimationId == arg0.anInt3366) {
local29 = local13.anInt3728;
} else if (arg0.anInt3366 == local33.anInt1058 || local33.anInt1054 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1045 || arg0.anInt3366 == local33.anInt1043) {
} else if (arg0.anInt3366 == local33.runAnimationId || local33.runAnimationId2 == arg0.anInt3366 || arg0.anInt3366 == local33.runAnimationId4 || arg0.anInt3366 == local33.runAnimationId3) {
local29 = local13.anInt3734;
} else if (local33.anInt1062 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1042 || arg0.anInt3366 == local33.anInt1048 || arg0.anInt3366 == local33.anInt1066) {
local29 = local13.anInt3745;