Rename Class3_Sub2 to SecondaryNode

This commit is contained in:
Pazaz 2022-04-19 06:10:42 -04:00
parent 04370ae289
commit ff1303878e
25 changed files with 44 additions and 44 deletions

View file

@ -7,13 +7,13 @@ import org.openrs2.deob.annotation.Pc;
public final class Class132 { public final class Class132 {
@OriginalMember(owner = "client!rm", name = "e", descriptor = "[Lclient!rg;") @OriginalMember(owner = "client!rm", name = "e", descriptor = "[Lclient!rg;")
private final Class3_Sub2[] aClass3_Sub2Array1; private final SecondaryNode[] aClass3_Sub2Array1;
@OriginalMember(owner = "client!rm", name = "<init>", descriptor = "(I)V") @OriginalMember(owner = "client!rm", name = "<init>", descriptor = "(I)V")
public Class132(@OriginalArg(0) int arg0) { public Class132(@OriginalArg(0) int arg0) {
this.aClass3_Sub2Array1 = new Class3_Sub2[arg0]; this.aClass3_Sub2Array1 = new SecondaryNode[arg0];
for (@Pc(7) int local7 = 0; local7 < arg0; local7++) { for (@Pc(7) int local7 = 0; local7 < arg0; local7++) {
@Pc(23) Class3_Sub2 local23 = this.aClass3_Sub2Array1[local7] = new Class3_Sub2(); @Pc(23) SecondaryNode local23 = this.aClass3_Sub2Array1[local7] = new SecondaryNode();
local23.aClass3_Sub2_66 = local23; local23.aClass3_Sub2_66 = local23;
local23.aClass3_Sub2_67 = local23; local23.aClass3_Sub2_67 = local23;
} }

View file

@ -7,10 +7,10 @@ import org.openrs2.deob.annotation.Pc;
public final class Class16 { public final class Class16 {
@OriginalMember(owner = "client!ce", name = "n", descriptor = "Lclient!rg;") @OriginalMember(owner = "client!ce", name = "n", descriptor = "Lclient!rg;")
private Class3_Sub2 aClass3_Sub2_22; private SecondaryNode aClass3_Sub2_22;
@OriginalMember(owner = "client!ce", name = "l", descriptor = "Lclient!rg;") @OriginalMember(owner = "client!ce", name = "l", descriptor = "Lclient!rg;")
private final Class3_Sub2 aClass3_Sub2_21 = new Class3_Sub2(); private final SecondaryNode aClass3_Sub2_21 = new SecondaryNode();
@OriginalMember(owner = "client!ce", name = "<init>", descriptor = "()V") @OriginalMember(owner = "client!ce", name = "<init>", descriptor = "()V")
public Class16() { public Class16() {
@ -21,7 +21,7 @@ public final class Class16 {
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(I)I") @OriginalMember(owner = "client!ce", name = "a", descriptor = "(I)I")
public final int method793() { public final int method793() {
@Pc(3) int local3 = 0; @Pc(3) int local3 = 0;
@Pc(7) Class3_Sub2 local7 = this.aClass3_Sub2_21.aClass3_Sub2_67; @Pc(7) SecondaryNode local7 = this.aClass3_Sub2_21.aClass3_Sub2_67;
while (local7 != this.aClass3_Sub2_21) { while (local7 != this.aClass3_Sub2_21) {
local7 = local7.aClass3_Sub2_67; local7 = local7.aClass3_Sub2_67;
local3++; local3++;
@ -30,8 +30,8 @@ public final class Class16 {
} }
@OriginalMember(owner = "client!ce", name = "b", descriptor = "(B)Lclient!rg;") @OriginalMember(owner = "client!ce", name = "b", descriptor = "(B)Lclient!rg;")
public final Class3_Sub2 method795() { public final SecondaryNode method795() {
@Pc(3) Class3_Sub2 local3 = this.aClass3_Sub2_21.aClass3_Sub2_67; @Pc(3) SecondaryNode local3 = this.aClass3_Sub2_21.aClass3_Sub2_67;
if (this.aClass3_Sub2_21 == local3) { if (this.aClass3_Sub2_21 == local3) {
this.aClass3_Sub2_22 = null; this.aClass3_Sub2_22 = null;
return null; return null;
@ -42,8 +42,8 @@ public final class Class16 {
} }
@OriginalMember(owner = "client!ce", name = "b", descriptor = "(I)Lclient!rg;") @OriginalMember(owner = "client!ce", name = "b", descriptor = "(I)Lclient!rg;")
public final Class3_Sub2 method796() { public final SecondaryNode method796() {
@Pc(7) Class3_Sub2 local7 = this.aClass3_Sub2_21.aClass3_Sub2_67; @Pc(7) SecondaryNode local7 = this.aClass3_Sub2_21.aClass3_Sub2_67;
if (local7 == this.aClass3_Sub2_21) { if (local7 == this.aClass3_Sub2_21) {
return null; return null;
} else { } else {
@ -53,8 +53,8 @@ public final class Class16 {
} }
@OriginalMember(owner = "client!ce", name = "c", descriptor = "(I)Lclient!rg;") @OriginalMember(owner = "client!ce", name = "c", descriptor = "(I)Lclient!rg;")
public final Class3_Sub2 method797() { public final SecondaryNode method797() {
@Pc(2) Class3_Sub2 local2 = this.aClass3_Sub2_22; @Pc(2) SecondaryNode local2 = this.aClass3_Sub2_22;
if (local2 == this.aClass3_Sub2_21) { if (local2 == this.aClass3_Sub2_21) {
this.aClass3_Sub2_22 = null; this.aClass3_Sub2_22 = null;
return null; return null;
@ -65,7 +65,7 @@ public final class Class16 {
} }
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(Lclient!rg;B)V") @OriginalMember(owner = "client!ce", name = "a", descriptor = "(Lclient!rg;B)V")
public final void method798(@OriginalArg(0) Class3_Sub2 arg0) { public final void method798(@OriginalArg(0) SecondaryNode arg0) {
if (arg0.aClass3_Sub2_66 != null) { if (arg0.aClass3_Sub2_66 != null) {
arg0.method4365(); arg0.method4365();
} }
@ -78,7 +78,7 @@ public final class Class16 {
@OriginalMember(owner = "client!ce", name = "d", descriptor = "(I)V") @OriginalMember(owner = "client!ce", name = "d", descriptor = "(I)V")
public final void method802() { public final void method802() {
while (true) { while (true) {
@Pc(15) Class3_Sub2 local15 = this.aClass3_Sub2_21.aClass3_Sub2_67; @Pc(15) SecondaryNode local15 = this.aClass3_Sub2_21.aClass3_Sub2_67;
if (this.aClass3_Sub2_21 == local15) { if (this.aClass3_Sub2_21 == local15) {
this.aClass3_Sub2_22 = null; this.aClass3_Sub2_22 = null;
return; return;

View file

@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!gf") @OriginalClass("client!gf")
public abstract class Class3_Sub2_Sub10 extends Class3_Sub2 { public abstract class Class3_Sub2_Sub10 extends SecondaryNode {
@OriginalMember(owner = "client!gf", name = "<init>", descriptor = "()V") @OriginalMember(owner = "client!gf", name = "<init>", descriptor = "()V")
protected Class3_Sub2_Sub10() { protected Class3_Sub2_Sub10() {

View file

@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!hc") @OriginalClass("client!hc")
public final class Class3_Sub2_Sub11 extends Class3_Sub2 { public final class Class3_Sub2_Sub11 extends SecondaryNode {
@OriginalMember(owner = "client!hc", name = "Q", descriptor = "[B") @OriginalMember(owner = "client!hc", name = "Q", descriptor = "[B")
public final byte[] aByteArray37; public final byte[] aByteArray37;

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!hn") @OriginalClass("client!hn")
public final class Class3_Sub2_Sub12 extends Class3_Sub2 { public final class Class3_Sub2_Sub12 extends SecondaryNode {
@OriginalMember(owner = "client!hn", name = "I", descriptor = "I") @OriginalMember(owner = "client!hn", name = "I", descriptor = "I")
public int anInt2667; public int anInt2667;

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!lk") @OriginalClass("client!lk")
public final class Class3_Sub2_Sub13 extends Class3_Sub2 { public final class Class3_Sub2_Sub13 extends SecondaryNode {
@OriginalMember(owner = "client!lk", name = "I", descriptor = "Lclient!sc;") @OriginalMember(owner = "client!lk", name = "I", descriptor = "Lclient!sc;")
private Class133 aClass133_14; private Class133 aClass133_14;

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!md") @OriginalClass("client!md")
public final class Class3_Sub2_Sub14 extends Class3_Sub2 { public final class Class3_Sub2_Sub14 extends SecondaryNode {
@OriginalMember(owner = "client!md", name = "K", descriptor = "I") @OriginalMember(owner = "client!md", name = "K", descriptor = "I")
public int anInt3706 = 0; public int anInt3706 = 0;

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!ml") @OriginalClass("client!ml")
public final class Class3_Sub2_Sub15 extends Class3_Sub2 { public final class Class3_Sub2_Sub15 extends SecondaryNode {
@OriginalMember(owner = "client!ml", name = "N", descriptor = "I") @OriginalMember(owner = "client!ml", name = "N", descriptor = "I")
public int anInt3950; public int anInt3950;

View file

@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!pa") @OriginalClass("client!pa")
public final class Class3_Sub2_Sub16 extends Class3_Sub2 { public final class Class3_Sub2_Sub16 extends SecondaryNode {
@OriginalMember(owner = "client!pa", name = "T", descriptor = "Lclient!uj;") @OriginalMember(owner = "client!pa", name = "T", descriptor = "Lclient!uj;")
public final Class8_Sub7 aClass8_Sub7_1; public final Class8_Sub7 aClass8_Sub7_1;

View file

@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!qc") @OriginalClass("client!qc")
public final class Class3_Sub2_Sub17 extends Class3_Sub2 { public final class Class3_Sub2_Sub17 extends SecondaryNode {
@OriginalMember(owner = "client!qc", name = "I", descriptor = "I") @OriginalMember(owner = "client!qc", name = "I", descriptor = "I")
public int anInt4665; public int anInt4665;

View file

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!sd") @OriginalClass("client!sd")
public final class Class3_Sub2_Sub18 extends Class3_Sub2 { public final class Class3_Sub2_Sub18 extends SecondaryNode {
@OriginalMember(owner = "client!sd", name = "U", descriptor = "I") @OriginalMember(owner = "client!sd", name = "U", descriptor = "I")
private int anInt5065 = 0; private int anInt5065 = 0;

View file

@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!ud") @OriginalClass("client!ud")
public final class Class3_Sub2_Sub19 extends Class3_Sub2 { public final class Class3_Sub2_Sub19 extends SecondaryNode {
@OriginalMember(owner = "client!ud", name = "R", descriptor = "Lclient!ra;") @OriginalMember(owner = "client!ud", name = "R", descriptor = "Lclient!ra;")
public final Class8_Sub6 aClass8_Sub6_1; public final Class8_Sub6 aClass8_Sub6_1;

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!bc") @OriginalClass("client!bc")
public final class Class3_Sub2_Sub2 extends Class3_Sub2 { public final class Class3_Sub2_Sub2 extends SecondaryNode {
@OriginalMember(owner = "client!bc", name = "O", descriptor = "[I") @OriginalMember(owner = "client!bc", name = "O", descriptor = "[I")
public int[] anIntArray29; public int[] anIntArray29;

View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!uh") @OriginalClass("client!uh")
public final class Class3_Sub2_Sub20 extends Class3_Sub2 { public final class Class3_Sub2_Sub20 extends SecondaryNode {
@OriginalMember(owner = "client!uh", name = "K", descriptor = "F") @OriginalMember(owner = "client!uh", name = "K", descriptor = "F")
private float aFloat35; private float aFloat35;

View file

@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!bk") @OriginalClass("client!bk")
public final class Class3_Sub2_Sub3 extends Class3_Sub2 { public final class Class3_Sub2_Sub3 extends SecondaryNode {
@OriginalMember(owner = "client!bk", name = "M", descriptor = "Lclient!bh;") @OriginalMember(owner = "client!bk", name = "M", descriptor = "Lclient!bh;")
public final Class8_Sub2 aClass8_Sub2_1; public final Class8_Sub2 aClass8_Sub2_1;

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!bn") @OriginalClass("client!bn")
public final class Class3_Sub2_Sub4 extends Class3_Sub2 { public final class Class3_Sub2_Sub4 extends SecondaryNode {
@OriginalMember(owner = "client!bn", name = "K", descriptor = "I") @OriginalMember(owner = "client!bn", name = "K", descriptor = "I")
public int anInt758 = 0; public int anInt758 = 0;

View file

@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!il") @OriginalClass("client!il")
public abstract class Class3_Sub2_Sub5 extends Class3_Sub2 { public abstract class Class3_Sub2_Sub5 extends SecondaryNode {
@OriginalMember(owner = "client!il", name = "L", descriptor = "Z") @OriginalMember(owner = "client!il", name = "L", descriptor = "Z")
public boolean aBoolean225; public boolean aBoolean225;

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!cb") @OriginalClass("client!cb")
public final class Class3_Sub2_Sub6 extends Class3_Sub2 { public final class Class3_Sub2_Sub6 extends SecondaryNode {
@OriginalMember(owner = "client!cb", name = "L", descriptor = "[I") @OriginalMember(owner = "client!cb", name = "L", descriptor = "[I")
private int[] anIntArray71; private int[] anIntArray71;

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!cl") @OriginalClass("client!cl")
public final class Class3_Sub2_Sub7 extends Class3_Sub2 { public final class Class3_Sub2_Sub7 extends SecondaryNode {
@OriginalMember(owner = "client!cl", name = "W", descriptor = "[Lclient!ne;") @OriginalMember(owner = "client!cl", name = "W", descriptor = "[Lclient!ne;")
public final Class104[] aClass104Array1; public final Class104[] aClass104Array1;

View file

@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!da") @OriginalClass("client!da")
public final class Class3_Sub2_Sub8 extends Class3_Sub2 { public final class Class3_Sub2_Sub8 extends SecondaryNode {
@OriginalMember(owner = "client!da", name = "T", descriptor = "I") @OriginalMember(owner = "client!da", name = "T", descriptor = "I")
public int anInt1269; public int anInt1269;

View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!rk") @OriginalClass("client!rk")
public abstract class Class3_Sub2_Sub9 extends Class3_Sub2 { public abstract class Class3_Sub2_Sub9 extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "W", descriptor = "[I") @OriginalMember(owner = "client!rk", name = "W", descriptor = "[I")
private int[] anIntArray346; private int[] anIntArray346;

View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Class54 { public final class Class54 {
@OriginalMember(owner = "client!gn", name = "l", descriptor = "Lclient!rg;") @OriginalMember(owner = "client!gn", name = "l", descriptor = "Lclient!rg;")
private Class3_Sub2 aClass3_Sub2_37 = new Class3_Sub2(); private SecondaryNode aClass3_Sub2_37 = new SecondaryNode();
@OriginalMember(owner = "client!gn", name = "s", descriptor = "Lclient!ce;") @OriginalMember(owner = "client!gn", name = "s", descriptor = "Lclient!ce;")
private final Class16 aClass16_1 = new Class16(); private final Class16 aClass16_1 = new Class16();
@ -33,8 +33,8 @@ public final class Class54 {
} }
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(JI)Lclient!rg;") @OriginalMember(owner = "client!gn", name = "a", descriptor = "(JI)Lclient!rg;")
public final Class3_Sub2 method1806(@OriginalArg(0) long arg0) { public final SecondaryNode method1806(@OriginalArg(0) long arg0) {
@Pc(16) Class3_Sub2 local16 = (Class3_Sub2) this.aClass133_5.method3863(arg0); @Pc(16) SecondaryNode local16 = (SecondaryNode) this.aClass133_5.method3863(arg0);
if (local16 != null) { if (local16 != null) {
this.aClass16_1.method798(local16); this.aClass16_1.method798(local16);
} }
@ -47,9 +47,9 @@ public final class Class54 {
} }
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!rg;JB)V") @OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!rg;JB)V")
public final void method1811(@OriginalArg(0) Class3_Sub2 arg0, @OriginalArg(1) long arg1) { public final void method1811(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) long arg1) {
if (this.anInt2314 == 0) { if (this.anInt2314 == 0) {
@Pc(14) Class3_Sub2 local14 = this.aClass16_1.method796(); @Pc(14) SecondaryNode local14 = this.aClass16_1.method796();
local14.method4658(); local14.method4658();
local14.method4365(); local14.method4365();
if (this.aClass3_Sub2_37 == local14) { if (this.aClass3_Sub2_37 == local14) {
@ -73,7 +73,7 @@ public final class Class54 {
public final void method1815() { public final void method1815() {
this.aClass16_1.method802(); this.aClass16_1.method802();
this.aClass133_5.method3856(); this.aClass133_5.method3856();
this.aClass3_Sub2_37 = new Class3_Sub2(); this.aClass3_Sub2_37 = new SecondaryNode();
this.anInt2314 = this.anInt2313; this.anInt2314 = this.anInt2313;
} }
} }

View file

@ -2,16 +2,16 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!rg") @OriginalClass("client!rg")
public class Class3_Sub2 extends Node { public class SecondaryNode extends Node {
@OriginalMember(owner = "client!rg", name = "v", descriptor = "J") @OriginalMember(owner = "client!rg", name = "v", descriptor = "J")
public long aLong185; public long aLong185;
@OriginalMember(owner = "client!rg", name = "w", descriptor = "Lclient!rg;") @OriginalMember(owner = "client!rg", name = "w", descriptor = "Lclient!rg;")
public Class3_Sub2 aClass3_Sub2_66; public SecondaryNode aClass3_Sub2_66;
@OriginalMember(owner = "client!rg", name = "G", descriptor = "Lclient!rg;") @OriginalMember(owner = "client!rg", name = "G", descriptor = "Lclient!rg;")
public Class3_Sub2 aClass3_Sub2_67; public SecondaryNode aClass3_Sub2_67;
@OriginalMember(owner = "client!rg", name = "e", descriptor = "(B)V") @OriginalMember(owner = "client!rg", name = "e", descriptor = "(B)V")
public final void method4365() { public final void method4365() {

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!qf") @OriginalClass("client!qf")
public abstract class Sprite extends Class3_Sub2 { public abstract class Sprite extends SecondaryNode {
@OriginalMember(owner = "client!qf", name = "I", descriptor = "I") @OriginalMember(owner = "client!qf", name = "I", descriptor = "I")
public int anInt1859; public int anInt1859;

View file

@ -291,7 +291,7 @@ public final class Static84 {
} }
@OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V") @OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V")
public static void method1772(@OriginalArg(0) Class3_Sub2 arg0, @OriginalArg(1) Class3_Sub2 arg1) { public static void method1772(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) {
if (arg1.aClass3_Sub2_66 != null) { if (arg1.aClass3_Sub2_66 != null) {
arg1.method4365(); arg1.method4365();
} }