Rename Class3_Sub20 to AnimBase

This commit is contained in:
Pazaz 2022-04-19 17:33:49 -04:00
parent e249e3d1a3
commit be41edf039
4 changed files with 13 additions and 13 deletions

View file

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!jm") @OriginalClass("client!jm")
public final class Class3_Sub20 extends Node { public final class AnimBase extends Node {
@OriginalMember(owner = "client!jm", name = "p", descriptor = "I") @OriginalMember(owner = "client!jm", name = "p", descriptor = "I")
public final int anInt3113; public final int anInt3113;
@ -25,7 +25,7 @@ public final class Class3_Sub20 extends Node {
public final int[] anIntArray290; public final int[] anIntArray290;
@OriginalMember(owner = "client!jm", name = "<init>", descriptor = "(I[B)V") @OriginalMember(owner = "client!jm", name = "<init>", descriptor = "(I[B)V")
public Class3_Sub20(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1) { public AnimBase(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1) {
this.anInt3113 = arg0; this.anInt3113 = arg0;
@Pc(9) Buffer local9 = new Buffer(arg1); @Pc(9) Buffer local9 = new Buffer(arg1);
this.anInt3116 = local9.method2229(); this.anInt3116 = local9.method2229();

View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class AnimFrame { public final class AnimFrame {
@OriginalMember(owner = "client!ne", name = "c", descriptor = "Lclient!jm;") @OriginalMember(owner = "client!ne", name = "c", descriptor = "Lclient!jm;")
public Class3_Sub20 aClass3_Sub20_1 = null; public AnimBase aClass3_Sub20_1 = null;
@OriginalMember(owner = "client!ne", name = "b", descriptor = "I") @OriginalMember(owner = "client!ne", name = "b", descriptor = "I")
public int anInt4070 = -1; public int anInt4070 = -1;
@ -37,7 +37,7 @@ public final class AnimFrame {
public final byte[] aByteArray55; public final byte[] aByteArray55;
@OriginalMember(owner = "client!ne", name = "<init>", descriptor = "([BLclient!jm;)V") @OriginalMember(owner = "client!ne", name = "<init>", descriptor = "([BLclient!jm;)V")
public AnimFrame(@OriginalArg(0) byte[] arg0, @OriginalArg(1) Class3_Sub20 arg1) { public AnimFrame(@OriginalArg(0) byte[] arg0, @OriginalArg(1) AnimBase arg1) {
this.aClass3_Sub20_1 = arg1; this.aClass3_Sub20_1 = arg1;
@Pc(21) Buffer local21 = new Buffer(arg0); @Pc(21) Buffer local21 = new Buffer(arg0);
@Pc(26) Buffer local26 = new Buffer(arg0); @Pc(26) Buffer local26 = new Buffer(arg0);

View file

@ -18,18 +18,18 @@ public final class AnimFrameset extends SecondaryNode {
for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) { for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) {
@Pc(37) byte[] local37 = arg0.method4495(arg2, local19[local21]); @Pc(37) byte[] local37 = arg0.method4495(arg2, local19[local21]);
@Pc(51) int local51 = local37[1] & 0xFF | (local37[0] & 0xFF) << 8; @Pc(51) int local51 = local37[1] & 0xFF | (local37[0] & 0xFF) << 8;
@Pc(56) Class3_Sub20 local56 = (Class3_Sub20) local5.method2289(); @Pc(56) AnimBase local56 = (AnimBase) local5.method2289();
@Pc(58) Class3_Sub20 local58 = null; @Pc(58) AnimBase local58 = null;
while (local56 != null) { while (local56 != null) {
if (local56.anInt3113 == local51) { if (local56.anInt3113 == local51) {
local58 = local56; local58 = local56;
break; break;
} }
local56 = (Class3_Sub20) local5.method2288(); local56 = (AnimBase) local5.method2288();
} }
if (local58 == null) { if (local58 == null) {
@Pc(85) byte[] local85 = arg1.method4502(0, local51); @Pc(85) byte[] local85 = arg1.method4502(0, local51);
local58 = new Class3_Sub20(local51, local85); local58 = new AnimBase(local51, local85);
local5.method2282(local58); local5.method2282(local58);
} }
this.aClass104Array1[local19[local21]] = new AnimFrame(local37, local58); this.aClass104Array1[local19[local21]] = new AnimFrame(local37, local58);

View file

@ -22,7 +22,7 @@ public abstract class Model extends Entity {
public abstract void method4552(); public abstract void method4552();
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(Lclient!jm;Lclient!ne;Lclient!ne;II[ZZZI[I)V") @OriginalMember(owner = "client!ak", name = "a", descriptor = "(Lclient!jm;Lclient!ne;Lclient!ne;II[ZZZI[I)V")
private void method4553(@OriginalArg(0) Class3_Sub20 arg0, @OriginalArg(1) AnimFrame arg1, @OriginalArg(2) AnimFrame arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean[] arg5, @OriginalArg(6) boolean arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int[] arg9) { private void method4553(@OriginalArg(0) AnimBase arg0, @OriginalArg(1) AnimFrame arg1, @OriginalArg(2) AnimFrame arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean[] arg5, @OriginalArg(6) boolean arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int[] arg9) {
@Pc(5) int local5; @Pc(5) int local5;
if (arg2 == null || arg3 == 0) { if (arg2 == null || arg3 == 0) {
for (local5 = 0; local5 < arg1.anInt4070; local5++) { for (local5 = 0; local5 < arg1.anInt4070; local5++) {
@ -183,7 +183,7 @@ public abstract class Model extends Entity {
return; return;
} }
@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1]; @Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
@Pc(15) Class3_Sub20 local15 = local12.aClass3_Sub20_1; @Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
for (@Pc(17) int local17 = 0; local17 < local12.anInt4070; local17++) { for (@Pc(17) int local17 = 0; local17 < local12.anInt4070; local17++) {
@Pc(26) short local26 = local12.aShortArray42[local17]; @Pc(26) short local26 = local12.aShortArray42[local17];
if (local15.aBooleanArray70[local26]) { if (local15.aBooleanArray70[local26]) {
@ -205,7 +205,7 @@ public abstract class Model extends Entity {
return; return;
} }
@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1]; @Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
@Pc(15) Class3_Sub20 local15 = local12.aClass3_Sub20_1; @Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
@Pc(17) AnimFrame local17 = null; @Pc(17) AnimFrame local17 = null;
if (arg2 != null) { if (arg2 != null) {
local17 = arg2.aClass104Array1[arg3]; local17 = arg2.aClass104Array1[arg3];
@ -241,7 +241,7 @@ public abstract class Model extends Entity {
return; return;
} }
@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1]; @Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
@Pc(15) Class3_Sub20 local15 = local12.aClass3_Sub20_1; @Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
@Pc(17) AnimFrame local17 = null; @Pc(17) AnimFrame local17 = null;
if (arg2 != null) { if (arg2 != null) {
local17 = arg2.aClass104Array1[arg3]; local17 = arg2.aClass104Array1[arg3];
@ -274,7 +274,7 @@ public abstract class Model extends Entity {
this.method4558(arg0, arg1, arg2, arg3, arg4, arg5, arg13); this.method4558(arg0, arg1, arg2, arg3, arg4, arg5, arg13);
} else if (this.method4551()) { } else if (this.method4551()) {
@Pc(27) AnimFrame local27 = arg0.aClass104Array1[arg1]; @Pc(27) AnimFrame local27 = arg0.aClass104Array1[arg1];
@Pc(30) Class3_Sub20 local30 = local27.aClass3_Sub20_1; @Pc(30) AnimBase local30 = local27.aClass3_Sub20_1;
@Pc(32) AnimFrame local32 = null; @Pc(32) AnimFrame local32 = null;
if (arg2 != null) { if (arg2 != null) {
local32 = arg2.aClass104Array1[arg3]; local32 = arg2.aClass104Array1[arg3];