From fd8d8ce2193ed31fd7de6fe44e5c8836412b5106 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Tue, 19 Apr 2022 05:47:55 -0400 Subject: [PATCH] Rename Class31 to Scenery --- client/src/main/java/{Class31.java => Scenery.java} | 2 +- client/src/main/java/Static105.java | 2 +- client/src/main/java/Static133.java | 4 ++-- client/src/main/java/Static192.java | 2 +- client/src/main/java/Static220.java | 2 +- client/src/main/java/Static221.java | 4 ++-- client/src/main/java/Static223.java | 2 +- client/src/main/java/Static224.java | 2 +- client/src/main/java/Static243.java | 2 +- client/src/main/java/Static247.java | 6 +++--- client/src/main/java/Static248.java | 2 +- client/src/main/java/Static25.java | 2 +- client/src/main/java/Static254.java | 2 +- client/src/main/java/Static266.java | 2 +- client/src/main/java/Static28.java | 4 ++-- client/src/main/java/Static35.java | 2 +- client/src/main/java/Static43.java | 2 +- client/src/main/java/Static47.java | 4 ++-- client/src/main/java/Static69.java | 4 ++-- client/src/main/java/Static92.java | 2 +- client/src/main/java/Tile.java | 2 +- 21 files changed, 28 insertions(+), 28 deletions(-) rename client/src/main/java/{Class31.java => Scenery.java} (97%) diff --git a/client/src/main/java/Class31.java b/client/src/main/java/Scenery.java similarity index 97% rename from client/src/main/java/Class31.java rename to client/src/main/java/Scenery.java index d19b014..be842be 100644 --- a/client/src/main/java/Class31.java +++ b/client/src/main/java/Scenery.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!ec") -public final class Class31 { +public final class Scenery { @OriginalMember(owner = "client!ec", name = "a", descriptor = "I") public int anInt1696; diff --git a/client/src/main/java/Static105.java b/client/src/main/java/Static105.java index 5cdbe85..4a7b129 100644 --- a/client/src/main/java/Static105.java +++ b/client/src/main/java/Static105.java @@ -128,7 +128,7 @@ public final class Static105 { } } } - @Pc(58) Class31 local58 = new Class31(); + @Pc(58) Scenery local58 = new Scenery(); local58.aLong56 = arg11; local58.anInt1709 = arg0; local58.anInt1699 = arg5; diff --git a/client/src/main/java/Static133.java b/client/src/main/java/Static133.java index 41998b8..0308233 100644 --- a/client/src/main/java/Static133.java +++ b/client/src/main/java/Static133.java @@ -23,13 +23,13 @@ public final class Static133 { public static int anInt5235 = 0; @OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;") - public static Class31 method4008(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + public static Scenery method4008(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; if (local7 == null) { return null; } for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) { - @Pc(22) Class31 local22 = local7.aClass31Array1[local13]; + @Pc(22) Scenery local22 = local7.aClass31Array1[local13]; if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) { return local22; } diff --git a/client/src/main/java/Static192.java b/client/src/main/java/Static192.java index 8cfe3ad..beb7dd8 100644 --- a/client/src/main/java/Static192.java +++ b/client/src/main/java/Static192.java @@ -64,7 +64,7 @@ public final class Static192 { local159 = local231.aClass8_3; } } else if (local164 == 2) { - @Pc(198) Class31 local198 = Static133.method4008(Static55.anInt1735, local17.anInt1190, local17.anInt1204); + @Pc(198) Scenery local198 = Static133.method4008(Static55.anInt1735, local17.anInt1190, local17.anInt1204); if (local198 != null) { local159 = local198.aClass8_4; } diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 20242e4..5cf0391 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -136,7 +136,7 @@ public final class Static220 { local27.aClass8_5 = local27.aClass8_5.method4539(); } for (@Pc(83) int local83 = 0; local83 < local22.anInt662; local83++) { - @Pc(92) Class31 local92 = local22.aClass31Array1[local83]; + @Pc(92) Scenery local92 = local22.aClass31Array1[local83]; if (local92 != null && local92.aClass8_4.method4543()) { Static69.method1544(local92.aClass8_4, local1, local6, local11, local92.anInt1713 + 1 - local92.anInt1701, local92.anInt1698 - local92.anInt1696 + 1); local92.aClass8_4 = local92.aClass8_4.method4539(); diff --git a/client/src/main/java/Static221.java b/client/src/main/java/Static221.java index a282028..ed3206e 100644 --- a/client/src/main/java/Static221.java +++ b/client/src/main/java/Static221.java @@ -149,7 +149,7 @@ public final class Static221 { local135 = true; } } - @Pc(275) Class31 local275 = Static133.method4008(arg4, local114, local72); + @Pc(275) Scenery local275 = Static133.method4008(arg4, local114, local72); if (local275 != null) { @Pc(287) int local287 = (int) (local275.aLong56 >> 14) & 0x3F; if (local287 == 9) { @@ -269,7 +269,7 @@ public final class Static221 { local791 = true; } } - @Pc(899) Class31 local899 = Static133.method4008(arg4, local114, local72); + @Pc(899) Scenery local899 = Static133.method4008(arg4, local114, local72); if (local899 != null) { @Pc(911) int local911 = (int) (local899.aLong56 >> 14) & 0x3F; if (local911 == 9) { diff --git a/client/src/main/java/Static223.java b/client/src/main/java/Static223.java index 4f9b05b..e657d3e 100644 --- a/client/src/main/java/Static223.java +++ b/client/src/main/java/Static223.java @@ -74,7 +74,7 @@ public final class Static223 { @OriginalMember(owner = "client!sc", name = "a", descriptor = "()V") public static void method3858() { for (@Pc(1) int local1 = 0; local1 < Static22.anInt726; local1++) { - @Pc(8) Class31 local8 = Static243.aClass31Array3[local1]; + @Pc(8) Scenery local8 = Static243.aClass31Array3[local1]; Static266.method4193(local8); Static243.aClass31Array3[local1] = null; } diff --git a/client/src/main/java/Static224.java b/client/src/main/java/Static224.java index d081fb0..eddb008 100644 --- a/client/src/main/java/Static224.java +++ b/client/src/main/java/Static224.java @@ -43,7 +43,7 @@ public final class Static224 { if (local30 != null) { local30.anInt672--; for (@Pc(40) int local40 = 0; local40 < local30.anInt662; local40++) { - @Pc(49) Class31 local49 = local30.aClass31Array1[local40]; + @Pc(49) Scenery local49 = local30.aClass31Array1[local40]; if ((local49.aLong56 >> 29 & 0x3L) == 2L && local49.anInt1701 == arg0 && local49.anInt1696 == arg1) { local49.anInt1709--; } diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java index 294cfb2..8133455 100644 --- a/client/src/main/java/Static243.java +++ b/client/src/main/java/Static243.java @@ -14,7 +14,7 @@ public final class Static243 { public static Class153 aClass153_98; @OriginalMember(owner = "client!tk", name = "D", descriptor = "[Lclient!ec;") - public static Class31[] aClass31Array3; + public static Scenery[] aClass31Array3; @OriginalMember(owner = "client!tk", name = "c", descriptor = "J") public static volatile long aLong178 = 0L; diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index 8af5f31..faa262e 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -64,7 +64,7 @@ public final class Static247 { @Pc(916) int var18; @Pc(363) Class77 var22; @Pc(469) boolean var24; - @Pc(425) Class31 var25; + @Pc(425) Scenery var25; @Pc(1179) Tile var32; while (true) { do { @@ -478,7 +478,7 @@ public final class Static247 { local65 = -50; local115 = -1; for (local1332 = 0; local1332 < var10; local1332++) { - @Pc(1628) Class31 local1628 = Static25.aClass31Array2[local1332]; + @Pc(1628) Scenery local1628 = Static25.aClass31Array2[local1332]; if (local1628.anInt1707 != Static13.anInt437) { if (local1628.anInt1705 > local65) { local65 = local1628.anInt1705; @@ -497,7 +497,7 @@ public final class Static247 { if (local115 == -1) { break; } - @Pc(1697) Class31 local1697 = Static25.aClass31Array2[local115]; + @Pc(1697) Scenery local1697 = Static25.aClass31Array2[local115]; local1697.anInt1707 = Static13.anInt437; if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.aClass8_4.method4549())) { if (Static239.aBoolean269) { diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java index 470e97e..cff2f02 100644 --- a/client/src/main/java/Static248.java +++ b/client/src/main/java/Static248.java @@ -85,7 +85,7 @@ public final class Static248 { } if (local46.aClass31Array1 != null) { for (local183 = 0; local183 < local46.anInt662; local183++) { - @Pc(192) Class31 local192 = local46.aClass31Array1[local183]; + @Pc(192) Scenery local192 = local46.aClass31Array1[local183]; local192.aClass8_4.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703); } } diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java index 841d4c4..ac62aea 100644 --- a/client/src/main/java/Static25.java +++ b/client/src/main/java/Static25.java @@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static25 { @OriginalMember(owner = "client!c", name = "bb", descriptor = "[Lclient!ec;") - public static Class31[] aClass31Array2; + public static Scenery[] aClass31Array2; @OriginalMember(owner = "client!c", name = "W", descriptor = "Lclient!na;") private static final Class100 aClass100_153 = Static28.method790(" has logged in)3"); diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java index 5811ed5..cf0afb8 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -111,7 +111,7 @@ public final class Static254 { @Pc(395) Tile local395 = arg3[local150][local108][local122]; if (local395 != null && local395.anInt662 > 0) { for (local227 = 0; local227 < local395.anInt662; local227++) { - @Pc(418) Class31 local418 = local395.aClass31Array1[local227]; + @Pc(418) Scenery local418 = local395.aClass31Array1[local227]; if (local418.anInt1713 != local418.anInt1701 || local418.anInt1698 != local418.anInt1696) { for (local358 = local418.anInt1701; local358 <= local418.anInt1713; local358++) { for (@Pc(450) int local450 = local418.anInt1696; local450 <= local418.anInt1698; local450++) { diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java index e058cdd..3f91933 100644 --- a/client/src/main/java/Static266.java +++ b/client/src/main/java/Static266.java @@ -61,7 +61,7 @@ public final class Static266 { } @OriginalMember(owner = "client!vk", name = "a", descriptor = "(Lclient!ec;)V") - public static void method4193(@OriginalArg(0) Class31 arg0) { + public static void method4193(@OriginalArg(0) Scenery arg0) { for (@Pc(2) int local2 = arg0.anInt1701; local2 <= arg0.anInt1713; local2++) { for (@Pc(9) int local9 = arg0.anInt1696; local9 <= arg0.anInt1698; local9++) { @Pc(22) Tile local22 = Static130.aClass3_Sub5ArrayArrayArray1[arg0.anInt1709][local2][local9]; diff --git a/client/src/main/java/Static28.java b/client/src/main/java/Static28.java index 545ef4c..95dea83 100644 --- a/client/src/main/java/Static28.java +++ b/client/src/main/java/Static28.java @@ -125,9 +125,9 @@ public final class Static28 { Static247.aClass120Array2 = new Class120[500]; Static215.anInt4870 = 0; Static140.anIntArrayArrayArray12 = new int[4][Static152.anInt3594 + 1][Static99.anInt2550 + 1]; - Static243.aClass31Array3 = new Class31[5000]; + Static243.aClass31Array3 = new Scenery[5000]; Static22.anInt726 = 0; - Static25.aClass31Array2 = new Class31[100]; + Static25.aClass31Array2 = new Scenery[100]; Static48.aBooleanArrayArray1 = new boolean[Static277.anInt5855 + Static277.anInt5855 + 1][Static277.anInt5855 + Static277.anInt5855 + 1]; Static89.aBooleanArrayArray3 = new boolean[Static277.anInt5855 + Static277.anInt5855 + 2][Static277.anInt5855 + Static277.anInt5855 + 2]; Static232.aByteArrayArrayArray13 = new byte[4][Static152.anInt3594][Static99.anInt2550]; diff --git a/client/src/main/java/Static35.java b/client/src/main/java/Static35.java index 09edd90..757cd63 100644 --- a/client/src/main/java/Static35.java +++ b/client/src/main/java/Static35.java @@ -113,7 +113,7 @@ public final class Static35 { return 0L; } for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) { - @Pc(22) Class31 local22 = local7.aClass31Array1[local13]; + @Pc(22) Scenery local22 = local7.aClass31Array1[local13]; if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) { return local22.aLong56; } diff --git a/client/src/main/java/Static43.java b/client/src/main/java/Static43.java index cd7b847..1ea5166 100644 --- a/client/src/main/java/Static43.java +++ b/client/src/main/java/Static43.java @@ -96,7 +96,7 @@ public final class Static43 { local102 = local233.aClass8_2; } } else if (arg3 == 2) { - @Pc(148) Class31 local148 = Static47.method3996(arg2, arg1, arg0); + @Pc(148) Scenery local148 = Static47.method3996(arg2, arg1, arg0); if (local148 != null) { local100 = local148.aClass8_4; } diff --git a/client/src/main/java/Static47.java b/client/src/main/java/Static47.java index e036032..ff7409f 100644 --- a/client/src/main/java/Static47.java +++ b/client/src/main/java/Static47.java @@ -14,13 +14,13 @@ public final class Static47 { public static final Class38[] aClass38Array2 = new Class38[28]; @OriginalMember(owner = "client!dk", name = "a", descriptor = "(III)Lclient!ec;") - public static Class31 method3996(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + public static Scenery method3996(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; if (local7 == null) { return null; } for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) { - @Pc(22) Class31 local22 = local7.aClass31Array1[local13]; + @Pc(22) Scenery local22 = local7.aClass31Array1[local13]; if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) { Static266.method4193(local22); return local22; diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java index 20e238d..ee32a13 100644 --- a/client/src/main/java/Static69.java +++ b/client/src/main/java/Static69.java @@ -78,7 +78,7 @@ public final class Static69 { @Pc(42) Tile local42 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; if (local42 != null) { for (@Pc(46) int local46 = 0; local46 < local42.anInt662; local46++) { - @Pc(55) Class31 local55 = local42.aClass31Array1[local46]; + @Pc(55) Scenery local55 = local42.aClass31Array1[local46]; if ((local55.aLong56 & 0x400000L) == 4194304L) { @Pc(66) int local66 = local55.aClass8_4.method4549(); if (local66 != -32768 && local66 < local34) { @@ -120,7 +120,7 @@ public final class Static69 { } } for (@Pc(232) int local232 = 0; local232 < local71.anInt662; local232++) { - @Pc(241) Class31 local241 = local71.aClass31Array1[local232]; + @Pc(241) Scenery local241 = local71.aClass31Array1[local232]; if (local241 != null && local241.aClass8_4.method4543() && (local28 == local241.anInt1701 || local28 == local3) && (local39 == local241.anInt1696 || local39 == local11)) { @Pc(270) int local270 = local241.anInt1713 + 1 - local241.anInt1701; @Pc(278) int local278 = local241.anInt1698 + 1 - local241.anInt1696; diff --git a/client/src/main/java/Static92.java b/client/src/main/java/Static92.java index 282ea4d..f552cfc 100644 --- a/client/src/main/java/Static92.java +++ b/client/src/main/java/Static92.java @@ -72,7 +72,7 @@ public final class Static92 { if (arg2 == 11) { arg2 = 10; } - @Pc(255) Class31 local255 = Static133.method4008(arg0, arg5, arg3); + @Pc(255) Scenery local255 = Static133.method4008(arg0, arg5, arg3); if (local255 != null) { local255.aClass8_4 = new Class8_Sub3((int) (local255.aLong56 >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.aClass8_4); } diff --git a/client/src/main/java/Tile.java b/client/src/main/java/Tile.java index 0395aa2..f829331 100644 --- a/client/src/main/java/Tile.java +++ b/client/src/main/java/Tile.java @@ -54,7 +54,7 @@ public final class Tile extends Node { public int anInt664 = 0; @OriginalMember(owner = "client!bj", name = "w", descriptor = "[Lclient!ec;") - public final Class31[] aClass31Array1 = new Class31[5]; + public final Scenery[] aClass31Array1 = new Scenery[5]; @OriginalMember(owner = "client!bj", name = "P", descriptor = "[I") public final int[] anIntArray59 = new int[5];