Rename Class3_Sub2_Sub7 to AnimFrameset

This commit is contained in:
Pazaz 2022-04-19 17:32:35 -04:00
parent 789b3e8919
commit 8c71f18adc
12 changed files with 33 additions and 33 deletions

View file

@ -4,13 +4,13 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!cl")
public final class Class3_Sub2_Sub7 extends SecondaryNode {
public final class AnimFrameset extends SecondaryNode {
@OriginalMember(owner = "client!cl", name = "W", descriptor = "[Lclient!ne;")
public final Class104[] aClass104Array1;
@OriginalMember(owner = "client!cl", name = "<init>", descriptor = "(Lclient!ve;Lclient!ve;IZ)V")
public Class3_Sub2_Sub7(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3) {
public AnimFrameset(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3) {
@Pc(5) LinkedList local5 = new LinkedList();
@Pc(10) int local10 = arg0.method4504(arg2);
this.aClass104Array1 = new Class104[local10];

View file

@ -75,13 +75,13 @@ public final class Class144 {
public final Model method4214(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Model arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(10) int local10 = this.anIntArray474[arg0];
@Pc(15) int local15 = this.anIntArray473[arg0];
@Pc(23) Class3_Sub2_Sub7 local23 = Static72.method1566(local15 >> 16);
@Pc(23) AnimFrameset local23 = Static72.method1566(local15 >> 16);
@Pc(27) int local27 = local15 & 0xFFFF;
if (local23 == null) {
return arg2.method4568(true, true, true);
}
@Pc(39) int local39 = arg3 & 0x3;
@Pc(41) Class3_Sub2_Sub7 local41 = null;
@Pc(41) AnimFrameset local41 = null;
if ((this.aBoolean277 || Static204.aBoolean234) && arg1 != -1 && this.anIntArray473.length > arg1) {
@Pc(69) int local69 = this.anIntArray473[arg1];
local41 = Static72.method1566(local69 >> 16);
@ -131,19 +131,19 @@ public final class Class144 {
public final Model method4215(@OriginalArg(0) Model arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) int local8 = this.anIntArray473[arg3];
@Pc(13) int local13 = this.anIntArray474[arg3];
@Pc(19) Class3_Sub2_Sub7 local19 = Static72.method1566(local8 >> 16);
@Pc(19) AnimFrameset local19 = Static72.method1566(local8 >> 16);
@Pc(23) int local23 = local8 & 0xFFFF;
if (local19 == null) {
return arg0.method4572(true, true, true);
}
@Pc(34) Class3_Sub2_Sub7 local34 = null;
@Pc(34) AnimFrameset local34 = null;
if ((this.aBoolean277 || Static204.aBoolean234) && arg1 != -1 && arg1 < this.anIntArray473.length) {
@Pc(59) int local59 = this.anIntArray473[arg1];
local34 = Static72.method1566(local59 >> 16);
arg1 = local59 & 0xFFFF;
}
@Pc(71) Class3_Sub2_Sub7 local71 = null;
@Pc(81) Class3_Sub2_Sub7 local81 = null;
@Pc(71) AnimFrameset local71 = null;
@Pc(81) AnimFrameset local81 = null;
@Pc(83) int local83 = 0;
@Pc(85) int local85 = 0;
if (this.anIntArray475 != null) {
@ -188,13 +188,13 @@ public final class Class144 {
public final Model method4216(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Model arg4) {
@Pc(6) int local6 = this.anIntArray474[arg1];
@Pc(11) int local11 = this.anIntArray473[arg1];
@Pc(19) Class3_Sub2_Sub7 local19 = Static72.method1566(local11 >> 16);
@Pc(19) AnimFrameset local19 = Static72.method1566(local11 >> 16);
@Pc(27) int local27 = local11 & 0xFFFF;
if (local19 == null) {
return arg4.method4572(true, true, true);
}
@Pc(40) int local40 = arg3 & 0x3;
@Pc(42) Class3_Sub2_Sub7 local42 = null;
@Pc(42) AnimFrameset local42 = null;
if ((this.aBoolean277 || Static204.aBoolean234) && arg0 != -1 && arg0 < this.anIntArray473.length) {
@Pc(66) int local66 = this.anIntArray473[arg0];
local42 = Static72.method1566(local66 >> 16);
@ -263,12 +263,12 @@ public final class Class144 {
public final Model method4219(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) Model arg3) {
@Pc(16) int local16 = this.anIntArray474[arg2];
@Pc(21) int local21 = this.anIntArray473[arg2];
@Pc(27) Class3_Sub2_Sub7 local27 = Static72.method1566(local21 >> 16);
@Pc(27) AnimFrameset local27 = Static72.method1566(local21 >> 16);
@Pc(31) int local31 = local21 & 0xFFFF;
if (local27 == null) {
return arg3.method4560(true, true, true);
}
@Pc(42) Class3_Sub2_Sub7 local42 = null;
@Pc(42) AnimFrameset local42 = null;
if ((this.aBoolean277 || Static204.aBoolean234) && arg0 != -1 && this.anIntArray473.length > arg0) {
@Pc(65) int local65 = this.anIntArray473[arg0];
local42 = Static72.method1566(local65 >> 16);

View file

@ -352,8 +352,8 @@ public final class Class59 {
local353 = -1;
local360 = -1;
local374 = 0;
@Pc(1040) Class3_Sub2_Sub7 local1040 = null;
@Pc(1042) Class3_Sub2_Sub7 local1042 = null;
@Pc(1040) AnimFrameset local1040 = null;
@Pc(1042) AnimFrameset local1042 = null;
if (arg3 != null) {
local353 = arg3.anIntArray473[arg7];
local979 = local353 >>> 16;
@ -382,8 +382,8 @@ public final class Class59 {
}
local979 = -1;
local451 = -1;
@Pc(1154) Class3_Sub2_Sub7 local1154 = null;
@Pc(1156) Class3_Sub2_Sub7 local1156 = null;
@Pc(1154) AnimFrameset local1154 = null;
@Pc(1156) AnimFrameset local1156 = null;
local457 = 0;
if (arg2 != null) {
local979 = arg2.anIntArray473[arg8];

View file

@ -388,8 +388,8 @@ public final class Class96 {
local221 = -1;
local235 = -1;
local200 = 0;
@Pc(962) Class3_Sub2_Sub7 local962 = null;
@Pc(964) Class3_Sub2_Sub7 local964 = null;
@Pc(962) AnimFrameset local962 = null;
@Pc(964) AnimFrameset local964 = null;
@Pc(1040) int local1040;
if (arg8 != null) {
local235 = arg8.anIntArray473[arg5];
@ -419,9 +419,9 @@ public final class Class96 {
}
local228 = -1;
local1040 = -1;
@Pc(1088) Class3_Sub2_Sub7 local1088 = null;
@Pc(1088) AnimFrameset local1088 = null;
local300 = 0;
@Pc(1092) Class3_Sub2_Sub7 local1092 = null;
@Pc(1092) AnimFrameset local1092 = null;
if (arg6 != null) {
local228 = arg6.anIntArray473[arg2];
local324 = local228 >>> 16;

View file

@ -178,7 +178,7 @@ public abstract class Model extends Entity {
public abstract void method4554(@OriginalArg(0) int arg0);
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(Lclient!cl;I)V")
public final void method4555(@OriginalArg(0) Class3_Sub2_Sub7 arg0, @OriginalArg(1) int arg1) {
public final void method4555(@OriginalArg(0) AnimFrameset arg0, @OriginalArg(1) int arg1) {
if (arg1 == -1 || !this.method4551()) {
return;
}
@ -200,7 +200,7 @@ public abstract class Model extends Entity {
protected abstract void method4557();
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(Lclient!cl;ILclient!cl;IIIZ)V")
public final void method4558(@OriginalArg(0) Class3_Sub2_Sub7 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Class3_Sub2_Sub7 arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) boolean arg6) {
public final void method4558(@OriginalArg(0) AnimFrameset arg0, @OriginalArg(1) int arg1, @OriginalArg(2) AnimFrameset arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) boolean arg6) {
if (arg1 == -1 || !this.method4551()) {
return;
}
@ -236,7 +236,7 @@ public abstract class Model extends Entity {
public abstract void method4564(@OriginalArg(0) int arg0);
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(Lclient!cl;ILclient!cl;IIIIZ[I)V")
public final void method4565(@OriginalArg(0) Class3_Sub2_Sub7 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Class3_Sub2_Sub7 arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int[] arg8) {
public final void method4565(@OriginalArg(0) AnimFrameset arg0, @OriginalArg(1) int arg1, @OriginalArg(2) AnimFrameset arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int[] arg8) {
if (arg1 == -1 || !this.method4551()) {
return;
}
@ -266,7 +266,7 @@ public abstract class Model extends Entity {
protected abstract void method4569(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5);
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(Lclient!cl;ILclient!cl;IIILclient!cl;ILclient!cl;III[ZZ)V")
public final void method4570(@OriginalArg(0) Class3_Sub2_Sub7 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Class3_Sub2_Sub7 arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) Class3_Sub2_Sub7 arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Class3_Sub2_Sub7 arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) boolean[] arg12, @OriginalArg(13) boolean arg13) {
public final void method4570(@OriginalArg(0) AnimFrameset arg0, @OriginalArg(1) int arg1, @OriginalArg(2) AnimFrameset arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) AnimFrameset arg6, @OriginalArg(7) int arg7, @OriginalArg(8) AnimFrameset arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) boolean[] arg12, @OriginalArg(13) boolean arg13) {
if (arg1 == -1) {
return;
}

View file

@ -18,7 +18,7 @@ public final class Static131 {
private static final JagString aClass100_624 = Static28.method790("Allocating memory");
@OriginalMember(owner = "client!kd", name = "mb", descriptor = "[Lclient!cl;")
public static final Class3_Sub2_Sub7[] aClass3_Sub2_Sub7Array5 = new Class3_Sub2_Sub7[14];
public static final AnimFrameset[] aClass3_Sub2_Sub7Array5 = new AnimFrameset[14];
@OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
public static int anInt3251 = 0;

View file

@ -11,7 +11,7 @@ public final class Static133 {
public static long aLong175 = 0L;
@OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;")
public static final Class3_Sub2_Sub7[] aClass3_Sub2_Sub7Array7 = new Class3_Sub2_Sub7[14];
public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14];
@OriginalMember(owner = "client!kf", name = "h", descriptor = "[I")
public static final int[] anIntArray453 = new int[] { 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3 };

View file

@ -14,7 +14,7 @@ public final class Static276 {
public static final int[] anIntArray563 = new int[50];
@OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;")
public static final Class3_Sub2_Sub7[] aClass3_Sub2_Sub7Array8 = new Class3_Sub2_Sub7[14];
public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14];
@OriginalMember(owner = "client!wh", name = "m", descriptor = "[I")
public static final int[] anIntArray564 = new int[5];

View file

@ -98,7 +98,7 @@ public final class Static41 {
@Pc(379) int local379 = -local367;
@Pc(381) int local381 = local367;
@Pc(384) int local384 = arg8.method4562();
@Pc(386) Class3_Sub2_Sub7 local386 = null;
@Pc(386) AnimFrameset local386 = null;
local115 = arg8.method4561();
local126 = arg8.method4576();
local130 = arg8.method4550();

View file

@ -14,7 +14,7 @@ public final class Static6 {
public static final JagString aClass100_18 = Static28.method790("<col=40ff00>");
@OriginalMember(owner = "client!ag", name = "cb", descriptor = "[Lclient!cl;")
public static final Class3_Sub2_Sub7[] aClass3_Sub2_Sub7Array1 = new Class3_Sub2_Sub7[14];
public static final AnimFrameset[] aClass3_Sub2_Sub7Array1 = new AnimFrameset[14];
@OriginalMember(owner = "client!ag", name = "h", descriptor = "(I)V")
public static void method82() {

View file

@ -38,8 +38,8 @@ public final class Static72 {
public static final JagString aClass100_448 = Static28.method790("(Y");
@OriginalMember(owner = "client!fl", name = "b", descriptor = "(II)Lclient!cl;")
public static Class3_Sub2_Sub7 method1566(@OriginalArg(0) int arg0) {
@Pc(19) Class3_Sub2_Sub7 local19 = (Class3_Sub2_Sub7) Static267.aClass99_37.method3106((long) arg0);
public static AnimFrameset method1566(@OriginalArg(0) int arg0) {
@Pc(19) AnimFrameset local19 = (AnimFrameset) Static267.aClass99_37.method3106((long) arg0);
if (local19 != null) {
return local19;
}

View file

@ -29,7 +29,7 @@ public final class Static87 {
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!ve;ZLclient!ve;BI)Lclient!cl;")
public static Class3_Sub2_Sub7 method1803(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(4) int arg2) {
public static AnimFrameset method1803(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(4) int arg2) {
@Pc(5) boolean local5 = true;
@Pc(16) int[] local16 = arg0.method4503(arg2);
for (@Pc(18) int local18 = 0; local18 < local16.length; local18++) {
@ -48,7 +48,7 @@ public final class Static87 {
return null;
}
try {
return new Class3_Sub2_Sub7(arg0, arg1, arg2, false);
return new AnimFrameset(arg0, arg1, arg2, false);
} catch (@Pc(84) Exception local84) {
return null;
}