diff --git a/client/src/main/java/Class14_Sub1.java b/client/src/main/java/Class14_Sub1.java index b90ba0f..9310c09 100644 --- a/client/src/main/java/Class14_Sub1.java +++ b/client/src/main/java/Class14_Sub1.java @@ -277,7 +277,7 @@ public final class Class14_Sub1 extends Class14 { this.aClass69_17 = null; } } - if (!this.aBoolean37 || this.aLong20 > Class209.method5096()) { + if (!this.aBoolean37 || this.aLong20 > MonotonicClock.method5096()) { return; } for (@Pc(331) Class3_Sub2_Sub5 local331 = (Class3_Sub2_Sub5) this.aClass133_1.method3859(); local331 != null; local331 = (Class3_Sub2_Sub5) this.aClass133_1.method3861()) { @@ -292,7 +292,7 @@ public final class Class14_Sub1 extends Class14 { } } } - this.aLong20 = Class209.method5096() + 1000L; + this.aLong20 = MonotonicClock.method5096() + 1000L; } @OriginalMember(owner = "client!bg", name = "b", descriptor = "(II)I") diff --git a/client/src/main/java/Class150.java b/client/src/main/java/Class150.java index 50fb109..89063de 100644 --- a/client/src/main/java/Class150.java +++ b/client/src/main/java/Class150.java @@ -78,7 +78,7 @@ public final class Class150 implements MouseListener, MouseMotionListener, Focus Static93.anInt2467 = 0; Static34.anInt1034 = arg0.getX(); Static222.anInt4973 = arg0.getY(); - Static209.aLong161 = Class209.method5096(); + Static209.aLong161 = MonotonicClock.method5096(); if ((arg0.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0) { Static41.anInt1313 = 1; Static57.anInt1759 = 1; diff --git a/client/src/main/java/Class3_Sub2_Sub8.java b/client/src/main/java/Class3_Sub2_Sub8.java index 08d0a0d..91de080 100644 --- a/client/src/main/java/Class3_Sub2_Sub8.java +++ b/client/src/main/java/Class3_Sub2_Sub8.java @@ -24,7 +24,7 @@ public final class Class3_Sub2_Sub8 extends Class3_Sub2 { @OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V") public final void method1007() { - this.aLong185 = Class209.method5096() + 500L | Long.MIN_VALUE & this.aLong185; + this.aLong185 = MonotonicClock.method5096() + 500L | Long.MIN_VALUE & this.aLong185; Static140.aClass16_7.method798(this); } diff --git a/client/src/main/java/Class62.java b/client/src/main/java/Class62.java index 1936d91..3862518 100644 --- a/client/src/main/java/Class62.java +++ b/client/src/main/java/Class62.java @@ -26,7 +26,7 @@ public class Class62 { private final int anInt4621 = 32; @OriginalMember(owner = "client!vh", name = "f", descriptor = "J") - private long aLong151 = Class209.method5096(); + private long aLong151 = MonotonicClock.method5096(); @OriginalMember(owner = "client!vh", name = "w", descriptor = "[Lclient!qb;") private final PcmStream[] aClass3_Sub3Array5 = new PcmStream[8]; @@ -161,7 +161,7 @@ public class Class62 { if (this.aClass3_Sub3_6 != null) { this.aClass3_Sub3_6.method4408(arg0, 0, 256); } - this.aLong151 = Class209.method5096(); + this.aLong151 = MonotonicClock.method5096(); } @OriginalMember(owner = "client!vh", name = "a", descriptor = "(B)V") @@ -169,7 +169,7 @@ public class Class62 { if (this.anIntArray411 == null) { return; } - @Pc(14) long local14 = Class209.method5096(); + @Pc(14) long local14 = MonotonicClock.method5096(); try { if (this.aLong153 != 0L) { if (local14 < this.aLong153) { @@ -268,7 +268,7 @@ public class Class62 { this.method3563(); } catch (@Pc(10) Exception local10) { this.method3572(); - this.aLong153 = Class209.method5096() + 2000L; + this.aLong153 = MonotonicClock.method5096() + 2000L; } } diff --git a/client/src/main/java/Class73.java b/client/src/main/java/Class73.java index 2941a5d..043ad4c 100644 --- a/client/src/main/java/Class73.java +++ b/client/src/main/java/Class73.java @@ -55,7 +55,7 @@ public final class Class73 { public final boolean method2318() { @Pc(19) int local19; if (this.aClass95_1 != null) { - @Pc(12) long local12 = Class209.method5096(); + @Pc(12) long local12 = MonotonicClock.method5096(); local19 = (int) (local12 - this.aLong104); this.aLong104 = local12; if (local19 > 200) { @@ -288,7 +288,7 @@ public final class Class73 { } } this.anInt2962 = 0; - this.aLong104 = Class209.method5096(); + this.aLong104 = MonotonicClock.method5096(); return; } this.aClass16_4.method798(local44); diff --git a/client/src/main/java/Class93_Sub1.java b/client/src/main/java/Class93_Sub1.java index b4ceb44..c40fd91 100644 --- a/client/src/main/java/Class93_Sub1.java +++ b/client/src/main/java/Class93_Sub1.java @@ -22,7 +22,7 @@ public final class Class93_Sub1 extends Class93 { private int anInt3553 = 0; @OriginalMember(owner = "client!lj", name = "k", descriptor = "J") - private long aLong122 = Class209.method5096(); + private long aLong122 = MonotonicClock.method5096(); @OriginalMember(owner = "client!lj", name = "", descriptor = "()V") public Class93_Sub1() { @@ -46,7 +46,7 @@ public final class Class93_Sub1 extends Class93 { @Pc(20) int local20 = this.anInt3550; this.anInt3550 = 300; this.anInt3552 = 1; - this.aLong122 = Class209.method5096(); + this.aLong122 = MonotonicClock.method5096(); if (this.aLongArray4[this.anInt3549] == 0L) { this.anInt3550 = local20; this.anInt3552 = local17; diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java index 0870e2c..b138eea 100644 --- a/client/src/main/java/GameShell.java +++ b/client/src/main/java/GameShell.java @@ -111,14 +111,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Static69.aBoolean115 = true; Static26.aBoolean59 = true; Static35.aBoolean66 = false; - Static243.aLong178 = Class209.method5096(); + Static243.aLong178 = MonotonicClock.method5096(); } @OriginalMember(owner = "client!rc", name = "destroy", descriptor = "()V") @Override public final void destroy() { if (Static230.anApplet_Sub1_1 == this && !Static58.aBoolean101) { - Static72.aLong74 = Class209.method5096(); + Static72.aLong74 = MonotonicClock.method5096(); Static231.method3983(5000L); Static69.aClass213_4 = null; this.method931(false); @@ -167,7 +167,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return; } Static69.aBoolean115 = true; - if (Static236.aBoolean256 && !Static239.aBoolean269 && Class209.method5096() - Static243.aLong178 > 1000L) { + if (Static236.aBoolean256 && !Static239.aBoolean269 && MonotonicClock.method5096() - Static243.aLong178 > 1000L) { @Pc(29) Rectangle local29 = arg0.getClipBounds(); if (local29 == null || local29.width >= Static72.anInt2046 && Static122.anInt3045 <= local29.height) { Static35.aBoolean66 = true; @@ -225,7 +225,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @OriginalMember(owner = "client!rc", name = "b", descriptor = "(Z)V") private void method932() { - @Pc(6) long local6 = Class209.method5096(); + @Pc(6) long local6 = MonotonicClock.method5096(); @Pc(10) long local10 = Static228.aLongArray8[Static261.anInt5741]; Static228.aLongArray8[Static261.anInt5741] = local6; Static261.anInt5741 = Static261.anInt5741 + 1 & 0x1F; @@ -239,7 +239,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @OriginalMember(owner = "client!rc", name = "e", descriptor = "(I)V") private void method933() { - @Pc(2) long local2 = Class209.method5096(); + @Pc(2) long local2 = MonotonicClock.method5096(); @Pc(6) long local6 = Static7.aLongArray2[Static111.anInt2903]; Static7.aLongArray2[Static111.anInt2903] = local2; Static111.anInt2903 = Static111.anInt2903 + 1 & 0x1F; @@ -323,7 +323,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Static260.aClass27_2 = Static131.method2579(Static254.anInt5554, Static48.anInt1448, Static154.aCanvas1); this.method935(); Static200.aClass93_1 = Static70.method1547(); - while (Static72.aLong74 == 0L || Static72.aLong74 > Class209.method5096()) { + while (Static72.aLong74 == 0L || Static72.aLong74 > MonotonicClock.method5096()) { Static227.anInt5097 = Static200.aClass93_1.method3391(Static226.anInt5081, Static11.anInt386); for (local76 = 0; local76 < Static227.anInt5097; local76++) { this.method932(); @@ -355,7 +355,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Override public final void stop() { if (Static230.anApplet_Sub1_1 == this && !Static58.aBoolean101) { - Static72.aLong74 = Class209.method5096() + 4000L; + Static72.aLong74 = MonotonicClock.method5096() + 4000L; } } diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index 362fd89..c35e836 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -179,7 +179,7 @@ public final class Static127 { if (local10 == null) { return null; } - if (local10.method1009() > Class209.method5096()) { + if (local10.method1009() > MonotonicClock.method5096()) { return null; } local10.method4658(); diff --git a/client/src/main/java/Static148.java b/client/src/main/java/Static148.java index 62e8875..35ea98f 100644 --- a/client/src/main/java/Static148.java +++ b/client/src/main/java/Static148.java @@ -55,10 +55,10 @@ public final class Static148 { Static7.anIntArray75[arg0] = arg1; @Pc(21) Class3_Sub10 local21 = (Class3_Sub10) Static199.aClass133_20.method3863((long) arg0); if (local21 == null) { - local21 = new Class3_Sub10(Class209.method5096() + 500L); + local21 = new Class3_Sub10(MonotonicClock.method5096() + 500L); Static199.aClass133_20.method3862(local21, (long) arg0); } else { - local21.aLong55 = Class209.method5096() + 500L; + local21.aLong55 = MonotonicClock.method5096() + 500L; } } diff --git a/client/src/main/java/Static170.java b/client/src/main/java/Static170.java index 1be0608..6454043 100644 --- a/client/src/main/java/Static170.java +++ b/client/src/main/java/Static170.java @@ -93,7 +93,7 @@ public final class Static170 { local20 = new Class3_Sub10(4611686018427387905L); Static199.aClass133_20.method3862(local20, (long) arg1); } else if (local20.aLong55 != 4611686018427387905L) { - local20.aLong55 = Class209.method5096() + 500L | 0x4000000000000000L; + local20.aLong55 = MonotonicClock.method5096() + 500L | 0x4000000000000000L; } } } diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java index 94e1786..c6b5c8c 100644 --- a/client/src/main/java/Static207.java +++ b/client/src/main/java/Static207.java @@ -92,14 +92,14 @@ public final class Static207 { public static int method3684() { try { if (Static82.anInt2231 == 0) { - if (Class209.method5096() - 5000L < Static231.aLong174) { + if (MonotonicClock.method5096() - 5000L < Static231.aLong174) { return 0; } Static72.aClass212_3 = Static71.aClass213_3.method5120(Static143.aString4, Static208.anInt4784); - Static15.aLong18 = Class209.method5096(); + Static15.aLong18 = MonotonicClock.method5096(); Static82.anInt2231 = 1; } - if (Static15.aLong18 + 30000L < Class209.method5096()) { + if (Static15.aLong18 + 30000L < MonotonicClock.method5096()) { return Static10.method347(1000); } @Pc(82) int local82; @@ -178,7 +178,7 @@ public final class Static207 { Static127.anInt3132 = 0; Static82.anInt2231 = 0; Static229.aByteArray70 = null; - Static231.aLong174 = Class209.method5096(); + Static231.aLong174 = MonotonicClock.method5096(); return 0; } else { return Static10.method347(1002); diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java index b7a0224..4051f86 100644 --- a/client/src/main/java/Static230.java +++ b/client/src/main/java/Static230.java @@ -166,7 +166,7 @@ public final class Static230 { if (arg0.method3120() == 0) { local48 = Static34.method882(new Class100[] { local48, Static245.aClass100_1018 }); } else { - local48 = Static34.method882(new Class100[] { local48, Static263.aClass100_1082, Static33.method873(Class209.method5096() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) }); + local48 = Static34.method882(new Class100[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.method5096() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) }); } Static34.method882(new Class100[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(Static71.aClass213_3.anApplet2); } catch (@Pc(124) Throwable local124) { diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java index 7fc2df8..8fc0320 100644 --- a/client/src/main/java/Static38.java +++ b/client/src/main/java/Static38.java @@ -152,7 +152,7 @@ public final class Static38 { @OriginalMember(owner = "client!cn", name = "a", descriptor = "(ZI)I") public static int method963(@OriginalArg(0) boolean arg0) { - @Pc(4) long local4 = Class209.method5096(); + @Pc(4) long local4 = MonotonicClock.method5096(); for (@Pc(28) Class3_Sub10 local28 = arg0 ? (Class3_Sub10) Static199.aClass133_20.method3859() : (Class3_Sub10) Static199.aClass133_20.method3861(); local28 != null; local28 = (Class3_Sub10) Static199.aClass133_20.method3861()) { if ((local28.aLong55 & 0x3FFFFFFFFFFFFFFFL) < local4) { if ((local28.aLong55 & 0x4000000000000000L) != 0L) { diff --git a/client/src/main/java/Static63.java b/client/src/main/java/Static63.java index 02e7439..5432bf7 100644 --- a/client/src/main/java/Static63.java +++ b/client/src/main/java/Static63.java @@ -97,9 +97,9 @@ public final class Static63 { while (true) { local8 = (Class3_Sub21) aClass69_51.method2287(); if (local8 == null) { - if (anInt1945 + anInt1944 + anInt1942 > 100663296 && Class209.method5096() > aLong71 + 60000L) { + if (anInt1945 + anInt1944 + anInt1942 > 100663296 && MonotonicClock.method5096() > aLong71 + 60000L) { System.gc(); - aLong71 = Class209.method5096(); + aLong71 = MonotonicClock.method5096(); } return; } diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 9bddffb..30c1973 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -3636,11 +3636,11 @@ public final class Static88 { } } else if (local226 < 6400) { if (local226 == 6300) { - Static254.anIntArray487[local28++] = (int) (Class209.method5096() / 60000L); + Static254.anIntArray487[local28++] = (int) (MonotonicClock.method5096() / 60000L); continue; } if (local226 == 6301) { - Static254.anIntArray487[local28++] = (int) (Class209.method5096() / 86400000L) - 11745; + Static254.anIntArray487[local28++] = (int) (MonotonicClock.method5096() / 86400000L) - 11745; continue; } if (local226 == 6302) { @@ -3656,7 +3656,7 @@ public final class Static88 { } if (local226 == 6303) { Static102.aCalendar2.clear(); - Static102.aCalendar2.setTime(new Date(Class209.method5096())); + Static102.aCalendar2.setTime(new Date(MonotonicClock.method5096())); Static254.anIntArray487[local28++] = Static102.aCalendar2.get(1); continue; } diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index eb0200a..77ecd10 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -78,7 +78,7 @@ public final class client extends GameShell { if (local15 && Static144.aBoolean173 && Static11.aClass62_1 != null) { Static11.aClass62_1.method3570(); } - if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && (Static35.aBoolean66 || Static97.aLong89 != 0L && Static97.aLong89 < Class209.method5096())) { + if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && (Static35.aBoolean66 || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.method5096())) { Static241.method4540(Static35.aBoolean66, Static144.method2736(), Static114.anInt5831, Static22.anInt729); } @Pc(80) int local80; @@ -101,7 +101,7 @@ public final class client extends GameShell { } if (local80 != Static72.anInt2046 || local84 != Static122.anInt3045) { Static203.method3662(); - Static97.aLong89 = Class209.method5096() + 500L; + Static97.aLong89 = MonotonicClock.method5096() + 500L; } } if (Static69.aFrame2 != null && !Static26.aBoolean59 && (Static244.anInt5370 == 30 || Static244.anInt5370 == 10)) { @@ -595,7 +595,7 @@ public final class client extends GameShell { local194.method2164(530); Static206.aClass95_3.method2830(local194.aByteArray40, 5); Static4.anInt30++; - Static217.aLong165 = Class209.method5096(); + Static217.aLong165 = MonotonicClock.method5096(); } if (Static4.anInt30 == 3) { if (Static244.anInt5370 == 0 || Static244.anInt5370 == 5 || Static206.aClass95_3.method2831() > 0) { @@ -605,7 +605,7 @@ public final class client extends GameShell { return; } Static4.anInt30++; - } else if (Class209.method5096() - Static217.aLong165 > 30000L) { + } else if (MonotonicClock.method5096() - Static217.aLong165 > 30000L) { this.method942(1001); return; } @@ -638,7 +638,7 @@ public final class client extends GameShell { if (Static166.anInt4051 == 0) { @Pc(34) Runtime local34 = Runtime.getRuntime(); local43 = (int) (0L / 1024L); - @Pc(46) long local46 = Class209.method5096(); + @Pc(46) long local46 = MonotonicClock.method5096(); if (Static175.aLong138 == 0L) { Static175.aLong138 = local46; } diff --git a/signlink/src/main/java/Class209.java b/signlink/src/main/java/MonotonicClock.java similarity index 94% rename from signlink/src/main/java/Class209.java rename to signlink/src/main/java/MonotonicClock.java index 4c4a2e9..3f78bcb 100644 --- a/signlink/src/main/java/Class209.java +++ b/signlink/src/main/java/MonotonicClock.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("signlink!ad") -public final class Class209 { +public final class MonotonicClock { @OriginalMember(owner = "signlink!ad", name = "a", descriptor = "J") private static long aLong1312; diff --git a/signlink/src/main/java/SignLink.java b/signlink/src/main/java/SignLink.java index 71a485a..5ec8224 100644 --- a/signlink/src/main/java/SignLink.java +++ b/signlink/src/main/java/SignLink.java @@ -258,7 +258,7 @@ public final class SignLink implements Runnable { @OriginalMember(owner = "signlink!ll", name = "a", descriptor = "(I)V") public final void method5110() { - aLong1314 = Class209.method5096() + 5000L; + aLong1314 = MonotonicClock.method5096() + 5000L; } @OriginalMember(owner = "signlink!ll", name = "a", descriptor = "(Z)Z") @@ -347,7 +347,7 @@ public final class SignLink implements Runnable { try { @Pc(45) int local45 = local16.anInt5924; if (local45 == 1) { - if (aLong1314 > Class209.method5096()) { + if (aLong1314 > MonotonicClock.method5096()) { throw new IOException(); } local16.anObject6 = new Socket(InetAddress.getByName((String) local16.anObject7), local16.anInt5926); @@ -358,7 +358,7 @@ public final class SignLink implements Runnable { local813.setPriority(local16.anInt5926); local16.anObject6 = local813; } else if (local45 == 4) { - if (aLong1314 > Class209.method5096()) { + if (aLong1314 > MonotonicClock.method5096()) { throw new IOException(); } local16.anObject6 = new DataInputStream(((URL) local16.anObject7).openStream()); @@ -379,7 +379,7 @@ public final class SignLink implements Runnable { } else { @Pc(147) String local147; if (local45 == 3) { - if (Class209.method5096() < aLong1314) { + if (MonotonicClock.method5096() < aLong1314) { throw new IOException(); } local147 = (local16.anInt5926 >> 24 & 0xFF) + "." + (local16.anInt5926 >> 16 & 0xFF) + "." + (local16.anInt5926 >> 8 & 0xFF) + "." + (local16.anInt5926 & 0xFF);