diff --git a/client/src/main/java/Class49.java b/client/src/main/java/Cache.java similarity index 98% rename from client/src/main/java/Class49.java rename to client/src/main/java/Cache.java index c92f8f2..3e583a8 100644 --- a/client/src/main/java/Class49.java +++ b/client/src/main/java/Cache.java @@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!ge") -public final class Class49 { +public final class Cache { @OriginalMember(owner = "client!ge", name = "a", descriptor = "Lclient!en;") private Class38 aClass38_1 = null; @@ -21,7 +21,7 @@ public final class Class49 { private final int anInt2150; @OriginalMember(owner = "client!ge", name = "", descriptor = "(ILclient!en;Lclient!en;I)V") - public Class49(@OriginalArg(0) int arg0, @OriginalArg(1) Class38 arg1, @OriginalArg(2) Class38 arg2, @OriginalArg(3) int arg3) { + public Cache(@OriginalArg(0) int arg0, @OriginalArg(1) Class38 arg1, @OriginalArg(2) Class38 arg2, @OriginalArg(3) int arg3) { this.anInt2156 = arg3; this.aClass38_2 = arg2; this.anInt2150 = arg0; diff --git a/client/src/main/java/Class14_Sub1.java b/client/src/main/java/Class14_Sub1.java index d6451b7..99a01bb 100644 --- a/client/src/main/java/Class14_Sub1.java +++ b/client/src/main/java/Class14_Sub1.java @@ -34,7 +34,7 @@ public final class Class14_Sub1 extends Class14 { private final int anInt576; @OriginalMember(owner = "client!bg", name = "F", descriptor = "Lclient!ge;") - private final Class49 aClass49_2; + private final Cache aClass49_2; @OriginalMember(owner = "client!bg", name = "Q", descriptor = "Z") private boolean aBoolean35; @@ -52,7 +52,7 @@ public final class Class14_Sub1 extends Class14 { private final boolean aBoolean37; @OriginalMember(owner = "client!bg", name = "k", descriptor = "Lclient!ge;") - private final Class49 aClass49_1; + private final Cache aClass49_1; @OriginalMember(owner = "client!bg", name = "D", descriptor = "Lclient!jb;") private final Js5NetQueue aClass73_2; @@ -64,7 +64,7 @@ public final class Class14_Sub1 extends Class14 { private Class3_Sub2_Sub5 aClass3_Sub2_Sub5_1; @OriginalMember(owner = "client!bg", name = "", descriptor = "(ILclient!ge;Lclient!ge;Lclient!jb;Lclient!k;IIZ)V") - public Class14_Sub1(@OriginalArg(0) int arg0, @OriginalArg(1) Class49 arg1, @OriginalArg(2) Class49 arg2, @OriginalArg(3) Js5NetQueue arg3, @OriginalArg(4) Js5CacheQueue arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7) { + public Class14_Sub1(@OriginalArg(0) int arg0, @OriginalArg(1) Cache arg1, @OriginalArg(2) Cache arg2, @OriginalArg(3) Js5NetQueue arg3, @OriginalArg(4) Js5CacheQueue arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7) { this.anInt576 = arg0; this.aClass49_2 = arg1; if (this.aClass49_2 == null) { diff --git a/client/src/main/java/Class3_Sub2_Sub5_Sub1.java b/client/src/main/java/Class3_Sub2_Sub5_Sub1.java index a0f4256..05aa9bf 100644 --- a/client/src/main/java/Class3_Sub2_Sub5_Sub1.java +++ b/client/src/main/java/Class3_Sub2_Sub5_Sub1.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Class3_Sub2_Sub5_Sub1 extends Class3_Sub2_Sub5 { @OriginalMember(owner = "client!c", name = "X", descriptor = "Lclient!ge;") - public Class49 aClass49_3; + public Cache aClass49_3; @OriginalMember(owner = "client!c", name = "ab", descriptor = "[B") public byte[] aByteArray11; diff --git a/client/src/main/java/Class9.java b/client/src/main/java/Class9.java index a511a78..c3c99d6 100644 --- a/client/src/main/java/Class9.java +++ b/client/src/main/java/Class9.java @@ -69,12 +69,12 @@ public final class Class9 { } @OriginalMember(owner = "client!al", name = "a", descriptor = "(IILclient!ge;Lclient!ge;)Lclient!bg;") - public final Class14_Sub1 method180(@OriginalArg(1) int arg0, @OriginalArg(2) Class49 arg1, @OriginalArg(3) Class49 arg2) { + public final Class14_Sub1 method180(@OriginalArg(1) int arg0, @OriginalArg(2) Cache arg1, @OriginalArg(3) Cache arg2) { return this.method188(arg2, arg0, arg1); } @OriginalMember(owner = "client!al", name = "a", descriptor = "(Lclient!ge;IIZLclient!ge;)Lclient!bg;") - private Class14_Sub1 method188(@OriginalArg(0) Class49 arg0, @OriginalArg(2) int arg1, @OriginalArg(4) Class49 arg2) { + private Class14_Sub1 method188(@OriginalArg(0) Cache arg0, @OriginalArg(2) int arg1, @OriginalArg(4) Cache arg2) { if (this.aClass3_Sub15_1 == null) { throw new RuntimeException(); } diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java index 2f7ccd5..8a55903 100644 --- a/client/src/main/java/Js5CacheQueue.java +++ b/client/src/main/java/Js5CacheQueue.java @@ -55,7 +55,7 @@ public final class Js5CacheQueue implements Runnable { } @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!ge;I[BI)Lclient!c;") - public final Class3_Sub2_Sub5_Sub1 method2467(@OriginalArg(0) Class49 arg0, @OriginalArg(2) byte[] arg1, @OriginalArg(3) int arg2) { + public final Class3_Sub2_Sub5_Sub1 method2467(@OriginalArg(0) Cache arg0, @OriginalArg(2) byte[] arg1, @OriginalArg(3) int arg2) { @Pc(7) Class3_Sub2_Sub5_Sub1 local7 = new Class3_Sub2_Sub5_Sub1(); local7.aByteArray11 = arg1; local7.aBoolean225 = false; @@ -67,7 +67,7 @@ public final class Js5CacheQueue implements Runnable { } @OriginalMember(owner = "client!k", name = "a", descriptor = "(IILclient!ge;)Lclient!c;") - public final Class3_Sub2_Sub5_Sub1 method2469(@OriginalArg(0) int arg0, @OriginalArg(2) Class49 arg1) { + public final Class3_Sub2_Sub5_Sub1 method2469(@OriginalArg(0) int arg0, @OriginalArg(2) Cache arg1) { @Pc(7) Class3_Sub2_Sub5_Sub1 local7 = new Class3_Sub2_Sub5_Sub1(); local7.aClass49_3 = arg1; local7.anInt824 = 3; @@ -78,7 +78,7 @@ public final class Js5CacheQueue implements Runnable { } @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!ge;BI)Lclient!c;") - public final Class3_Sub2_Sub5_Sub1 method2471(@OriginalArg(0) Class49 arg0, @OriginalArg(2) int arg1) { + public final Class3_Sub2_Sub5_Sub1 method2471(@OriginalArg(0) Cache arg0, @OriginalArg(2) int arg1) { @Pc(9) Class3_Sub2_Sub5_Sub1 local9 = new Class3_Sub2_Sub5_Sub1(); local9.anInt824 = 1; @Pc(16) SecondaryLinkedList local16 = this.aClass16_6; diff --git a/client/src/main/java/Static148.java b/client/src/main/java/Static148.java index bc445b0..ca03f3f 100644 --- a/client/src/main/java/Static148.java +++ b/client/src/main/java/Static148.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static148 { @OriginalMember(owner = "client!li", name = "l", descriptor = "Lclient!ge;") - public static Class49 aClass49_4; + public static Cache aClass49_4; @OriginalMember(owner = "client!li", name = "t", descriptor = "I") public static int anInt3534; diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java index 20b1676..ce9a0b0 100644 --- a/client/src/main/java/Static9.java +++ b/client/src/main/java/Static9.java @@ -76,9 +76,9 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "a", descriptor = "(ZZZIZ)Lclient!ve;") public static Js5 method183(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3) { - @Pc(7) Class49 local7 = null; + @Pc(7) Cache local7 = null; if (Static172.aClass38_4 != null) { - local7 = new Class49(arg3, Static172.aClass38_4, Static47.aClass38Array2[arg3], 1000000); + local7 = new Cache(arg3, Static172.aClass38_4, Static47.aClass38Array2[arg3], 1000000); } Static269.aClass14_Sub1Array3[arg3] = Static257.aClass9_2.method180(arg3, Static148.aClass49_4, local7); if (arg1) { diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index e84c9c1..b17e4f3 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -378,7 +378,7 @@ public final class client extends GameShell { Static47.aClass38Array2[local162] = new Class38(Static71.aClass213_3.aClass214Array1[local162], 6000, 0); } Static190.aClass38_5 = new Class38(Static71.aClass213_3.aClass214_3, 6000, 0); - Static148.aClass49_4 = new Class49(255, Static172.aClass38_4, Static190.aClass38_5, 500000); + Static148.aClass49_4 = new Cache(255, Static172.aClass38_4, Static190.aClass38_5, 500000); Static121.aClass38_3 = new Class38(Static71.aClass213_3.aClass214_4, 24, 0); Static71.aClass213_3.aClass214Array1 = null; Static71.aClass213_3.aClass214_3 = null;