From 0c8c5d42cac29cdcc15e294fea3837b85608fb2d Mon Sep 17 00:00:00 2001 From: Pazaz Date: Tue, 19 Apr 2022 19:56:33 -0400 Subject: [PATCH] Rename Class3_Sub21 to IntNode --- client/src/main/java/Class3_Sub14.java | 4 ++-- client/src/main/java/Class45.java | 4 ++-- client/src/main/java/EnumType.java | 10 +++++----- .../java/{Class3_Sub21.java => IntNode.java} | 6 +++--- client/src/main/java/LocType.java | 4 ++-- client/src/main/java/NpcType.java | 4 ++-- client/src/main/java/ObjType.java | 4 ++-- client/src/main/java/Static178.java | 2 +- client/src/main/java/Static63.java | 16 ++++++++-------- client/src/main/java/Static88.java | 2 +- client/src/main/java/Static91.java | 2 +- client/src/main/java/StructType.java | 4 ++-- 12 files changed, 31 insertions(+), 31 deletions(-) rename client/src/main/java/{Class3_Sub21.java => IntNode.java} (79%) diff --git a/client/src/main/java/Class3_Sub14.java b/client/src/main/java/Class3_Sub14.java index 13a70b3..73c170a 100644 --- a/client/src/main/java/Class3_Sub14.java +++ b/client/src/main/java/Class3_Sub14.java @@ -130,7 +130,7 @@ public final class Class3_Sub14 extends Node { @Pc(1) long local1 = 0L; if ((arg0 & 0x7F) == 0 || (arg2 & 0x7F) == 0) { local1 = (long) (arg0 + (arg2 << 16)) + ((long) arg6 << 32); - @Pc(28) Class3_Sub21 local28 = (Class3_Sub21) this.aClass133_8.method3863(local1); + @Pc(28) IntNode local28 = (IntNode) this.aClass133_8.method3863(local1); if (local28 != null) { if (arg1 < this.anIntArray230[local28.anInt3141]) { this.anIntArray230[local28.anInt3141] = arg1; @@ -149,7 +149,7 @@ public final class Class3_Sub14 extends Node { this.aFloatArray5[this.anInt2483] = arg5; this.anIntArray226[this.anInt2483] = arg6; if (local1 != 0L) { - this.aClass133_8.method3862(new Class3_Sub21(this.anInt2483), local1); + this.aClass133_8.method3862(new IntNode(this.anInt2483), local1); } return this.anInt2483++; } diff --git a/client/src/main/java/Class45.java b/client/src/main/java/Class45.java index 165860e..470f8a5 100644 --- a/client/src/main/java/Class45.java +++ b/client/src/main/java/Class45.java @@ -61,7 +61,7 @@ public final class Class45 { @Pc(1) long local1 = 0L; if ((arg1 & 0x7F) == 0 || (arg3 & 0x7F) == 0) { local1 = arg1 + (arg3 << 16); - @Pc(23) Class3_Sub21 local23 = (Class3_Sub21) this.aClass133_4.method3863(local1); + @Pc(23) IntNode local23 = (IntNode) this.aClass133_4.method3863(local1); if (local23 != null) { return local23.anInt3141; } @@ -106,7 +106,7 @@ public final class Class45 { this.anIntArray178[this.anInt2017] = arg1; this.anIntArray180[this.anInt2017] = arg2; this.anIntArray179[this.anInt2017] = arg3; - this.aClass133_4.method3862(new Class3_Sub21(this.anInt2017), local1); + this.aClass133_4.method3862(new IntNode(this.anInt2017), local1); return this.anInt2017++; } diff --git a/client/src/main/java/EnumType.java b/client/src/main/java/EnumType.java index 5d8f5fd..033a0e2 100644 --- a/client/src/main/java/EnumType.java +++ b/client/src/main/java/EnumType.java @@ -43,7 +43,7 @@ public final class EnumType extends SecondaryNode { if (arg0 == 5) { local70 = new StringNode(arg1.method2202()); } else { - local70 = new Class3_Sub21(arg1.method2174()); + local70 = new IntNode(arg1.method2174()); } this.aClass133_16.method3862(local70, (long) local58); } @@ -90,7 +90,7 @@ public final class EnumType extends SecondaryNode { if (this.aClass133_16 == null) { return this.anInt3960; } else { - @Pc(18) Class3_Sub21 local18 = (Class3_Sub21) this.aClass133_16.method3863((long) arg0); + @Pc(18) IntNode local18 = (IntNode) this.aClass133_16.method3863((long) arg0); return local18 == null ? this.anInt3960 : local18.anInt3141; } } @@ -103,15 +103,15 @@ public final class EnumType extends SecondaryNode { if (this.aClass133_17 == null) { this.method3091(); } - @Pc(34) Class3_Sub21 local34 = (Class3_Sub21) this.aClass133_17.method3863((long) arg0); + @Pc(34) IntNode local34 = (IntNode) this.aClass133_17.method3863((long) arg0); return local34 != null; } @OriginalMember(owner = "client!ml", name = "e", descriptor = "(I)V") private void method3091() { this.aClass133_17 = new HashTable(this.aClass133_16.method3868()); - for (@Pc(24) Class3_Sub21 local24 = (Class3_Sub21) this.aClass133_16.method3859(); local24 != null; local24 = (Class3_Sub21) this.aClass133_16.method3861()) { - @Pc(34) Class3_Sub21 local34 = new Class3_Sub21((int) local24.aLong192); + for (@Pc(24) IntNode local24 = (IntNode) this.aClass133_16.method3859(); local24 != null; local24 = (IntNode) this.aClass133_16.method3861()) { + @Pc(34) IntNode local34 = new IntNode((int) local24.aLong192); this.aClass133_17.method3862(local34, (long) local24.anInt3141); } } diff --git a/client/src/main/java/Class3_Sub21.java b/client/src/main/java/IntNode.java similarity index 79% rename from client/src/main/java/Class3_Sub21.java rename to client/src/main/java/IntNode.java index 4adb84e..4b7e42f 100644 --- a/client/src/main/java/Class3_Sub21.java +++ b/client/src/main/java/IntNode.java @@ -3,17 +3,17 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!ka") -public final class Class3_Sub21 extends Node { +public final class IntNode extends Node { @OriginalMember(owner = "client!ka", name = "p", descriptor = "I") public int anInt3141; @OriginalMember(owner = "client!ka", name = "", descriptor = "()V") - public Class3_Sub21() { + public IntNode() { } @OriginalMember(owner = "client!ka", name = "", descriptor = "(I)V") - public Class3_Sub21(@OriginalArg(0) int arg0) { + public IntNode(@OriginalArg(0) int arg0) { this.anInt3141 = arg0; } } diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java index 75457f0..8caf62b 100644 --- a/client/src/main/java/LocType.java +++ b/client/src/main/java/LocType.java @@ -377,7 +377,7 @@ public final class LocType { if (this.aClass133_19 == null) { return arg0; } else { - @Pc(21) Class3_Sub21 local21 = (Class3_Sub21) this.aClass133_19.method3863((long) arg1); + @Pc(21) IntNode local21 = (IntNode) this.aClass133_19.method3863((long) arg1); return local21 == null ? arg0 : local21.anInt3141; } } @@ -595,7 +595,7 @@ public final class LocType { if (local576) { local589 = new StringNode(arg0.method2202()); } else { - local589 = new Class3_Sub21(arg0.method2174()); + local589 = new IntNode(arg0.method2174()); } this.aClass133_19.method3862(local589, (long) local580); } diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java index 384219d..59e89b8 100644 --- a/client/src/main/java/NpcType.java +++ b/client/src/main/java/NpcType.java @@ -209,7 +209,7 @@ public final class NpcType { if (this.aClass133_15 == null) { return arg1; } else { - @Pc(18) Class3_Sub21 local18 = (Class3_Sub21) this.aClass133_15.method3863((long) arg0); + @Pc(18) IntNode local18 = (IntNode) this.aClass133_15.method3863((long) arg0); return local18 == null ? arg1 : local18.anInt3141; } } @@ -726,7 +726,7 @@ public final class NpcType { if (local592) { local605 = new StringNode(arg1.method2202()); } else { - local605 = new Class3_Sub21(arg1.method2174()); + local605 = new IntNode(arg1.method2174()); } this.aClass133_15.method3862(local605, (long) local596); } diff --git a/client/src/main/java/ObjType.java b/client/src/main/java/ObjType.java index 928698b..0ff8b2b 100644 --- a/client/src/main/java/ObjType.java +++ b/client/src/main/java/ObjType.java @@ -510,7 +510,7 @@ public final class ObjType { if (local510) { local523 = new StringNode(arg0.method2202()); } else { - local523 = new Class3_Sub21(arg0.method2174()); + local523 = new IntNode(arg0.method2174()); } this.aClass133_6.method3862(local523, (long) local514); } @@ -523,7 +523,7 @@ public final class ObjType { if (this.aClass133_6 == null) { return arg0; } else { - @Pc(25) Class3_Sub21 local25 = (Class3_Sub21) this.aClass133_6.method3863((long) arg1); + @Pc(25) IntNode local25 = (IntNode) this.aClass133_6.method3863((long) arg1); return local25 == null ? arg0 : local25.anInt3141; } } diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java index 9d44e8a..81f6254 100644 --- a/client/src/main/java/Static178.java +++ b/client/src/main/java/Static178.java @@ -58,7 +58,7 @@ public final class Static178 { if (local19.anIntArray420[local29] >= 0 && Static170.anInt3245 > local19.anIntArray420[local29]) { @Pc(56) ObjType local56 = Static71.method1439(local19.anIntArray420[local29]); if (local56.aClass133_6 != null) { - @Pc(68) Class3_Sub21 local68 = (Class3_Sub21) local56.aClass133_6.method3863((long) arg2); + @Pc(68) IntNode local68 = (IntNode) local56.aClass133_6.method3863((long) arg2); if (local68 != null) { if (arg0) { local27 += local19.anIntArray422[local29] * local68.anInt3141; diff --git a/client/src/main/java/Static63.java b/client/src/main/java/Static63.java index 46c81e6..582254d 100644 --- a/client/src/main/java/Static63.java +++ b/client/src/main/java/Static63.java @@ -38,7 +38,7 @@ public final class Static63 { @OriginalMember(owner = "client!fa", name = "a", descriptor = "(III)V") public static synchronized void method1485(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { if (arg2 == anInt1943) { - @Pc(8) Class3_Sub21 local8 = new Class3_Sub21(arg1); + @Pc(8) IntNode local8 = new IntNode(arg1); local8.aLong192 = arg0; aClass69_50.method2282(local8); } @@ -47,7 +47,7 @@ public final class Static63 { @OriginalMember(owner = "client!fa", name = "a", descriptor = "(II)V") public static synchronized void method1486(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { if (arg1 == anInt1943) { - @Pc(7) Class3_Sub21 local7 = new Class3_Sub21(); + @Pc(7) IntNode local7 = new IntNode(); local7.aLong192 = arg0; aClass69_51.method2282(local7); } @@ -68,7 +68,7 @@ public final class Static63 { @OriginalMember(owner = "client!fa", name = "b", descriptor = "(III)V") public static synchronized void method1489(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { if (arg2 == anInt1943) { - @Pc(8) Class3_Sub21 local8 = new Class3_Sub21(arg1); + @Pc(8) IntNode local8 = new IntNode(arg1); local8.aLong192 = arg0; aClass69_48.method2282(local8); } @@ -79,23 +79,23 @@ public final class Static63 { @Pc(1) GL local1 = Static239.aGL1; @Pc(3) int local3 = 0; while (true) { - @Pc(8) Class3_Sub21 local8 = (Class3_Sub21) aClass69_48.method2287(); + @Pc(8) IntNode local8 = (IntNode) aClass69_48.method2287(); if (local8 == null) { if (local3 > 0) { local1.glDeleteBuffersARB(local3, anIntArray151, 0); local3 = 0; } while (true) { - local8 = (Class3_Sub21) aClass69_49.method2287(); + local8 = (IntNode) aClass69_49.method2287(); if (local8 == null) { while (true) { - local8 = (Class3_Sub21) aClass69_50.method2287(); + local8 = (IntNode) aClass69_50.method2287(); if (local8 == null) { if (local3 > 0) { local1.glDeleteTextures(local3, anIntArray151, 0); } while (true) { - local8 = (Class3_Sub21) aClass69_51.method2287(); + local8 = (IntNode) aClass69_51.method2287(); if (local8 == null) { if (anInt1945 + anInt1944 + anInt1942 > 100663296 && MonotonicClock.method5096() > aLong71 + 60000L) { System.gc(); @@ -135,7 +135,7 @@ public final class Static63 { @OriginalMember(owner = "client!fa", name = "c", descriptor = "(III)V") public static synchronized void method1491(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { if (arg2 == anInt1943) { - @Pc(8) Class3_Sub21 local8 = new Class3_Sub21(arg1); + @Pc(8) IntNode local8 = new IntNode(arg1); local8.aLong192 = arg0; aClass69_49.method2282(local8); } diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 404f16a..d3f9bf1 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -326,7 +326,7 @@ public final class Static88 { if (local226 == 51) { @Pc(992) HashTable local992 = local14.aClass133Array1[local33[local30]]; local28--; - @Pc(1002) Class3_Sub21 local1002 = (Class3_Sub21) local992.method3863((long) Static254.anIntArray487[local28]); + @Pc(1002) IntNode local1002 = (IntNode) local992.method3863((long) Static254.anIntArray487[local28]); if (local1002 != null) { local30 += local1002.anInt3141; } diff --git a/client/src/main/java/Static91.java b/client/src/main/java/Static91.java index d75770e..5e7505c 100644 --- a/client/src/main/java/Static91.java +++ b/client/src/main/java/Static91.java @@ -58,7 +58,7 @@ public final class Static91 { while (local114-- > 0) { @Pc(136) int local136 = local42.method2174(); @Pc(140) int local140 = local42.method2174(); - local121.method3862(new Class3_Sub21(local140), (long) local136); + local121.method3862(new IntNode(local140), (long) local136); } } } diff --git a/client/src/main/java/StructType.java b/client/src/main/java/StructType.java index 0af64f8..640b707 100644 --- a/client/src/main/java/StructType.java +++ b/client/src/main/java/StructType.java @@ -14,7 +14,7 @@ public final class StructType extends SecondaryNode { if (this.aClass133_14 == null) { return arg1; } else { - @Pc(29) Class3_Sub21 local29 = (Class3_Sub21) this.aClass133_14.method3863((long) arg0); + @Pc(29) IntNode local29 = (IntNode) this.aClass133_14.method3863((long) arg0); return local29 == null ? arg1 : local29.anInt3141; } } @@ -37,7 +37,7 @@ public final class StructType extends SecondaryNode { if (local45) { local58 = new StringNode(arg0.method2202()); } else { - local58 = new Class3_Sub21(arg0.method2174()); + local58 = new IntNode(arg0.method2174()); } this.aClass133_14.method3862(local58, (long) local49); }