diff --git a/client/src/main/java/Class13.java b/client/src/main/java/Class13.java index 8aa8bb2..6865a81 100644 --- a/client/src/main/java/Class13.java +++ b/client/src/main/java/Class13.java @@ -882,7 +882,7 @@ public final class Class13 { return local61; } } else if (local10 == 4) { - @Pc(164) Class55 local164 = Static71.method1439(local13); + @Pc(164) ObjType local164 = Static71.method1439(local13); @Pc(173) Model local173 = local164.method1824(arg0, arg3, arg1, 10, arg2); if (local173 == null) { Static211.aBoolean72 = true; diff --git a/client/src/main/java/Class6.java b/client/src/main/java/Class6.java index 2adc02d..1375345 100644 --- a/client/src/main/java/Class6.java +++ b/client/src/main/java/Class6.java @@ -13,7 +13,7 @@ public final class Class6 implements QuickChatCommandDecoder { @Pc(12) EnumType local12 = Static253.method4330(arg1[0]); return local12.method3085((int) arg2); } else if (arg0 == 1 || arg0 == 10) { - @Pc(31) Class55 local31 = Static71.method1439((int) arg2); + @Pc(31) ObjType local31 = Static71.method1439((int) arg2); return local31.aClass100_495; } else if (arg0 == 6 || arg0 == 7 || arg0 == 11) { return Static253.method4330(arg1[0]).method3085((int) arg2); diff --git a/client/src/main/java/Class55.java b/client/src/main/java/ObjType.java similarity index 98% rename from client/src/main/java/Class55.java rename to client/src/main/java/ObjType.java index a9606c8..7255fc1 100644 --- a/client/src/main/java/Class55.java +++ b/client/src/main/java/ObjType.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!h") -public final class Class55 { +public final class ObjType { @OriginalMember(owner = "client!h", name = "S", descriptor = "[I") public static final int[] anIntArray213 = new int[99]; @@ -213,7 +213,7 @@ public final class Class55 { } @OriginalMember(owner = "client!h", name = "a", descriptor = "(II)Lclient!h;") - public final Class55 method1820(@OriginalArg(0) int arg0) { + public final ObjType method1820(@OriginalArg(0) int arg0) { if (this.anIntArray214 != null && arg0 > 1) { @Pc(23) int local23 = -1; for (@Pc(25) int local25 = 0; local25 < 10; local25++) { @@ -255,7 +255,7 @@ public final class Class55 { } @OriginalMember(owner = "client!h", name = "a", descriptor = "(BLclient!h;Lclient!h;)V") - public final void method1823(@OriginalArg(1) Class55 arg0, @OriginalArg(2) Class55 arg1) { + public final void method1823(@OriginalArg(1) ObjType arg0, @OriginalArg(2) ObjType arg1) { this.aByteArray36 = arg0.aByteArray36; this.anInt2347 = arg0.anInt2347; this.aClass133_6 = arg0.aClass133_6; @@ -605,7 +605,7 @@ public final class Class55 { } @OriginalMember(owner = "client!h", name = "a", descriptor = "(Lclient!h;Lclient!h;Z)V") - public final void method1832(@OriginalArg(0) Class55 arg0, @OriginalArg(1) Class55 arg1) { + public final void method1832(@OriginalArg(0) ObjType arg0, @OriginalArg(1) ObjType arg1) { this.aClass100_495 = arg0.aClass100_495; this.anInt2375 = arg1.anInt2375; this.aShortArray34 = arg1.aShortArray34; diff --git a/client/src/main/java/Static155.java b/client/src/main/java/Static155.java index 2315e3b..b494c70 100644 --- a/client/src/main/java/Static155.java +++ b/client/src/main/java/Static155.java @@ -42,7 +42,7 @@ public final class Static155 { @Pc(12) JagString local12 = arg1.method3114(); @Pc(14) int local14 = 0; for (@Pc(16) int local16 = 0; local16 < Static170.anInt3245; local16++) { - @Pc(27) Class55 local27 = Static71.method1439(local16); + @Pc(27) ObjType local27 = Static71.method1439(local16); if ((!arg0 || local27.aBoolean132) && local27.anInt2358 == -1 && local27.anInt2334 == -1 && local27.anInt2370 == 0 && local27.aClass100_495.method3114().method3131(local12) != -1) { if (local14 >= 250) { Static169.aShortArray52 = null; diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java index 163962d..d89b3e8 100644 --- a/client/src/main/java/Static164.java +++ b/client/src/main/java/Static164.java @@ -184,7 +184,7 @@ public final class Static164 { @OriginalMember(owner = "client!na", name = "a", descriptor = "(IBZIZIIZ)Lclient!qf;") public static Sprite method3150(@OriginalArg(0) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) boolean arg6) { - @Pc(5) Class55 local5 = Static71.method1439(arg2); + @Pc(5) ObjType local5 = Static71.method1439(arg2); if (arg5 > 1 && local5.anIntArray214 != null) { @Pc(15) int local15 = -1; for (@Pc(17) int local17 = 0; local17 < 10; local17++) { diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java index 4897d68..2f1205c 100644 --- a/client/src/main/java/Static176.java +++ b/client/src/main/java/Static176.java @@ -210,7 +210,7 @@ public final class Static176 { if (local931 != null) { for (@Pc(940) Class3_Sub2_Sub16 local940 = (Class3_Sub2_Sub16) local931.method2279(); local940 != null; local940 = (Class3_Sub2_Sub16) local931.method2286()) { local240 = local940.aClass8_Sub7_1.anInt5555; - @Pc(951) Class55 local951 = Static71.method1439(local240); + @Pc(951) ObjType local951 = Static71.method1439(local240); if (Static260.anInt5014 == 1) { Static98.method1966(Static169.anInt4075, (long) local240, Static34.method882(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local951.aClass100_495 }), local47, (short) 33, Static222.aClass100_937, local147); } else if (Static241.aBoolean302) { diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java index 866ac2a..9d44e8a 100644 --- a/client/src/main/java/Static178.java +++ b/client/src/main/java/Static178.java @@ -56,7 +56,7 @@ public final class Static178 { @Pc(27) int local27 = 0; for (@Pc(29) int local29 = 0; local29 < local19.anIntArray420.length; local29++) { if (local19.anIntArray420[local29] >= 0 && Static170.anInt3245 > local19.anIntArray420[local29]) { - @Pc(56) Class55 local56 = Static71.method1439(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); if (local68 != null) { diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 43d7f8e..b1e7ad1 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -36,7 +36,7 @@ public final class Static220 { @Pc(30) Class3_Sub2_Sub16 local30 = null; @Pc(35) Class3_Sub2_Sub16 local35; for (local35 = (Class3_Sub2_Sub16) local9.method2289(); local35 != null; local35 = (Class3_Sub2_Sub16) local9.method2288()) { - @Pc(44) Class55 local44 = Static71.method1439(local35.aClass8_Sub7_1.anInt5555); + @Pc(44) ObjType local44 = Static71.method1439(local35.aClass8_Sub7_1.anInt5555); @Pc(47) int local47 = local44.anInt2325; if (local44.anInt2336 == 1) { local47 *= local35.aClass8_Sub7_1.anInt5550 + 1; diff --git a/client/src/main/java/Static258.java b/client/src/main/java/Static258.java index 0fd3c96..969c9c4 100644 --- a/client/src/main/java/Static258.java +++ b/client/src/main/java/Static258.java @@ -62,7 +62,7 @@ public final class Static258 { Static18.anInt588 = local171; if (arg2.anIntArray40[local171] > 0) { @Pc(267) Class3_Sub4 local267 = Static36.method940(arg2); - @Pc(276) Class55 local276 = Static71.method1439(arg2.anIntArray40[local171] - 1); + @Pc(276) ObjType local276 = Static71.method1439(arg2.anIntArray40[local171] - 1); if (Static260.anInt5014 == 1 && local267.method510()) { if (Static224.anInt5062 != arg2.anInt507 || Static185.anInt4370 != local171) { Static98.method1966(-1, (long) local276.anInt2354, Static34.method882(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 40, Static222.aClass100_937, arg2.anInt507); diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java index 7aab753..aabe345 100644 --- a/client/src/main/java/Static273.java +++ b/client/src/main/java/Static273.java @@ -77,7 +77,7 @@ public final class Static273 { local41 = Static7.anIntArray75[local33[local39++]]; } if (local46 == 6) { - local41 = Class55.anIntArray213[Static141.anIntArray326[local33[local39++]] - 1]; + local41 = ObjType.anIntArray213[Static141.anIntArray326[local33[local39++]] - 1]; } if (local46 == 7) { local41 = Static7.anIntArray75[local33[local39++]] * 100 / 46875; diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index a96be0b..a92c610 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -666,7 +666,7 @@ public final class Static4 { Static99.anIntArray240[local864] = local133; Static141.anIntArray326[local864] = 1; for (local171 = 0; local171 < 98; local171++) { - if (Class55.anIntArray213[local171] <= local786) { + if (ObjType.anIntArray213[local171] <= local786) { Static141.anIntArray326[local864] = local171 + 2; } } @@ -1497,7 +1497,7 @@ public final class Static4 { local171 = Static57.aClass3_Sub15_Sub1_3.method2192(); if (Static248.method3288(local171)) { @Pc(5603) Class13 local5603 = Static5.method32(local786); - @Pc(5615) Class55 local5615; + @Pc(5615) ObjType local5615; if (local5603.aBoolean32) { Static209.method3707(local786, local133, local864); local5615 = Static71.method1439(local864); diff --git a/client/src/main/java/Static58.java b/client/src/main/java/Static58.java index 5502656..dec4a35 100644 --- a/client/src/main/java/Static58.java +++ b/client/src/main/java/Static58.java @@ -28,7 +28,7 @@ public final class Static58 { @Pc(10) int local10 = 0; @Pc(12) int local12; for (local12 = 0; local12 < Static170.anInt3245; local12++) { - @Pc(19) Class55 local19 = Static71.method1439(local12); + @Pc(19) ObjType local19 = Static71.method1439(local12); if (local19.anInt2360 >= 0 || local19.anInt2331 >= 0) { local8[local10++] = local12; } diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index 21f7cf8..0c2e3d8 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -38,13 +38,13 @@ public final class Static71 { public static final JagString aClass100_419 = Static28.method790("ondulation2:"); @OriginalMember(owner = "client!fk", name = "a", descriptor = "(IB)Lclient!h;") - public static Class55 method1439(@OriginalArg(0) int arg0) { - @Pc(6) Class55 local6 = (Class55) Static27.aClass99_4.method3106((long) arg0); + public static ObjType method1439(@OriginalArg(0) int arg0) { + @Pc(6) ObjType local6 = (ObjType) Static27.aClass99_4.method3106((long) arg0); if (local6 != null) { return local6; } @Pc(25) byte[] local25 = Static167.aClass153_61.method4495(Static18.method554(arg0), Static247.method4247(arg0)); - local6 = new Class55(); + local6 = new ObjType(); local6.anInt2354 = arg0; if (local25 != null) { local6.method1827(new Buffer(local25)); diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index 8ad0a28..421e411 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -550,7 +550,7 @@ public final class Static87 { } } if (local30.aBoolean32 && local30.anInt458 != -1) { - @Pc(1989) Class55 local1989 = Static71.method1439(local30.anInt458); + @Pc(1989) ObjType local1989 = Static71.method1439(local30.anInt458); local1934 = local1989.aClass100_495; if (local1934 == null) { local1934 = Static92.aClass100_510; @@ -662,7 +662,7 @@ public final class Static87 { } } } else { - @Pc(2611) Class55 local2611; + @Pc(2611) ObjType local2611; if (local30.anInt452 == 6) { @Pc(2587) boolean local2587 = Static154.method2926(local30); @Pc(2589) Model local2589 = null; diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index e1d3876..a9090fb 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -711,7 +711,7 @@ public final class Static88 { } else { local1182.anInt458 = local803; local1182.anInt503 = local1052; - @Pc(13416) Class55 local13416 = Static71.method1439(local803); + @Pc(13416) ObjType local13416 = Static71.method1439(local803); local1182.anInt508 = local13416.anInt2339; local1182.anInt494 = local13416.anInt2359; local1182.anInt450 = local13416.anInt2353; @@ -2057,7 +2057,7 @@ public final class Static88 { Static3.aClass100Array176[local26++] = Static71.method1439(local809).aClass100_495; continue; } - @Pc(11269) Class55 local11269; + @Pc(11269) ObjType local11269; if (local226 == 4201) { local28 -= 2; local809 = Static254.anIntArray487[local28]; @@ -2094,7 +2094,7 @@ public final class Static88 { Static254.anIntArray487[local28++] = Static71.method1439(local809).anInt2336 == 1 ? 1 : 0; continue; } - @Pc(11417) Class55 local11417; + @Pc(11417) ObjType local11417; if (local226 == 4205) { local28--; local809 = Static254.anIntArray487[local28];