From 396a5f0691d5442ef2489a5f7cba057c8b6b2c08 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Tue, 19 Apr 2022 05:19:55 -0400 Subject: [PATCH] Rename Class3 to Node --- client/src/main/java/Buffer.java | 2 +- client/src/main/java/Class118.java | 2 +- client/src/main/java/Class133.java | 46 +++++++++---------- client/src/main/java/Class14_Sub1.java | 14 +++--- client/src/main/java/Class3_Sub1.java | 2 +- client/src/main/java/Class3_Sub10.java | 2 +- client/src/main/java/Class3_Sub11.java | 2 +- client/src/main/java/Class3_Sub12.java | 2 +- client/src/main/java/Class3_Sub13.java | 2 +- client/src/main/java/Class3_Sub14.java | 2 +- client/src/main/java/Class3_Sub16.java | 2 +- client/src/main/java/Class3_Sub17.java | 2 +- client/src/main/java/Class3_Sub18.java | 2 +- client/src/main/java/Class3_Sub19.java | 2 +- client/src/main/java/Class3_Sub2.java | 2 +- client/src/main/java/Class3_Sub20.java | 2 +- client/src/main/java/Class3_Sub21.java | 2 +- client/src/main/java/Class3_Sub22.java | 2 +- client/src/main/java/Class3_Sub23.java | 2 +- client/src/main/java/Class3_Sub24.java | 2 +- client/src/main/java/Class3_Sub25.java | 2 +- client/src/main/java/Class3_Sub26.java | 2 +- client/src/main/java/Class3_Sub27.java | 2 +- client/src/main/java/Class3_Sub28.java | 2 +- client/src/main/java/Class3_Sub29.java | 2 +- client/src/main/java/Class3_Sub2_Sub13.java | 2 +- client/src/main/java/Class3_Sub2_Sub15.java | 2 +- client/src/main/java/Class3_Sub30.java | 2 +- client/src/main/java/Class3_Sub31.java | 2 +- client/src/main/java/Class3_Sub3_Sub2.java | 4 +- client/src/main/java/Class3_Sub4.java | 2 +- client/src/main/java/Class3_Sub5.java | 2 +- client/src/main/java/Class3_Sub6.java | 2 +- client/src/main/java/Class3_Sub7.java | 2 +- client/src/main/java/Class3_Sub8.java | 2 +- client/src/main/java/Class3_Sub9.java | 2 +- client/src/main/java/Class54.java | 4 +- client/src/main/java/Class55.java | 2 +- client/src/main/java/Class69.java | 30 ++++++------ client/src/main/java/Class86.java | 8 ++-- client/src/main/java/Class96.java | 2 +- .../src/main/java/{Class3.java => Node.java} | 6 +-- client/src/main/java/PcmStream.java | 2 +- client/src/main/java/Static183.java | 2 +- client/src/main/java/Static273.java | 2 +- 45 files changed, 94 insertions(+), 94 deletions(-) rename client/src/main/java/{Class3.java => Node.java} (91%) diff --git a/client/src/main/java/Buffer.java b/client/src/main/java/Buffer.java index b4ab730..eab4a37 100644 --- a/client/src/main/java/Buffer.java +++ b/client/src/main/java/Buffer.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!wa") -public class Buffer extends Class3 { +public class Buffer extends Node { @OriginalMember(owner = "client!wa", name = "y", descriptor = "[B") public byte[] aByteArray40; diff --git a/client/src/main/java/Class118.java b/client/src/main/java/Class118.java index ef9197f..69f1b32 100644 --- a/client/src/main/java/Class118.java +++ b/client/src/main/java/Class118.java @@ -591,7 +591,7 @@ public final class Class118 { for (local38 = 0; local38 < local18; local38++) { @Pc(576) boolean local576 = arg0.method2229() == 1; @Pc(580) int local580 = arg0.method2220(); - @Pc(589) Class3 local589; + @Pc(589) Node local589; if (local576) { local589 = new Class3_Sub30(arg0.method2202()); } else { diff --git a/client/src/main/java/Class133.java b/client/src/main/java/Class133.java index f61d39a..466f9d8 100644 --- a/client/src/main/java/Class133.java +++ b/client/src/main/java/Class133.java @@ -7,29 +7,29 @@ import org.openrs2.deob.annotation.Pc; public final class Class133 { @OriginalMember(owner = "client!sc", name = "q", descriptor = "Lclient!ab;") - private Class3 aClass3_192; + private Node aClass3_192; @OriginalMember(owner = "client!sc", name = "u", descriptor = "J") private long aLong168; @OriginalMember(owner = "client!sc", name = "C", descriptor = "Lclient!ab;") - private Class3 aClass3_193; + private Node aClass3_193; @OriginalMember(owner = "client!sc", name = "F", descriptor = "I") private int anInt5037 = 0; @OriginalMember(owner = "client!sc", name = "c", descriptor = "[Lclient!ab;") - public final Class3[] aClass3Array1; + public final Node[] aClass3Array1; @OriginalMember(owner = "client!sc", name = "h", descriptor = "I") public final int anInt5023; @OriginalMember(owner = "client!sc", name = "", descriptor = "(I)V") public Class133(@OriginalArg(0) int arg0) { - this.aClass3Array1 = new Class3[arg0]; + this.aClass3Array1 = new Node[arg0]; this.anInt5023 = arg0; for (@Pc(13) int local13 = 0; local13 < arg0; local13++) { - @Pc(25) Class3 local25 = this.aClass3Array1[local13] = new Class3(); + @Pc(25) Node local25 = this.aClass3Array1[local13] = new Node(); local25.aClass3_223 = local25; local25.aClass3_222 = local25; } @@ -38,9 +38,9 @@ public final class Class133 { @OriginalMember(owner = "client!sc", name = "a", descriptor = "(I)V") public final void method3856() { for (@Pc(5) int local5 = 0; local5 < this.anInt5023; local5++) { - @Pc(14) Class3 local14 = this.aClass3Array1[local5]; + @Pc(14) Node local14 = this.aClass3Array1[local5]; while (true) { - @Pc(17) Class3 local17 = local14.aClass3_222; + @Pc(17) Node local17 = local14.aClass3_222; if (local14 == local17) { break; } @@ -52,14 +52,14 @@ public final class Class133 { } @OriginalMember(owner = "client!sc", name = "c", descriptor = "(I)Lclient!ab;") - public final Class3 method3859() { + public final Node method3859() { this.anInt5037 = 0; return this.method3861(); } @OriginalMember(owner = "client!sc", name = "d", descriptor = "(I)Lclient!ab;") - public final Class3 method3861() { - @Pc(24) Class3 local24; + public final Node method3861() { + @Pc(24) Node local24; if (this.anInt5037 > 0 && this.aClass3_193 != this.aClass3Array1[this.anInt5037 - 1]) { local24 = this.aClass3_193; this.aClass3_193 = local24.aClass3_222; @@ -76,11 +76,11 @@ public final class Class133 { } @OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILclient!ab;J)V") - public final void method3862(@OriginalArg(1) Class3 arg0, @OriginalArg(2) long arg1) { + public final void method3862(@OriginalArg(1) Node arg0, @OriginalArg(2) long arg1) { if (arg0.aClass3_223 != null) { arg0.method4658(); } - @Pc(21) Class3 local21 = this.aClass3Array1[(int) (arg1 & (long) (this.anInt5023 - 1))]; + @Pc(21) Node local21 = this.aClass3Array1[(int) (arg1 & (long) (this.anInt5023 - 1))]; arg0.aClass3_222 = local21; arg0.aLong192 = arg1; arg0.aClass3_223 = local21.aClass3_223; @@ -89,12 +89,12 @@ public final class Class133 { } @OriginalMember(owner = "client!sc", name = "a", descriptor = "(JI)Lclient!ab;") - public final Class3 method3863(@OriginalArg(0) long arg0) { + public final Node method3863(@OriginalArg(0) long arg0) { this.aLong168 = arg0; - @Pc(24) Class3 local24 = this.aClass3Array1[(int) (arg0 & (long) (this.anInt5023 - 1))]; + @Pc(24) Node local24 = this.aClass3Array1[(int) (arg0 & (long) (this.anInt5023 - 1))]; for (this.aClass3_192 = local24.aClass3_222; this.aClass3_192 != local24; this.aClass3_192 = this.aClass3_192.aClass3_222) { if (arg0 == this.aClass3_192.aLong192) { - @Pc(46) Class3 local46 = this.aClass3_192; + @Pc(46) Node local46 = this.aClass3_192; this.aClass3_192 = this.aClass3_192.aClass3_222; return local46; } @@ -107,8 +107,8 @@ public final class Class133 { public final int method3864() { @Pc(15) int local15 = 0; for (@Pc(17) int local17 = 0; local17 < this.anInt5023; local17++) { - @Pc(26) Class3 local26 = this.aClass3Array1[local17]; - @Pc(29) Class3 local29 = local26.aClass3_222; + @Pc(26) Node local26 = this.aClass3Array1[local17]; + @Pc(29) Node local29 = local26.aClass3_222; while (local29 != local26) { local29 = local29.aClass3_222; local15++; @@ -118,11 +118,11 @@ public final class Class133 { } @OriginalMember(owner = "client!sc", name = "a", descriptor = "([Lclient!ab;I)I") - public final int method3865(@OriginalArg(0) Class3[] arg0) { + public final int method3865(@OriginalArg(0) Node[] arg0) { @Pc(13) int local13 = 0; for (@Pc(15) int local15 = 0; local15 < this.anInt5023; local15++) { - @Pc(24) Class3 local24 = this.aClass3Array1[local15]; - for (@Pc(27) Class3 local27 = local24.aClass3_222; local27 != local24; local27 = local27.aClass3_222) { + @Pc(24) Node local24 = this.aClass3Array1[local15]; + for (@Pc(27) Node local27 = local24.aClass3_222; local27 != local24; local27 = local27.aClass3_222) { arg0[local13++] = local27; } } @@ -130,14 +130,14 @@ public final class Class133 { } @OriginalMember(owner = "client!sc", name = "f", descriptor = "(I)Lclient!ab;") - public final Class3 method3867() { + public final Node method3867() { if (this.aClass3_192 == null) { return null; } - @Pc(23) Class3 local23 = this.aClass3Array1[(int) (this.aLong168 & (long) (this.anInt5023 - 1))]; + @Pc(23) Node local23 = this.aClass3Array1[(int) (this.aLong168 & (long) (this.anInt5023 - 1))]; while (local23 != this.aClass3_192) { if (this.aClass3_192.aLong192 == this.aLong168) { - @Pc(45) Class3 local45 = this.aClass3_192; + @Pc(45) Node local45 = this.aClass3_192; this.aClass3_192 = this.aClass3_192.aClass3_222; return local45; } diff --git a/client/src/main/java/Class14_Sub1.java b/client/src/main/java/Class14_Sub1.java index 6539842..b90ba0f 100644 --- a/client/src/main/java/Class14_Sub1.java +++ b/client/src/main/java/Class14_Sub1.java @@ -90,13 +90,13 @@ public final class Class14_Sub1 extends Class14 { if (this.aClass49_2 == null) { return; } - @Pc(15) Class3 local15; + @Pc(15) Node local15; for (local15 = this.aClass69_16.method2289(); local15 != null; local15 = this.aClass69_16.method2288()) { if (local15.aLong192 == (long) arg0) { return; } } - local15 = new Class3(); + local15 = new Node(); local15.aLong192 = arg0; this.aClass69_16.method2282(local15); } @@ -183,7 +183,7 @@ public final class Class14_Sub1 extends Class14 { if (this.aClass70_1 == null) { return 0; } else if (this.aBoolean35) { - @Pc(25) Class3 local25 = this.aClass69_17.method2289(); + @Pc(25) Node local25 = this.aClass69_17.method2289(); return local25 == null ? 0 : (int) local25.aLong192; } else { return this.aClass70_1.anInt2902; @@ -197,7 +197,7 @@ public final class Class14_Sub1 extends Class14 { return; } @Pc(32) boolean local32; - @Pc(37) Class3 local37; + @Pc(37) Node local37; @Pc(43) int local43; if (this.aBoolean35) { local32 = true; @@ -225,7 +225,7 @@ public final class Class14_Sub1 extends Class14 { } if (this.aByteArray9[this.anInt578] == 0) { local32 = false; - local37 = new Class3(); + local37 = new Node(); local37.aLong192 = this.anInt578; this.aClass69_17.method2282(local37); } @@ -261,7 +261,7 @@ public final class Class14_Sub1 extends Class14 { this.method536(2, this.anInt578); } if (this.aByteArray9[this.anInt578] != 1) { - local37 = new Class3(); + local37 = new Node(); local37.aLong192 = this.anInt578; this.aClass69_17.method2282(local37); local32 = false; @@ -427,7 +427,7 @@ public final class Class14_Sub1 extends Class14 { if (this.aClass69_17 == null || this.method521() == null) { return; } - for (@Pc(21) Class3 local21 = this.aClass69_16.method2289(); local21 != null; local21 = this.aClass69_16.method2288()) { + for (@Pc(21) Node local21 = this.aClass69_16.method2289(); local21 != null; local21 = this.aClass69_16.method2288()) { @Pc(28) int local28 = (int) local21.aLong192; if (local28 < 0 || this.aClass70_1.anInt2907 <= local28 || this.aClass70_1.anIntArray272[local28] == 0) { local21.method4658(); diff --git a/client/src/main/java/Class3_Sub1.java b/client/src/main/java/Class3_Sub1.java index 4151025..f3d4599 100644 --- a/client/src/main/java/Class3_Sub1.java +++ b/client/src/main/java/Class3_Sub1.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!j") -public abstract class Class3_Sub1 extends Class3 { +public abstract class Class3_Sub1 extends Node { @OriginalMember(owner = "client!j", name = "t", descriptor = "Lclient!nd;") protected Class103 aClass103_41; diff --git a/client/src/main/java/Class3_Sub10.java b/client/src/main/java/Class3_Sub10.java index 53dea9e..5ffc69c 100644 --- a/client/src/main/java/Class3_Sub10.java +++ b/client/src/main/java/Class3_Sub10.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!eb") -public final class Class3_Sub10 extends Class3 { +public final class Class3_Sub10 extends Node { @OriginalMember(owner = "client!eb", name = "v", descriptor = "J") public long aLong55; diff --git a/client/src/main/java/Class3_Sub11.java b/client/src/main/java/Class3_Sub11.java index f667272..c75767b 100644 --- a/client/src/main/java/Class3_Sub11.java +++ b/client/src/main/java/Class3_Sub11.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!ed") -public final class Class3_Sub11 extends Class3 { +public final class Class3_Sub11 extends Node { @OriginalMember(owner = "client!ed", name = "p", descriptor = "I") public int anInt1725; diff --git a/client/src/main/java/Class3_Sub12.java b/client/src/main/java/Class3_Sub12.java index 7625cf8..aff9772 100644 --- a/client/src/main/java/Class3_Sub12.java +++ b/client/src/main/java/Class3_Sub12.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!fl") -public final class Class3_Sub12 extends Class3 { +public final class Class3_Sub12 extends Node { @OriginalMember(owner = "client!fl", name = "p", descriptor = "I") public int anInt2028; diff --git a/client/src/main/java/Class3_Sub13.java b/client/src/main/java/Class3_Sub13.java index 3fbbbc6..cb59cb2 100644 --- a/client/src/main/java/Class3_Sub13.java +++ b/client/src/main/java/Class3_Sub13.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!hb") -public final class Class3_Sub13 extends Class3 { +public final class Class3_Sub13 extends Node { @OriginalMember(owner = "client!hb", name = "y", descriptor = "Lclient!na;") public final Class100 aClass100_503; diff --git a/client/src/main/java/Class3_Sub14.java b/client/src/main/java/Class3_Sub14.java index 2e231af..afbf518 100644 --- a/client/src/main/java/Class3_Sub14.java +++ b/client/src/main/java/Class3_Sub14.java @@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!hg") -public final class Class3_Sub14 extends Class3 { +public final class Class3_Sub14 extends Node { @OriginalMember(owner = "client!hg", name = "s", descriptor = "Ljava/nio/ByteBuffer;") private ByteBuffer aByteBuffer3; diff --git a/client/src/main/java/Class3_Sub16.java b/client/src/main/java/Class3_Sub16.java index 0cd6d49..6da4444 100644 --- a/client/src/main/java/Class3_Sub16.java +++ b/client/src/main/java/Class3_Sub16.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!ik") -public abstract class Class3_Sub16 extends Class3 { +public abstract class Class3_Sub16 extends Node { @OriginalMember(owner = "client!ik", name = "p", descriptor = "I") public int anInt3313; diff --git a/client/src/main/java/Class3_Sub17.java b/client/src/main/java/Class3_Sub17.java index 8234c9c..ed6d977 100644 --- a/client/src/main/java/Class3_Sub17.java +++ b/client/src/main/java/Class3_Sub17.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!jc") -public final class Class3_Sub17 extends Class3 { +public final class Class3_Sub17 extends Node { @OriginalMember(owner = "client!jc", name = "r", descriptor = "I") private int anInt2973; diff --git a/client/src/main/java/Class3_Sub18.java b/client/src/main/java/Class3_Sub18.java index d230c21..34db7f9 100644 --- a/client/src/main/java/Class3_Sub18.java +++ b/client/src/main/java/Class3_Sub18.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!jk") -public final class Class3_Sub18 extends Class3 { +public final class Class3_Sub18 extends Node { @OriginalMember(owner = "client!jk", name = "r", descriptor = "[B") public final byte[] aByteArray43 = new byte[128]; diff --git a/client/src/main/java/Class3_Sub19.java b/client/src/main/java/Class3_Sub19.java index a45b601..6bd3c09 100644 --- a/client/src/main/java/Class3_Sub19.java +++ b/client/src/main/java/Class3_Sub19.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!jl") -public final class Class3_Sub19 extends Class3 { +public final class Class3_Sub19 extends Node { @OriginalMember(owner = "client!jl", name = "q", descriptor = "Lclient!be;") public Class13 aClass13_16; diff --git a/client/src/main/java/Class3_Sub2.java b/client/src/main/java/Class3_Sub2.java index 021dde7..23e11a4 100644 --- a/client/src/main/java/Class3_Sub2.java +++ b/client/src/main/java/Class3_Sub2.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!rg") -public class Class3_Sub2 extends Class3 { +public class Class3_Sub2 extends Node { @OriginalMember(owner = "client!rg", name = "v", descriptor = "J") public long aLong185; diff --git a/client/src/main/java/Class3_Sub20.java b/client/src/main/java/Class3_Sub20.java index 12f97b6..64b1ce9 100644 --- a/client/src/main/java/Class3_Sub20.java +++ b/client/src/main/java/Class3_Sub20.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!jm") -public final class Class3_Sub20 extends Class3 { +public final class Class3_Sub20 extends Node { @OriginalMember(owner = "client!jm", name = "p", descriptor = "I") public final int anInt3113; diff --git a/client/src/main/java/Class3_Sub21.java b/client/src/main/java/Class3_Sub21.java index 178c31c..4adb84e 100644 --- a/client/src/main/java/Class3_Sub21.java +++ b/client/src/main/java/Class3_Sub21.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!ka") -public final class Class3_Sub21 extends Class3 { +public final class Class3_Sub21 extends Node { @OriginalMember(owner = "client!ka", name = "p", descriptor = "I") public int anInt3141; diff --git a/client/src/main/java/Class3_Sub22.java b/client/src/main/java/Class3_Sub22.java index 0b5fbdd..a67d9b1 100644 --- a/client/src/main/java/Class3_Sub22.java +++ b/client/src/main/java/Class3_Sub22.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!kl") -public final class Class3_Sub22 extends Class3 { +public final class Class3_Sub22 extends Node { @OriginalMember(owner = "client!kl", name = "p", descriptor = "B") public byte aByte9; diff --git a/client/src/main/java/Class3_Sub23.java b/client/src/main/java/Class3_Sub23.java index 1287b3c..75b6306 100644 --- a/client/src/main/java/Class3_Sub23.java +++ b/client/src/main/java/Class3_Sub23.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!lb") -public final class Class3_Sub23 extends Class3 { +public final class Class3_Sub23 extends Node { @OriginalMember(owner = "client!lb", name = "t", descriptor = "I") public final int anInt3468; diff --git a/client/src/main/java/Class3_Sub24.java b/client/src/main/java/Class3_Sub24.java index 2993126..e4a6515 100644 --- a/client/src/main/java/Class3_Sub24.java +++ b/client/src/main/java/Class3_Sub24.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!lh") -public final class Class3_Sub24 extends Class3 { +public final class Class3_Sub24 extends Node { @OriginalMember(owner = "client!lh", name = "y", descriptor = "I") public final int anInt3524; diff --git a/client/src/main/java/Class3_Sub25.java b/client/src/main/java/Class3_Sub25.java index 950ade4..aa425fe 100644 --- a/client/src/main/java/Class3_Sub25.java +++ b/client/src/main/java/Class3_Sub25.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!mf") -public final class Class3_Sub25 extends Class3 { +public final class Class3_Sub25 extends Node { @OriginalMember(owner = "client!mf", name = "s", descriptor = "I") public int anInt3763; diff --git a/client/src/main/java/Class3_Sub26.java b/client/src/main/java/Class3_Sub26.java index de4120a..567d9e4 100644 --- a/client/src/main/java/Class3_Sub26.java +++ b/client/src/main/java/Class3_Sub26.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!oj") -public final class Class3_Sub26 extends Class3 { +public final class Class3_Sub26 extends Node { @OriginalMember(owner = "client!oj", name = "q", descriptor = "I") public int anInt4307; diff --git a/client/src/main/java/Class3_Sub27.java b/client/src/main/java/Class3_Sub27.java index 1cfca2a..88a4922 100644 --- a/client/src/main/java/Class3_Sub27.java +++ b/client/src/main/java/Class3_Sub27.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!qe") -public final class Class3_Sub27 extends Class3 { +public final class Class3_Sub27 extends Node { @OriginalMember(owner = "client!qe", name = "p", descriptor = "[I") public int[] anIntArray420 = new int[] { -1 }; diff --git a/client/src/main/java/Class3_Sub28.java b/client/src/main/java/Class3_Sub28.java index 597804d..38fefb2 100644 --- a/client/src/main/java/Class3_Sub28.java +++ b/client/src/main/java/Class3_Sub28.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!qi") -public final class Class3_Sub28 extends Class3 { +public final class Class3_Sub28 extends Node { @OriginalMember(owner = "client!qi", name = "s", descriptor = "I") public final int anInt4761; diff --git a/client/src/main/java/Class3_Sub29.java b/client/src/main/java/Class3_Sub29.java index 4c8d1ac..f863134 100644 --- a/client/src/main/java/Class3_Sub29.java +++ b/client/src/main/java/Class3_Sub29.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!rf") -public final class Class3_Sub29 extends Class3 { +public final class Class3_Sub29 extends Node { @OriginalMember(owner = "client!rf", name = "p", descriptor = "Lclient!sc;") public Class133 aClass133_22; diff --git a/client/src/main/java/Class3_Sub2_Sub13.java b/client/src/main/java/Class3_Sub2_Sub13.java index 5cb27f4..d813b35 100644 --- a/client/src/main/java/Class3_Sub2_Sub13.java +++ b/client/src/main/java/Class3_Sub2_Sub13.java @@ -33,7 +33,7 @@ public final class Class3_Sub2_Sub13 extends Class3_Sub2 { for (local25 = 0; local25 < local17; local25++) { @Pc(45) boolean local45 = arg0.method2229() == 1; @Pc(49) int local49 = arg0.method2220(); - @Pc(58) Class3 local58; + @Pc(58) Node local58; if (local45) { local58 = new Class3_Sub30(arg0.method2202()); } else { diff --git a/client/src/main/java/Class3_Sub2_Sub15.java b/client/src/main/java/Class3_Sub2_Sub15.java index e0ecfc5..0618304 100644 --- a/client/src/main/java/Class3_Sub2_Sub15.java +++ b/client/src/main/java/Class3_Sub2_Sub15.java @@ -39,7 +39,7 @@ public final class Class3_Sub2_Sub15 extends Class3_Sub2 { this.aClass133_16 = new Class133(Static165.method3164(local41)); for (@Pc(51) int local51 = 0; local51 < local41; local51++) { @Pc(58) int local58 = arg1.method2174(); - @Pc(70) Class3 local70; + @Pc(70) Node local70; if (arg0 == 5) { local70 = new Class3_Sub30(arg1.method2202()); } else { diff --git a/client/src/main/java/Class3_Sub30.java b/client/src/main/java/Class3_Sub30.java index e34d807..7f657bd 100644 --- a/client/src/main/java/Class3_Sub30.java +++ b/client/src/main/java/Class3_Sub30.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!sj") -public final class Class3_Sub30 extends Class3 { +public final class Class3_Sub30 extends Node { @OriginalMember(owner = "client!sj", name = "A", descriptor = "Lclient!na;") public Class100 aClass100_980; diff --git a/client/src/main/java/Class3_Sub31.java b/client/src/main/java/Class3_Sub31.java index 02b6cac..8d08b20 100644 --- a/client/src/main/java/Class3_Sub31.java +++ b/client/src/main/java/Class3_Sub31.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!wk") -public final class Class3_Sub31 extends Class3 { +public final class Class3_Sub31 extends Node { @OriginalMember(owner = "client!wk", name = "r", descriptor = "I") public int anInt5878; diff --git a/client/src/main/java/Class3_Sub3_Sub2.java b/client/src/main/java/Class3_Sub3_Sub2.java index 98aacbf..5170b39 100644 --- a/client/src/main/java/Class3_Sub3_Sub2.java +++ b/client/src/main/java/Class3_Sub3_Sub2.java @@ -22,7 +22,7 @@ public final class Class3_Sub3_Sub2 extends PcmStream { private void method1342(@OriginalArg(0) Class3_Sub6 arg0) { arg0.method4658(); arg0.method780(); - @Pc(9) Class3 local9 = this.aClass69_44.aClass3_109.aClass3_222; + @Pc(9) Node local9 = this.aClass69_44.aClass3_109.aClass3_222; if (local9 == this.aClass69_44.aClass3_109) { this.anInt1781 = -1; } else { @@ -150,7 +150,7 @@ public final class Class3_Sub3_Sub2 extends PcmStream { } @OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!ab;Lclient!cc;)V") - private void method1348(@OriginalArg(0) Class3 arg0, @OriginalArg(1) Class3_Sub6 arg1) { + private void method1348(@OriginalArg(0) Node arg0, @OriginalArg(1) Class3_Sub6 arg1) { while (arg0 != this.aClass69_44.aClass3_109 && ((Class3_Sub6) arg0).anInt905 <= arg1.anInt905) { arg0 = arg0.aClass3_222; } diff --git a/client/src/main/java/Class3_Sub4.java b/client/src/main/java/Class3_Sub4.java index 05955cd..04b816a 100644 --- a/client/src/main/java/Class3_Sub4.java +++ b/client/src/main/java/Class3_Sub4.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!bf") -public final class Class3_Sub4 extends Class3 { +public final class Class3_Sub4 extends Node { @OriginalMember(owner = "client!bf", name = "q", descriptor = "I") public final int anInt540; diff --git a/client/src/main/java/Class3_Sub5.java b/client/src/main/java/Class3_Sub5.java index 9c51450..c698f1a 100644 --- a/client/src/main/java/Class3_Sub5.java +++ b/client/src/main/java/Class3_Sub5.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!bj") -public final class Class3_Sub5 extends Class3 { +public final class Class3_Sub5 extends Node { @OriginalMember(owner = "client!bj", name = "x", descriptor = "Z") public boolean aBoolean45; diff --git a/client/src/main/java/Class3_Sub6.java b/client/src/main/java/Class3_Sub6.java index 912b07e..0eb30b1 100644 --- a/client/src/main/java/Class3_Sub6.java +++ b/client/src/main/java/Class3_Sub6.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!cc") -public abstract class Class3_Sub6 extends Class3 { +public abstract class Class3_Sub6 extends Node { @OriginalMember(owner = "client!cc", name = "p", descriptor = "I") public int anInt905; diff --git a/client/src/main/java/Class3_Sub7.java b/client/src/main/java/Class3_Sub7.java index cf947d1..67c64ef 100644 --- a/client/src/main/java/Class3_Sub7.java +++ b/client/src/main/java/Class3_Sub7.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!cd") -public final class Class3_Sub7 extends Class3 { +public final class Class3_Sub7 extends Node { @OriginalMember(owner = "client!cd", name = "r", descriptor = "I") public int anInt916; diff --git a/client/src/main/java/Class3_Sub8.java b/client/src/main/java/Class3_Sub8.java index eb93d32..b626ae3 100644 --- a/client/src/main/java/Class3_Sub8.java +++ b/client/src/main/java/Class3_Sub8.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!cn") -public final class Class3_Sub8 extends Class3 { +public final class Class3_Sub8 extends Node { @OriginalMember(owner = "client!cn", name = "p", descriptor = "I") public int anInt1187; diff --git a/client/src/main/java/Class3_Sub9.java b/client/src/main/java/Class3_Sub9.java index 6435ef1..55c9fbb 100644 --- a/client/src/main/java/Class3_Sub9.java +++ b/client/src/main/java/Class3_Sub9.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!ea") -public final class Class3_Sub9 extends Class3 { +public final class Class3_Sub9 extends Node { @OriginalMember(owner = "client!ea", name = "s", descriptor = "[I") public static final int[] anIntArray135 = new int[32]; diff --git a/client/src/main/java/Class54.java b/client/src/main/java/Class54.java index e395373..b31582b 100644 --- a/client/src/main/java/Class54.java +++ b/client/src/main/java/Class54.java @@ -42,7 +42,7 @@ public final class Class54 { } @OriginalMember(owner = "client!gn", name = "a", descriptor = "(I)Lclient!ab;") - public final Class3 method1808() { + public final Node method1808() { return this.aClass133_5.method3859(); } @@ -65,7 +65,7 @@ public final class Class54 { } @OriginalMember(owner = "client!gn", name = "b", descriptor = "(I)Lclient!ab;") - public final Class3 method1813() { + public final Node method1813() { return this.aClass133_5.method3861(); } diff --git a/client/src/main/java/Class55.java b/client/src/main/java/Class55.java index 875d2b6..208a3d4 100644 --- a/client/src/main/java/Class55.java +++ b/client/src/main/java/Class55.java @@ -506,7 +506,7 @@ public final class Class55 { for (local179 = 0; local179 < local169; local179++) { @Pc(510) boolean local510 = arg0.method2229() == 1; @Pc(514) int local514 = arg0.method2220(); - @Pc(523) Class3 local523; + @Pc(523) Node local523; if (local510) { local523 = new Class3_Sub30(arg0.method2202()); } else { diff --git a/client/src/main/java/Class69.java b/client/src/main/java/Class69.java index bbbd8b1..22c3733 100644 --- a/client/src/main/java/Class69.java +++ b/client/src/main/java/Class69.java @@ -7,10 +7,10 @@ import org.openrs2.deob.annotation.Pc; public final class Class69 { @OriginalMember(owner = "client!ih", name = "p", descriptor = "Lclient!ab;") - private Class3 aClass3_110; + private Node aClass3_110; @OriginalMember(owner = "client!ih", name = "m", descriptor = "Lclient!ab;") - public final Class3 aClass3_109 = new Class3(); + public final Node aClass3_109 = new Node(); @OriginalMember(owner = "client!ih", name = "", descriptor = "()V") public Class69() { @@ -21,7 +21,7 @@ public final class Class69 { @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I)V") public final void method2278() { while (true) { - @Pc(5) Class3 local5 = this.aClass3_109.aClass3_222; + @Pc(5) Node local5 = this.aClass3_109.aClass3_222; if (local5 == this.aClass3_109) { this.aClass3_110 = null; return; @@ -31,8 +31,8 @@ public final class Class69 { } @OriginalMember(owner = "client!ih", name = "b", descriptor = "(I)Lclient!ab;") - public final Class3 method2279() { - @Pc(7) Class3 local7 = this.aClass3_109.aClass3_223; + public final Node method2279() { + @Pc(7) Node local7 = this.aClass3_109.aClass3_223; if (this.aClass3_109 == local7) { this.aClass3_110 = null; return null; @@ -43,7 +43,7 @@ public final class Class69 { } @OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZLclient!ab;)V") - public final void method2282(@OriginalArg(1) Class3 arg0) { + public final void method2282(@OriginalArg(1) Node arg0) { if (arg0.aClass3_223 != null) { arg0.method4658(); } @@ -54,7 +54,7 @@ public final class Class69 { } @OriginalMember(owner = "client!ih", name = "a", descriptor = "(ILclient!ab;)V") - public final void method2283(@OriginalArg(1) Class3 arg0) { + public final void method2283(@OriginalArg(1) Node arg0) { if (arg0.aClass3_223 != null) { arg0.method4658(); } @@ -65,8 +65,8 @@ public final class Class69 { } @OriginalMember(owner = "client!ih", name = "d", descriptor = "(I)Lclient!ab;") - public final Class3 method2286() { - @Pc(13) Class3 local13 = this.aClass3_110; + public final Node method2286() { + @Pc(13) Node local13 = this.aClass3_110; if (this.aClass3_109 == local13) { this.aClass3_110 = null; return null; @@ -77,8 +77,8 @@ public final class Class69 { } @OriginalMember(owner = "client!ih", name = "a", descriptor = "(B)Lclient!ab;") - public final Class3 method2287() { - @Pc(3) Class3 local3 = this.aClass3_109.aClass3_222; + public final Node method2287() { + @Pc(3) Node local3 = this.aClass3_109.aClass3_222; if (this.aClass3_109 == local3) { return null; } else { @@ -88,8 +88,8 @@ public final class Class69 { } @OriginalMember(owner = "client!ih", name = "e", descriptor = "(I)Lclient!ab;") - public final Class3 method2288() { - @Pc(12) Class3 local12 = this.aClass3_110; + public final Node method2288() { + @Pc(12) Node local12 = this.aClass3_110; if (local12 == this.aClass3_109) { this.aClass3_110 = null; return null; @@ -100,8 +100,8 @@ public final class Class69 { } @OriginalMember(owner = "client!ih", name = "f", descriptor = "(I)Lclient!ab;") - public final Class3 method2289() { - @Pc(3) Class3 local3 = this.aClass3_109.aClass3_222; + public final Node method2289() { + @Pc(3) Node local3 = this.aClass3_109.aClass3_222; if (this.aClass3_109 == local3) { this.aClass3_110 = null; return null; diff --git a/client/src/main/java/Class86.java b/client/src/main/java/Class86.java index f0b6144..616059d 100644 --- a/client/src/main/java/Class86.java +++ b/client/src/main/java/Class86.java @@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc; public final class Class86 { @OriginalMember(owner = "client!l", name = "a", descriptor = "Lclient!ab;") - private Class3 aClass3_135; + private Node aClass3_135; @OriginalMember(owner = "client!l", name = "c", descriptor = "I") private int anInt3447 = 0; @@ -21,8 +21,8 @@ public final class Class86 { } @OriginalMember(owner = "client!l", name = "a", descriptor = "(I)Lclient!ab;") - public final Class3 method2700() { - @Pc(30) Class3 local30; + public final Node method2700() { + @Pc(30) Node local30; if (this.anInt3447 > 0 && this.aClass133_10.aClass3Array1[this.anInt3447 - 1] != this.aClass3_135) { local30 = this.aClass3_135; this.aClass3_135 = local30.aClass3_222; @@ -39,7 +39,7 @@ public final class Class86 { } @OriginalMember(owner = "client!l", name = "a", descriptor = "(B)Lclient!ab;") - public final Class3 method2701() { + public final Node method2701() { this.anInt3447 = 0; return this.method2700(); } diff --git a/client/src/main/java/Class96.java b/client/src/main/java/Class96.java index dc1cd7a..a5bb79c 100644 --- a/client/src/main/java/Class96.java +++ b/client/src/main/java/Class96.java @@ -722,7 +722,7 @@ public final class Class96 { for (local18 = 0; local18 < local12; local18++) { @Pc(592) boolean local592 = arg1.method2229() == 1; @Pc(596) int local596 = arg1.method2220(); - @Pc(605) Class3 local605; + @Pc(605) Node local605; if (local592) { local605 = new Class3_Sub30(arg1.method2202()); } else { diff --git a/client/src/main/java/Class3.java b/client/src/main/java/Node.java similarity index 91% rename from client/src/main/java/Class3.java rename to client/src/main/java/Node.java index 8ce7a6f..3a7ee93 100644 --- a/client/src/main/java/Class3.java +++ b/client/src/main/java/Node.java @@ -2,16 +2,16 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!ab") -public class Class3 { +public class Node { @OriginalMember(owner = "client!ab", name = "a", descriptor = "J") public long aLong192; @OriginalMember(owner = "client!ab", name = "d", descriptor = "Lclient!ab;") - public Class3 aClass3_222; + public Node aClass3_222; @OriginalMember(owner = "client!ab", name = "l", descriptor = "Lclient!ab;") - public Class3 aClass3_223; + public Node aClass3_223; @OriginalMember(owner = "client!ab", name = "a", descriptor = "(I)Z") public final boolean method4654() { diff --git a/client/src/main/java/PcmStream.java b/client/src/main/java/PcmStream.java index a5fb781..459a4da 100644 --- a/client/src/main/java/PcmStream.java +++ b/client/src/main/java/PcmStream.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!qb") -public abstract class PcmStream extends Class3 { +public abstract class PcmStream extends Node { @OriginalMember(owner = "client!qb", name = "p", descriptor = "I") public int anInt5626; diff --git a/client/src/main/java/Static183.java b/client/src/main/java/Static183.java index 265397d..82f9db1 100644 --- a/client/src/main/java/Static183.java +++ b/client/src/main/java/Static183.java @@ -17,7 +17,7 @@ public final class Static183 { public static final Class100 aClass100_809 = Static28.method790("Lade Titelbild )2 "); @OriginalMember(owner = "client!ok", name = "a", descriptor = "(Lclient!ab;Lclient!ab;I)V") - public static void method3331(@OriginalArg(0) Class3 arg0, @OriginalArg(1) Class3 arg1) { + public static void method3331(@OriginalArg(0) Node arg0, @OriginalArg(1) Node arg1) { if (arg0.aClass3_223 != null) { arg0.method4658(); } diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java index f081933..7aab753 100644 --- a/client/src/main/java/Static273.java +++ b/client/src/main/java/Static273.java @@ -166,7 +166,7 @@ public final class Static273 { @OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V") public static void method3214(@OriginalArg(1) int arg0) { - for (@Pc(11) Class3 local11 = Static210.aClass133_21.method3859(); local11 != null; local11 = Static210.aClass133_21.method3861()) { + for (@Pc(11) Node local11 = Static210.aClass133_21.method3859(); local11 != null; local11 = Static210.aClass133_21.method3861()) { if ((local11.aLong192 >> 48 & 0xFFFFL) == (long) arg0) { local11.method4658(); }