From 9463c6bf19f01fe76ca4a5145af5e1f84ec6b318 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Tue, 19 Apr 2022 19:58:39 -0400 Subject: [PATCH] Rename Class3_Sub19 to HookRequest --- .../{Class3_Sub19.java => HookRequest.java} | 2 +- client/src/main/java/Static150.java | 2 +- client/src/main/java/Static2.java | 6 +- client/src/main/java/Static247.java | 2 +- client/src/main/java/Static263.java | 2 +- client/src/main/java/Static36.java | 58 +++++++++---------- client/src/main/java/Static4.java | 8 +-- client/src/main/java/Static53.java | 2 +- client/src/main/java/Static74.java | 2 +- client/src/main/java/Static81.java | 8 +-- client/src/main/java/Static82.java | 2 +- client/src/main/java/Static88.java | 2 +- client/src/main/java/client.java | 8 +-- 13 files changed, 52 insertions(+), 52 deletions(-) rename client/src/main/java/{Class3_Sub19.java => HookRequest.java} (96%) diff --git a/client/src/main/java/Class3_Sub19.java b/client/src/main/java/HookRequest.java similarity index 96% rename from client/src/main/java/Class3_Sub19.java rename to client/src/main/java/HookRequest.java index fa253e2..6ac77ef 100644 --- a/client/src/main/java/Class3_Sub19.java +++ b/client/src/main/java/HookRequest.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 Node { +public final class HookRequest extends Node { @OriginalMember(owner = "client!jl", name = "q", descriptor = "Lclient!be;") public Component aClass13_16; diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java index f2c2949..413dd26 100644 --- a/client/src/main/java/Static150.java +++ b/client/src/main/java/Static150.java @@ -98,7 +98,7 @@ public final class Static150 { Static280.aClass13_26 = arg2; } if (arg3 && arg2.anObjectArray17 != null && (local4 != arg2.anInt445 || arg2.anInt459 != local7)) { - @Pc(305) Class3_Sub19 local305 = new Class3_Sub19(); + @Pc(305) HookRequest local305 = new HookRequest(); local305.anObjectArray31 = arg2.anObjectArray17; local305.aClass13_17 = arg2; Static185.aClass69_101.method2282(local305); diff --git a/client/src/main/java/Static2.java b/client/src/main/java/Static2.java index c09d8a5..73df507 100644 --- a/client/src/main/java/Static2.java +++ b/client/src/main/java/Static2.java @@ -58,9 +58,9 @@ public final class Static2 { Static54.method1304(arg1, local49.anInt5878); } } - @Pc(72) Class3_Sub19 local72; + @Pc(72) HookRequest local72; if (arg1 == 0 && local23.anObjectArray12 != null) { - local72 = new Class3_Sub19(); + local72 = new HookRequest(); local72.anObjectArray31 = local23.anObjectArray12; local72.aClass13_17 = local23; Static82.method1767(local72); @@ -72,7 +72,7 @@ public final class Static2 { continue; } } - local72 = new Class3_Sub19(); + local72 = new HookRequest(); local72.anObjectArray31 = local23.anObjectArray8; local72.aClass13_17 = local23; Static82.method1767(local72); diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index d2512cf..c47304a 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -671,7 +671,7 @@ public final class Static247 { public static void method4246(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) { @Pc(8) Component local8 = Static201.method1418(arg0, arg1); if (local8 != null && local8.anObjectArray11 != null) { - @Pc(19) Class3_Sub19 local19 = new Class3_Sub19(); + @Pc(19) HookRequest local19 = new HookRequest(); local19.aClass13_17 = local8; local19.anObjectArray31 = local8.anObjectArray11; Static82.method1767(local19); diff --git a/client/src/main/java/Static263.java b/client/src/main/java/Static263.java index 5403fff..14626b5 100644 --- a/client/src/main/java/Static263.java +++ b/client/src/main/java/Static263.java @@ -43,7 +43,7 @@ public final class Static263 { return; } if (local8.anObjectArray29 != null) { - @Pc(19) Class3_Sub19 local19 = new Class3_Sub19(); + @Pc(19) HookRequest local19 = new HookRequest(); local19.anObjectArray31 = local8.anObjectArray29; local19.aClass13_17 = local8; local19.aClass100_598 = arg0; diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index 38f2177..235de48 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -102,7 +102,7 @@ public final class Static36 { continue; } if (local9.aBoolean29 && Static215.anInt4873 >= local61 && Static223.anInt5032 >= local63 && Static215.anInt4873 < local65 && Static223.anInt5032 < local67) { - for (@Pc(164) Class3_Sub19 local164 = (Class3_Sub19) Static185.aClass69_101.method2289(); local164 != null; local164 = (Class3_Sub19) Static185.aClass69_101.method2288()) { + for (@Pc(164) HookRequest local164 = (HookRequest) Static185.aClass69_101.method2289(); local164 != null; local164 = (HookRequest) Static185.aClass69_101.method2288()) { if (local164.aBoolean158) { local164.method4658(); local164.aClass13_17.aBoolean19 = false; @@ -167,9 +167,9 @@ public final class Static36 { Static228.anInt5103 = local55; } if (local9.aBoolean25 || local9.anInt453 != 0) { - @Pc(399) Class3_Sub19 local399; + @Pc(399) HookRequest local399; if (local207 && Static58.anInt1766 != 0 && local9.anObjectArray10 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aBoolean158 = true; local399.aClass13_17 = local9; local399.anInt3097 = Static58.anInt1766; @@ -245,7 +245,7 @@ public final class Static36 { if (!local9.aBoolean24 && local221) { local9.aBoolean24 = true; if (local9.anObjectArray5 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aBoolean158 = true; local399.aClass13_17 = local9; local399.anInt3102 = Static7.anInt985 - local50; @@ -255,7 +255,7 @@ public final class Static36 { } } if (local9.aBoolean24 && local212 && local9.anObjectArray6 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aBoolean158 = true; local399.aClass13_17 = local9; local399.anInt3102 = Static215.anInt4873 - local50; @@ -266,7 +266,7 @@ public final class Static36 { if (local9.aBoolean24 && !local212) { local9.aBoolean24 = false; if (local9.anObjectArray18 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aBoolean158 = true; local399.aClass13_17 = local9; local399.anInt3102 = Static215.anInt4873 - local50; @@ -276,7 +276,7 @@ public final class Static36 { } } if (local212 && local9.anObjectArray9 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aBoolean158 = true; local399.aClass13_17 = local9; local399.anInt3102 = Static215.anInt4873 - local50; @@ -287,7 +287,7 @@ public final class Static36 { if (!local9.aBoolean19 && local207) { local9.aBoolean19 = true; if (local9.anObjectArray19 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aBoolean158 = true; local399.aClass13_17 = local9; local399.anInt3102 = Static215.anInt4873 - local50; @@ -297,7 +297,7 @@ public final class Static36 { } } if (local9.aBoolean19 && local207 && local9.anObjectArray23 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aBoolean158 = true; local399.aClass13_17 = local9; local399.anInt3102 = Static215.anInt4873 - local50; @@ -308,7 +308,7 @@ public final class Static36 { if (local9.aBoolean19 && !local207) { local9.aBoolean19 = false; if (local9.anObjectArray24 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aBoolean158 = true; local399.aClass13_17 = local9; local399.anInt3102 = Static215.anInt4873 - local50; @@ -318,15 +318,15 @@ public final class Static36 { } } if (local9.anObjectArray22 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray22; Static4.aClass69_2.method2282(local399); } - @Pc(966) Class3_Sub19 local966; + @Pc(966) HookRequest local966; if (local9.anObjectArray4 != null && Static4.anInt37 > local9.anInt511) { if (local9.anIntArray38 == null || Static4.anInt37 - local9.anInt511 > 32) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray4; Static185.aClass69_101.method2282(local399); @@ -335,7 +335,7 @@ public final class Static36 { local508 = Static138.anIntArray323[local243 & 0x1F]; for (local322 = 0; local322 < local9.anIntArray38.length; local322++) { if (local9.anIntArray38[local322] == local508) { - local966 = new Class3_Sub19(); + local966 = new HookRequest(); local966.aClass13_17 = local9; local966.anObjectArray31 = local9.anObjectArray4; Static185.aClass69_101.method2282(local966); @@ -348,7 +348,7 @@ public final class Static36 { } if (local9.anObjectArray15 != null && Static72.anInt2036 > local9.anInt487) { if (local9.anIntArray35 == null || Static72.anInt2036 - local9.anInt487 > 32) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray15; Static185.aClass69_101.method2282(local399); @@ -357,7 +357,7 @@ public final class Static36 { local508 = Static233.anIntArray452[local243 & 0x1F]; for (local322 = 0; local322 < local9.anIntArray35.length; local322++) { if (local9.anIntArray35[local322] == local508) { - local966 = new Class3_Sub19(); + local966 = new HookRequest(); local966.aClass13_17 = local9; local966.anObjectArray31 = local9.anObjectArray15; Static185.aClass69_101.method2282(local966); @@ -370,7 +370,7 @@ public final class Static36 { } if (local9.anObjectArray25 != null && Static70.anInt2015 > local9.anInt471) { if (local9.anIntArray44 == null || Static70.anInt2015 - local9.anInt471 > 32) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray25; Static185.aClass69_101.method2282(local399); @@ -379,7 +379,7 @@ public final class Static36 { local508 = Static83.anIntArray23[local243 & 0x1F]; for (local322 = 0; local322 < local9.anIntArray44.length; local322++) { if (local9.anIntArray44[local322] == local508) { - local966 = new Class3_Sub19(); + local966 = new HookRequest(); local966.aClass13_17 = local9; local966.anObjectArray31 = local9.anObjectArray25; Static185.aClass69_101.method2282(local966); @@ -392,7 +392,7 @@ public final class Static36 { } if (local9.anObjectArray7 != null && Static111.anInt2901 > local9.anInt493) { if (local9.anIntArray34 == null || Static111.anInt2901 - local9.anInt493 > 32) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray7; Static185.aClass69_101.method2282(local399); @@ -401,7 +401,7 @@ public final class Static36 { local508 = Static27.anIntArray70[local243 & 0x1F]; for (local322 = 0; local322 < local9.anIntArray34.length; local322++) { if (local9.anIntArray34[local322] == local508) { - local966 = new Class3_Sub19(); + local966 = new HookRequest(); local966.aClass13_17 = local9; local966.anObjectArray31 = local9.anObjectArray7; Static185.aClass69_101.method2282(local966); @@ -414,7 +414,7 @@ public final class Static36 { } if (local9.anObjectArray2 != null && Static89.anInt2385 > local9.anInt525) { if (local9.anIntArray42 == null || Static89.anInt2385 - local9.anInt525 > 32) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray2; Static185.aClass69_101.method2282(local399); @@ -423,7 +423,7 @@ public final class Static36 { local508 = Static249.anIntArray478[local243 & 0x1F]; for (local322 = 0; local322 < local9.anIntArray42.length; local322++) { if (local9.anIntArray42[local322] == local508) { - local966 = new Class3_Sub19(); + local966 = new HookRequest(); local966.aClass13_17 = local9; local966.anObjectArray31 = local9.anObjectArray2; Static185.aClass69_101.method2282(local966); @@ -435,31 +435,31 @@ public final class Static36 { local9.anInt525 = Static89.anInt2385; } if (Static49.anInt1464 > local9.anInt482 && local9.anObjectArray20 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray20; Static185.aClass69_101.method2282(local399); } if (Static185.anInt4369 > local9.anInt482 && local9.anObjectArray1 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray1; Static185.aClass69_101.method2282(local399); } if (Static278.anInt5867 > local9.anInt482 && local9.anObjectArray28 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray28; Static185.aClass69_101.method2282(local399); } if (Static207.anInt4778 > local9.anInt482 && local9.anObjectArray21 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray21; Static185.aClass69_101.method2282(local399); } if (Static209.anInt4808 > local9.anInt482 && local9.anObjectArray30 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray30; Static185.aClass69_101.method2282(local399); @@ -467,7 +467,7 @@ public final class Static36 { local9.anInt482 = Static119.anInt3028; if (local9.anObjectArray14 != null) { for (local243 = 0; local243 < Static182.anInt4313; local243++) { - @Pc(1430) Class3_Sub19 local1430 = new Class3_Sub19(); + @Pc(1430) HookRequest local1430 = new HookRequest(); local1430.aClass13_17 = local9; local1430.anInt3100 = Static227.anIntArray447[local243]; local1430.anInt3099 = Static205.anIntArray426[local243]; @@ -476,7 +476,7 @@ public final class Static36 { } } if (Static13.aBoolean16 && local9.anObjectArray13 != null) { - local399 = new Class3_Sub19(); + local399 = new HookRequest(); local399.aClass13_17 = local9; local399.anObjectArray31 = local9.anObjectArray13; Static185.aClass69_101.method2282(local399); diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index ae6ad81..a019723 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -130,7 +130,7 @@ public final class Static4 { } local163[0] = Integer.valueOf(Static57.aClass3_Sub15_Sub1_3.method2174()); if (Static248.method3288(local133)) { - @Pc(226) Class3_Sub19 local226 = new Class3_Sub19(); + @Pc(226) HookRequest local226 = new HookRequest(); local226.anObjectArray31 = local163; Static82.method1767(local226); } @@ -1625,9 +1625,9 @@ public final class Static4 { if (Static213.anInt4851 > Static105.aClass13_14.anInt447 && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) { Static138.aBoolean172 = true; } - @Pc(176) Class3_Sub19 local176; + @Pc(176) HookRequest local176; if (Static105.aClass13_14.anObjectArray26 != null && Static138.aBoolean172) { - local176 = new Class3_Sub19(); + local176 = new HookRequest(); local176.aClass13_17 = Static105.aClass13_14; local176.anObjectArray31 = Static105.aClass13_14.anObjectArray26; local176.anInt3102 = local122; @@ -1637,7 +1637,7 @@ public final class Static4 { if (Static22.anInt723 == 0) { if (Static138.aBoolean172) { if (Static105.aClass13_14.anObjectArray16 != null) { - local176 = new Class3_Sub19(); + local176 = new HookRequest(); local176.anInt3097 = local130; local176.aClass13_16 = Static56.aClass13_12; local176.anInt3102 = local122; diff --git a/client/src/main/java/Static53.java b/client/src/main/java/Static53.java index 7524b86..e711ea9 100644 --- a/client/src/main/java/Static53.java +++ b/client/src/main/java/Static53.java @@ -95,7 +95,7 @@ public final class Static53 { } @Pc(19) Component local19 = Static201.method1418(Static98.anInt2512, Static15.anInt506); if (local19 != null && local19.anObjectArray27 != null) { - @Pc(29) Class3_Sub19 local29 = new Class3_Sub19(); + @Pc(29) HookRequest local29 = new HookRequest(); local29.anObjectArray31 = local19.anObjectArray27; local29.aClass13_17 = local19; Static82.method1767(local29); diff --git a/client/src/main/java/Static74.java b/client/src/main/java/Static74.java index 2aa404b..097890f 100644 --- a/client/src/main/java/Static74.java +++ b/client/src/main/java/Static74.java @@ -87,7 +87,7 @@ public final class Static74 { for (@Pc(33) int local33 = 0; local33 < local31.length; local33++) { @Pc(41) Component local41 = local31[local33]; if (local41.anObjectArray3 != null) { - @Pc(50) Class3_Sub19 local50 = new Class3_Sub19(); + @Pc(50) HookRequest local50 = new HookRequest(); local50.anObjectArray31 = local41.anObjectArray3; local50.aClass13_17 = local41; Static88.method1818(2000000, local50); diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index ca9c70e..9a660ff 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -494,17 +494,17 @@ public final class Static81 { while (true) { @Pc(1569) Component local1569; @Pc(1560) Component local1560; - @Pc(1555) Class3_Sub19 local1555; + @Pc(1555) HookRequest local1555; do { - local1555 = (Class3_Sub19) Static4.aClass69_2.method2287(); + local1555 = (HookRequest) Static4.aClass69_2.method2287(); if (local1555 == null) { while (true) { do { - local1555 = (Class3_Sub19) Static115.aClass69_70.method2287(); + local1555 = (HookRequest) Static115.aClass69_70.method2287(); if (local1555 == null) { while (true) { do { - local1555 = (Class3_Sub19) Static185.aClass69_101.method2287(); + local1555 = (HookRequest) Static185.aClass69_101.method2287(); if (local1555 == null) { if (Static24.aClass13_8 == null) { Static137.anInt3337 = 0; diff --git a/client/src/main/java/Static82.java b/client/src/main/java/Static82.java index 8fded4b..1120070 100644 --- a/client/src/main/java/Static82.java +++ b/client/src/main/java/Static82.java @@ -53,7 +53,7 @@ public final class Static82 { } @OriginalMember(owner = "client!gi", name = "a", descriptor = "(ILclient!jl;)V") - public static void method1767(@OriginalArg(1) Class3_Sub19 arg0) { + public static void method1767(@OriginalArg(1) HookRequest arg0) { Static88.method1818(200000, arg0); } } diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index d3f9bf1..c82f5b3 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -26,7 +26,7 @@ public final class Static88 { } @OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V") - public static void method1818(@OriginalArg(1) int arg0, @OriginalArg(2) Class3_Sub19 arg1) { + public static void method1818(@OriginalArg(1) int arg0, @OriginalArg(2) HookRequest arg1) { @Pc(4) Object[] local4 = arg1.anObjectArray31; @Pc(10) int local10 = (Integer) local4[0]; @Pc(14) ClientScript local14 = Static91.method1875(local10); diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 610e955..e9c70bb 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -469,19 +469,19 @@ public final class client extends GameShell { } } while (true) { - @Pc(374) Class3_Sub19 local374; + @Pc(374) HookRequest local374; @Pc(379) Component local379; @Pc(387) Component local387; do { - local374 = (Class3_Sub19) Static4.aClass69_2.method2287(); + local374 = (HookRequest) Static4.aClass69_2.method2287(); if (local374 == null) { while (true) { do { - local374 = (Class3_Sub19) Static115.aClass69_70.method2287(); + local374 = (HookRequest) Static115.aClass69_70.method2287(); if (local374 == null) { while (true) { do { - local374 = (Class3_Sub19) Static185.aClass69_101.method2287(); + local374 = (HookRequest) Static185.aClass69_101.method2287(); if (local374 == null) { if (Static105.aClass13_14 != null) { Static4.method28();