From 7e2a7de670c3d45d355822206601ddb9605d67f3 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Tue, 19 Apr 2022 19:54:39 -0400 Subject: [PATCH] Rename Class3_Sub30 to StringNode --- client/src/main/java/EnumType.java | 6 +++--- client/src/main/java/JagString.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/{Class3_Sub30.java => StringNode.java} | 6 +++--- client/src/main/java/StructType.java | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) rename client/src/main/java/{Class3_Sub30.java => StringNode.java} (79%) diff --git a/client/src/main/java/EnumType.java b/client/src/main/java/EnumType.java index 26f0606..5d8f5fd 100644 --- a/client/src/main/java/EnumType.java +++ b/client/src/main/java/EnumType.java @@ -41,7 +41,7 @@ public final class EnumType extends SecondaryNode { @Pc(58) int local58 = arg1.method2174(); @Pc(70) Node local70; if (arg0 == 5) { - local70 = new Class3_Sub30(arg1.method2202()); + local70 = new StringNode(arg1.method2202()); } else { local70 = new Class3_Sub21(arg1.method2174()); } @@ -55,7 +55,7 @@ public final class EnumType extends SecondaryNode { if (this.aClass133_16 == null) { return this.aClass100_766; } else { - @Pc(26) Class3_Sub30 local26 = (Class3_Sub30) this.aClass133_16.method3863((long) arg0); + @Pc(26) StringNode local26 = (StringNode) this.aClass133_16.method3863((long) arg0); return local26 == null ? this.aClass100_766 : local26.aClass100_980; } } @@ -79,7 +79,7 @@ public final class EnumType extends SecondaryNode { @OriginalMember(owner = "client!ml", name = "d", descriptor = "(I)V") private void method3087() { this.aClass133_17 = new HashTable(this.aClass133_16.method3868()); - for (@Pc(22) Class3_Sub30 local22 = (Class3_Sub30) this.aClass133_16.method3859(); local22 != null; local22 = (Class3_Sub30) this.aClass133_16.method3861()) { + for (@Pc(22) StringNode local22 = (StringNode) this.aClass133_16.method3859(); local22 != null; local22 = (StringNode) this.aClass133_16.method3861()) { @Pc(36) Class3_Sub13 local36 = new Class3_Sub13(local22.aClass100_980, (int) local22.aLong192); this.aClass133_17.method3862(local36, local22.aClass100_980.method3118()); } diff --git a/client/src/main/java/JagString.java b/client/src/main/java/JagString.java index 9f9d460..abb78c7 100644 --- a/client/src/main/java/JagString.java +++ b/client/src/main/java/JagString.java @@ -697,17 +697,17 @@ public final class JagString implements Interface2 { @Pc(9) long local9 = this.method3118(); @Pc(19) Class local19 = JagString.class; synchronized (local19) { - @Pc(30) Class3_Sub30 local30; + @Pc(30) StringNode local30; if (Static148.aClass133_13 == null) { Static148.aClass133_13 = new HashTable(4096); } else { - for (local30 = (Class3_Sub30) Static148.aClass133_13.method3863(local9); local30 != null; local30 = (Class3_Sub30) Static148.aClass133_13.method3867()) { + for (local30 = (StringNode) Static148.aClass133_13.method3863(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.method3867()) { if (this.method3108(local30.aClass100_980)) { return local30.aClass100_980; } } } - local30 = new Class3_Sub30(); + local30 = new StringNode(); local30.aClass100_980 = this; this.aBoolean193 = false; Static148.aClass133_13.method3862(local30, local9); diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java index 5a179d1..75457f0 100644 --- a/client/src/main/java/LocType.java +++ b/client/src/main/java/LocType.java @@ -593,7 +593,7 @@ public final class LocType { @Pc(580) int local580 = arg0.method2220(); @Pc(589) Node local589; if (local576) { - local589 = new Class3_Sub30(arg0.method2202()); + local589 = new StringNode(arg0.method2202()); } else { local589 = new Class3_Sub21(arg0.method2174()); } @@ -910,7 +910,7 @@ public final class LocType { if (this.aClass133_19 == null) { return arg0; } else { - @Pc(26) Class3_Sub30 local26 = (Class3_Sub30) this.aClass133_19.method3863((long) arg1); + @Pc(26) StringNode local26 = (StringNode) this.aClass133_19.method3863((long) arg1); return local26 == null ? arg0 : local26.aClass100_980; } } diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java index 0df9f77..384219d 100644 --- a/client/src/main/java/NpcType.java +++ b/client/src/main/java/NpcType.java @@ -479,7 +479,7 @@ public final class NpcType { if (this.aClass133_15 == null) { return arg1; } else { - @Pc(18) Class3_Sub30 local18 = (Class3_Sub30) this.aClass133_15.method3863((long) arg0); + @Pc(18) StringNode local18 = (StringNode) this.aClass133_15.method3863((long) arg0); return local18 == null ? arg1 : local18.aClass100_980; } } @@ -724,7 +724,7 @@ public final class NpcType { @Pc(596) int local596 = arg1.method2220(); @Pc(605) Node local605; if (local592) { - local605 = new Class3_Sub30(arg1.method2202()); + local605 = new StringNode(arg1.method2202()); } else { local605 = new Class3_Sub21(arg1.method2174()); } diff --git a/client/src/main/java/ObjType.java b/client/src/main/java/ObjType.java index 7e3c8fb..928698b 100644 --- a/client/src/main/java/ObjType.java +++ b/client/src/main/java/ObjType.java @@ -207,7 +207,7 @@ public final class ObjType { if (this.aClass133_6 == null) { return arg0; } else { - @Pc(21) Class3_Sub30 local21 = (Class3_Sub30) this.aClass133_6.method3863((long) arg1); + @Pc(21) StringNode local21 = (StringNode) this.aClass133_6.method3863((long) arg1); return local21 == null ? arg0 : local21.aClass100_980; } } @@ -508,7 +508,7 @@ public final class ObjType { @Pc(514) int local514 = arg0.method2220(); @Pc(523) Node local523; if (local510) { - local523 = new Class3_Sub30(arg0.method2202()); + local523 = new StringNode(arg0.method2202()); } else { local523 = new Class3_Sub21(arg0.method2174()); } diff --git a/client/src/main/java/Class3_Sub30.java b/client/src/main/java/StringNode.java similarity index 79% rename from client/src/main/java/Class3_Sub30.java rename to client/src/main/java/StringNode.java index 1e89b19..b75c4d9 100644 --- a/client/src/main/java/Class3_Sub30.java +++ b/client/src/main/java/StringNode.java @@ -3,17 +3,17 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!sj") -public final class Class3_Sub30 extends Node { +public final class StringNode extends Node { @OriginalMember(owner = "client!sj", name = "A", descriptor = "Lclient!na;") public JagString aClass100_980; @OriginalMember(owner = "client!sj", name = "", descriptor = "()V") - public Class3_Sub30() { + public StringNode() { } @OriginalMember(owner = "client!sj", name = "", descriptor = "(Lclient!na;)V") - public Class3_Sub30(@OriginalArg(0) JagString arg0) { + public StringNode(@OriginalArg(0) JagString arg0) { this.aClass100_980 = arg0; } } diff --git a/client/src/main/java/StructType.java b/client/src/main/java/StructType.java index 9dcd0a6..0af64f8 100644 --- a/client/src/main/java/StructType.java +++ b/client/src/main/java/StructType.java @@ -35,7 +35,7 @@ public final class StructType extends SecondaryNode { @Pc(49) int local49 = arg0.method2220(); @Pc(58) Node local58; if (local45) { - local58 = new Class3_Sub30(arg0.method2202()); + local58 = new StringNode(arg0.method2202()); } else { local58 = new Class3_Sub21(arg0.method2174()); } @@ -48,7 +48,7 @@ public final class StructType extends SecondaryNode { if (this.aClass133_14 == null) { return arg0; } else { - @Pc(16) Class3_Sub30 local16 = (Class3_Sub30) this.aClass133_14.method3863((long) arg1); + @Pc(16) StringNode local16 = (StringNode) this.aClass133_14.method3863((long) arg1); return local16 == null ? arg0 : local16.aClass100_980; } }