diff --git a/client/src/main/java/Class3_Sub12.java b/client/src/main/java/Class3_Sub12.java index 9a0b2cb..b3ea880 100644 --- a/client/src/main/java/Class3_Sub12.java +++ b/client/src/main/java/Class3_Sub12.java @@ -33,7 +33,7 @@ public final class Class3_Sub12 extends Node { public int anInt2037; @OriginalMember(owner = "client!fl", name = "I", descriptor = "Lclient!km;") - public Class8_Sub4_Sub2 aClass8_Sub4_Sub2_1; + public Npc aClass8_Sub4_Sub2_1; @OriginalMember(owner = "client!fl", name = "K", descriptor = "I") public int anInt2040; diff --git a/client/src/main/java/Class8_Sub4_Sub2.java b/client/src/main/java/Npc.java similarity index 98% rename from client/src/main/java/Class8_Sub4_Sub2.java rename to client/src/main/java/Npc.java index 81bdb5a..a9b5aad 100644 --- a/client/src/main/java/Class8_Sub4_Sub2.java +++ b/client/src/main/java/Npc.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!km") -public final class Class8_Sub4_Sub2 extends PathingEntity { +public final class Npc extends PathingEntity { @OriginalMember(owner = "client!km", name = "rc", descriptor = "Lclient!me;") public Class96 aClass96_1; diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index a953c69..da3d71c 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -216,7 +216,7 @@ public final class Player extends PathingEntity { @Pc(291) int local291; @Pc(302) int local302; if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.aClass8_Sub4_Sub2Array1.length > local245.anInt4057) { - @Pc(278) Class8_Sub4_Sub2 local278 = Static175.aClass8_Sub4_Sub2Array1[local245.anInt4057]; + @Pc(278) Npc local278 = Static175.aClass8_Sub4_Sub2Array1[local245.anInt4057]; if (local278 != null) { local291 = local278.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; local302 = local278.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index cb6ede4..f4ddf22 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -66,7 +66,7 @@ public final class Static103 { Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; } - @Pc(192) Class8_Sub4_Sub2 local192; + @Pc(192) Npc local192; if (local23 == 19) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { diff --git a/client/src/main/java/Static104.java b/client/src/main/java/Static104.java index 41ed12d..531850d 100644 --- a/client/src/main/java/Static104.java +++ b/client/src/main/java/Static104.java @@ -75,8 +75,8 @@ public final class Static104 { local227 = local9.anInt1051; } arg0.anInt3366 = local227; - if (arg0 instanceof Class8_Sub4_Sub2) { - local233 = ((Class8_Sub4_Sub2) arg0).aClass96_1.aBoolean181; + if (arg0 instanceof Npc) { + local233 = ((Npc) arg0).aClass96_1.aBoolean181; } if (local233) { if (arg0.anInt3381 != arg0.anInt3400 && arg0.anInt3370 == -1 && arg0.anInt3376 != 0) { diff --git a/client/src/main/java/Static109.java b/client/src/main/java/Static109.java index d28f383..e135c0d 100644 --- a/client/src/main/java/Static109.java +++ b/client/src/main/java/Static109.java @@ -29,7 +29,7 @@ public final class Static109 { public static void method2274() { for (@Pc(7) int local7 = 0; local7 < Static272.anInt5214; local7++) { @Pc(18) int local18 = Static33.anIntArray79[local7]; - @Pc(22) Class8_Sub4_Sub2 local22 = Static175.aClass8_Sub4_Sub2Array1[local18]; + @Pc(22) Npc local22 = Static175.aClass8_Sub4_Sub2Array1[local18]; if (local22 != null) { Static263.method4514(local22.aClass96_1.anInt3713, local22); } diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java index c06a01d..59b6ef1 100644 --- a/client/src/main/java/Static112.java +++ b/client/src/main/java/Static112.java @@ -116,7 +116,7 @@ public final class Static112 { } @OriginalMember(owner = "client!ij", name = "a", descriptor = "(Lclient!km;I)I") - public static int method2299(@OriginalArg(0) Class8_Sub4_Sub2 arg0) { + public static int method2299(@OriginalArg(0) Npc arg0) { @Pc(13) Class96 local13 = arg0.aClass96_1; if (local13.anIntArray357 != null) { local13 = local13.method2932(); diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java index b697506..4e30be0 100644 --- a/client/src/main/java/Static122.java +++ b/client/src/main/java/Static122.java @@ -37,7 +37,7 @@ public final class Static122 { } @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IZLclient!pb;ILclient!km;IILclient!e;)V") - public static void method2411(@OriginalArg(0) int arg0, @OriginalArg(2) Class118 arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Class8_Sub4_Sub2 arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Player arg6) { + public static void method2411(@OriginalArg(0) int arg0, @OriginalArg(2) Class118 arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Npc arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Player arg6) { @Pc(13) Class3_Sub12 local13 = new Class3_Sub12(); local13.anInt2029 = arg0 * 128; local13.anInt2041 = arg4 * 128; diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index 94b875c..8ba7731 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -60,7 +60,7 @@ public final class Static127 { @Pc(86) int local86 = Static225.anInt5068 - local55; Static235.aClass134_2 = null; @Pc(96) int local96; - @Pc(103) Class8_Sub4_Sub2 local103; + @Pc(103) Npc local103; @Pc(109) int local109; if (arg4) { Static272.anInt5214 = 0; diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java index a5e7d36..7517ccb 100644 --- a/client/src/main/java/Static142.java +++ b/client/src/main/java/Static142.java @@ -37,8 +37,8 @@ public final class Static142 { } if (local17 != null && local17.method2682()) { @Pc(58) Class96 local58; - if (local17 instanceof Class8_Sub4_Sub2) { - local58 = ((Class8_Sub4_Sub2) local17).aClass96_1; + if (local17 instanceof Npc) { + local58 = ((Npc) local17).aClass96_1; if (local58.anIntArray357 != null) { local58 = local58.method2932(); } @@ -48,7 +48,7 @@ public final class Static142 { } @Pc(161) int local161; if (local5 >= Static267.anInt5774) { - local58 = ((Class8_Sub4_Sub2) local17).aClass96_1; + local58 = ((Npc) local17).aClass96_1; if (local58.anIntArray357 != null) { local58 = local58.method2932(); } @@ -124,8 +124,8 @@ public final class Static142 { if (local17.anInt3378 > Static83.anInt372) { @Pc(508) Sprite local508 = Static116.aClass3_Sub2_Sub1Array3[0]; @Pc(512) Sprite local512 = Static116.aClass3_Sub2_Sub1Array3[1]; - if (local17 instanceof Class8_Sub4_Sub2) { - @Pc(518) Class8_Sub4_Sub2 local518 = (Class8_Sub4_Sub2) local17; + if (local17 instanceof Npc) { + @Pc(518) Npc local518 = (Npc) local17; @Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.method3106((long) local518.aClass96_1.anInt3736); if (local528 == null) { local528 = Static209.method3708(local518.aClass96_1.anInt3736, Static209.aClass153_86); @@ -168,8 +168,8 @@ public final class Static142 { } for (local74 = 0; local74 < 4; local74++) { if (local17.anIntArray319[local74] > Static83.anInt372) { - if (local17 instanceof Class8_Sub4_Sub2) { - @Pc(725) Class8_Sub4_Sub2 local725 = (Class8_Sub4_Sub2) local17; + if (local17 instanceof Npc) { + @Pc(725) Npc local725 = (Npc) local17; @Pc(728) Class96 local728 = local725.aClass96_1; if (local728.anInt3730 == -1) { local265 = local17.method2691() / 2; diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java index c398a84..f07cf0d 100644 --- a/client/src/main/java/Static158.java +++ b/client/src/main/java/Static158.java @@ -158,8 +158,8 @@ public final class Static158 { @Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.anInt3483; @Pc(148) Class96 local148 = Static214.method4363(local74.method2163()); if (Static175.aClass8_Sub4_Sub2Array1[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) { - Static175.aClass8_Sub4_Sub2Array1[local97] = new Class8_Sub4_Sub2(); - @Pc(198) Class8_Sub4_Sub2 local198 = Static175.aClass8_Sub4_Sub2Array1[local97]; + Static175.aClass8_Sub4_Sub2Array1[local97] = new Npc(); + @Pc(198) Npc local198 = Static175.aClass8_Sub4_Sub2Array1[local97]; Static33.anIntArray79[Static272.anInt5214++] = local97; local198.anInt3430 = Static83.anInt372; local198.method2698(local148); diff --git a/client/src/main/java/Static159.java b/client/src/main/java/Static159.java index c45fd9b..f44d931 100644 --- a/client/src/main/java/Static159.java +++ b/client/src/main/java/Static159.java @@ -29,7 +29,7 @@ public final class Static159 { public static boolean aBoolean189 = true; @OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V") - public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Class8_Sub4_Sub2 arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) { + public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) { for (@Pc(3) int local3 = 0; local3 < arg3.length; local3++) { @Pc(15) int local15 = arg3[local3]; @Pc(19) int local19 = arg0[local3]; diff --git a/client/src/main/java/Static173.java b/client/src/main/java/Static173.java index 8f5a490..fb2e9cf 100644 --- a/client/src/main/java/Static173.java +++ b/client/src/main/java/Static173.java @@ -25,7 +25,7 @@ public final class Static173 { @OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V") public static void method3240(@OriginalArg(1) boolean arg0) { @Pc(7) int local7; - @Pc(16) Class8_Sub4_Sub2 local16; + @Pc(16) Npc local16; @Pc(107) int local107; @Pc(113) int local113; @Pc(133) int local133; diff --git a/client/src/main/java/Static175.java b/client/src/main/java/Static175.java index c42b276..6030133 100644 --- a/client/src/main/java/Static175.java +++ b/client/src/main/java/Static175.java @@ -12,7 +12,7 @@ public final class Static175 { public static final JagString aClass100_796 = Static28.method790("Schlie-8en"); @OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;") - public static final Class8_Sub4_Sub2[] aClass8_Sub4_Sub2Array1 = new Class8_Sub4_Sub2[32768]; + public static final Npc[] aClass8_Sub4_Sub2Array1 = new Npc[32768]; @OriginalMember(owner = "client!nm", name = "U", descriptor = "I") public static int anInt4220 = 0; diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java index c37c7fb..af4c6c7 100644 --- a/client/src/main/java/Static176.java +++ b/client/src/main/java/Static176.java @@ -155,10 +155,10 @@ public final class Static176 { @Pc(526) int local526; @Pc(479) int local479; @Pc(493) int local493; - @Pc(502) Class8_Sub4_Sub2 local502; + @Pc(502) Npc local502; @Pc(597) Player local597; if (local133 == 1) { - @Pc(421) Class8_Sub4_Sub2 local421 = Static175.aClass8_Sub4_Sub2Array1[local140]; + @Pc(421) Npc local421 = Static175.aClass8_Sub4_Sub2Array1[local140]; if ((local421.aClass96_1.anInt3713 & 0x1) == 0 && (local421.anInt3412 & 0x7F) == 0 && (local421.anInt3421 & 0x7F) == 0 || (local421.aClass96_1.anInt3713 & 0x1) == 1 && (local421.anInt3412 & 0x7F) == 64 && (local421.anInt3421 & 0x7F) == 64) { local479 = local421.anInt3412 + 64 - local421.aClass96_1.anInt3713 * 64; local240 = local421.anInt3421 - (local421.aClass96_1.anInt3713 - 1) * 64; diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index ed91aa3..f63137f 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -64,7 +64,7 @@ public final class Static19 { } for (local11 = 0; local11 < Static272.anInt5214; local11++) { @Pc(68) int local68 = Static33.anIntArray79[local11]; - @Pc(72) Class8_Sub4_Sub2 local72 = Static175.aClass8_Sub4_Sub2Array1[local68]; + @Pc(72) Npc local72 = Static175.aClass8_Sub4_Sub2Array1[local68]; if (local72 != null && local72.anInt3408 > 0) { local72.anInt3408--; if (local72.anInt3408 == 0) { diff --git a/client/src/main/java/Static195.java b/client/src/main/java/Static195.java index ca73b1f..8b55470 100644 --- a/client/src/main/java/Static195.java +++ b/client/src/main/java/Static195.java @@ -37,7 +37,7 @@ public final class Static195 { local16.method4658(); } else if (Static83.anInt372 >= local21.anInt4822) { if (local21.anInt4819 > 0) { - @Pc(54) Class8_Sub4_Sub2 local54 = Static175.aClass8_Sub4_Sub2Array1[local21.anInt4819 - 1]; + @Pc(54) Npc local54 = Static175.aClass8_Sub4_Sub2Array1[local21.anInt4819 - 1]; if (local54 != null && local54.anInt3412 >= 0 && local54.anInt3412 < 13312 && local54.anInt3421 >= 0 && local54.anInt3421 < 13312) { local21.method3705(local54.anInt3421, Static83.anInt372, Static207.method3685(local21.anInt4810, local54.anInt3412, local54.anInt3421) - local21.anInt4805, local54.anInt3412); } diff --git a/client/src/main/java/Static223.java b/client/src/main/java/Static223.java index 7808450..1b288c6 100644 --- a/client/src/main/java/Static223.java +++ b/client/src/main/java/Static223.java @@ -42,7 +42,7 @@ public final class Static223 { public static final JagString aClass100_951 = Static28.method790("