diff --git a/client/src/main/java/rt4/Equipment.java b/client/src/main/java/rt4/Equipment.java index 5581567..de83af1 100644 --- a/client/src/main/java/rt4/Equipment.java +++ b/client/src/main/java/rt4/Equipment.java @@ -5,22 +5,22 @@ import org.openrs2.deob.annotation.Pc; public class Equipment { @OriginalMember(owner = "client!ta", name = "p", descriptor = "[I") - public static int[] anIntArray455; + public static int[] objIds; @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I)V") public static void init() { - @Pc(8) int[] local8 = new int[ObjTypeList.anInt3245]; - @Pc(10) int local10 = 0; - @Pc(12) int local12; - for (local12 = 0; local12 < ObjTypeList.anInt3245; local12++) { - @Pc(19) ObjType local19 = ObjTypeList.get(local12); - if (local19.manwear >= 0 || local19.womanwear >= 0) { - local8[local10++] = local12; + @Pc(8) int[] ids = new int[ObjTypeList.capacity]; + @Pc(10) int j = 0; + @Pc(12) int i; + for (i = 0; i < ObjTypeList.capacity; i++) { + @Pc(19) ObjType type = ObjTypeList.get(i); + if (type.manwear >= 0 || type.womanwear >= 0) { + ids[j++] = i; } } - anIntArray455 = new int[local10]; - for (local12 = 0; local12 < local10; local12++) { - anIntArray455[local12] = local8[local12]; + objIds = new int[j]; + for (i = 0; i < j; i++) { + objIds[i] = ids[i]; } } } diff --git a/client/src/main/java/rt4/Find.java b/client/src/main/java/rt4/Find.java index 78e868d..f59f501 100644 --- a/client/src/main/java/rt4/Find.java +++ b/client/src/main/java/rt4/Find.java @@ -52,7 +52,7 @@ public class Find { @Pc(8) short[] local8 = new short[16]; @Pc(12) JagString local12 = arg1.toLowerCase(); @Pc(14) int local14 = 0; - for (@Pc(16) int local16 = 0; local16 < ObjTypeList.anInt3245; local16++) { + for (@Pc(16) int local16 = 0; local16 < ObjTypeList.capacity; local16++) { @Pc(27) ObjType local27 = ObjTypeList.get(local16); if ((!arg0 || local27.stockMarket) && local27.certtemplate == -1 && local27.lentTemplate == -1 && local27.dummyItem == 0 && local27.name.toLowerCase().indexOf(local12) != -1) { if (local14 >= 250) { diff --git a/client/src/main/java/rt4/Inv.java b/client/src/main/java/rt4/Inv.java index 2ac4029..b89d577 100644 --- a/client/src/main/java/rt4/Inv.java +++ b/client/src/main/java/rt4/Inv.java @@ -54,7 +54,7 @@ public final class Inv extends Node { } @Pc(27) int local27 = 0; for (@Pc(29) int local29 = 0; local29 < local19.objectIds.length; local29++) { - if (local19.objectIds[local29] >= 0 && ObjTypeList.anInt3245 > local19.objectIds[local29]) { + if (local19.objectIds[local29] >= 0 && ObjTypeList.capacity > local19.objectIds[local29]) { @Pc(56) ObjType local56 = ObjTypeList.get(local19.objectIds[local29]); if (local56.params != null) { @Pc(68) IntNode local68 = (IntNode) local56.params.get(arg2); diff --git a/client/src/main/java/rt4/ObjTypeList.java b/client/src/main/java/rt4/ObjTypeList.java index 922f98c..6bc52be 100644 --- a/client/src/main/java/rt4/ObjTypeList.java +++ b/client/src/main/java/rt4/ObjTypeList.java @@ -22,7 +22,7 @@ public class ObjTypeList { @OriginalMember(owner = "client!ld", name = "g", descriptor = "[Lclient!na;") public static JagString[] aClass100Array104 = null; @OriginalMember(owner = "client!nh", name = "eb", descriptor = "I") - public static int anInt3245; + public static int capacity; @OriginalMember(owner = "client!nd", name = "n", descriptor = "Lclient!ve;") public static Js5 archive; @@ -32,7 +32,7 @@ public class ObjTypeList { modelsArchive = arg2; archive = arg0; @Pc(23) int local23 = archive.capacity() - 1; - anInt3245 = archive.getGroupCapacity(local23) + local23 * 256; + capacity = archive.getGroupCapacity(local23) + local23 * 256; aClass100Array104 = new JagString[]{null, null, null, null, LocalizedText.DROP}; aClass100Array87 = new JagString[]{null, null, LocalizedText.TAKE, null, null}; font = arg1; diff --git a/client/src/main/java/rt4/Player.java b/client/src/main/java/rt4/Player.java index b0e1f70..5ff85e3 100644 --- a/client/src/main/java/rt4/Player.java +++ b/client/src/main/java/rt4/Player.java @@ -337,7 +337,7 @@ public final class Player extends PathingEntity { break; } if (local134 >= 32768) { - local134 = Equipment.anIntArray455[local134 - 32768]; + local134 = Equipment.objIds[local134 - 32768]; local44[local102] = local134 | 0x40000000; local175 = ObjTypeList.get(local134).team; if (local175 != 0) {