diff --git a/client/src/main/java/BufferedSocket.java b/client/src/main/java/BufferedSocket.java index 11ee5f4..44c3f20 100644 --- a/client/src/main/java/BufferedSocket.java +++ b/client/src/main/java/BufferedSocket.java @@ -30,7 +30,7 @@ public final class BufferedSocket implements Runnable { private boolean aBoolean178 = false; @OriginalMember(owner = "client!ma", name = "r", descriptor = "Lsignlink!ll;") - private final Class213 aClass213_5; + private final SignLink aClass213_5; @OriginalMember(owner = "client!ma", name = "k", descriptor = "Ljava/net/Socket;") private final Socket aSocket1; @@ -42,7 +42,7 @@ public final class BufferedSocket implements Runnable { private OutputStream anOutputStream1; @OriginalMember(owner = "client!ma", name = "", descriptor = "(Ljava/net/Socket;Lsignlink!ll;)V") - public BufferedSocket(@OriginalArg(0) Socket arg0, @OriginalArg(1) Class213 arg1) throws IOException { + public BufferedSocket(@OriginalArg(0) Socket arg0, @OriginalArg(1) SignLink arg1) throws IOException { this.aClass213_5 = arg1; this.aSocket1 = arg0; this.aSocket1.setSoTimeout(30000); diff --git a/client/src/main/java/Class19.java b/client/src/main/java/Class19.java index 34b5575..1377b06 100644 --- a/client/src/main/java/Class19.java +++ b/client/src/main/java/Class19.java @@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Class19 implements Runnable { @OriginalMember(owner = "client!cj", name = "m", descriptor = "Lsignlink!ll;") - public Class213 aClass213_1; + public SignLink aClass213_1; @OriginalMember(owner = "client!cj", name = "p", descriptor = "[Lclient!vh;") public final Class62[] aClass62Array1 = new Class62[2]; diff --git a/client/src/main/java/Class62_Sub1.java b/client/src/main/java/Class62_Sub1.java index 54c116e..351bd26 100644 --- a/client/src/main/java/Class62_Sub1.java +++ b/client/src/main/java/Class62_Sub1.java @@ -10,7 +10,7 @@ public final class Class62_Sub1 extends Class62 { private final int anInt2606; @OriginalMember(owner = "client!hl", name = "", descriptor = "(Lsignlink!ll;I)V") - public Class62_Sub1(@OriginalArg(0) Class213 arg0, @OriginalArg(1) int arg1) { + public Class62_Sub1(@OriginalArg(0) SignLink arg0, @OriginalArg(1) int arg1) { Static100.anInterface10_1 = arg0.method5125(); this.anInt2606 = arg1; } diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java index 90a913b..d5dee79 100644 --- a/client/src/main/java/GameShell.java +++ b/client/src/main/java/GameShell.java @@ -23,7 +23,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene private boolean aBoolean71 = false; @OriginalMember(owner = "client!rc", name = "providesignlink", descriptor = "(Lsignlink!ll;)V") - public static void providesignlink(@OriginalArg(0) Class213 arg0) { + public static void providesignlink(@OriginalArg(0) SignLink arg0) { Static71.aClass213_3 = arg0; Static69.aClass213_4 = arg0; } @@ -279,26 +279,26 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Override public final void run() { try { - if (Class213.aString20 != null) { - @Pc(12) String local12 = Class213.aString20.toLowerCase(); + if (SignLink.aString20 != null) { + @Pc(12) String local12 = SignLink.aString20.toLowerCase(); if (local12.indexOf("sun") != -1 || local12.indexOf("apple") != -1) { - @Pc(24) String local24 = Class213.aString14; + @Pc(24) String local24 = SignLink.aString14; if (local24.equals("1.1") || local24.startsWith("1.1.") || local24.equals("1.2") || local24.startsWith("1.2.")) { this.method927("wrongjava"); return; } Static226.anInt5081 = 5; - } else if (local12.indexOf("ibm") != -1 && (Class213.aString14 == null || Class213.aString14.equals("1.4.2"))) { + } else if (local12.indexOf("ibm") != -1 && (SignLink.aString14 == null || SignLink.aString14.equals("1.4.2"))) { this.method927("wrongjava"); return; } } @Pc(76) int local76; - if (Class213.aString14 != null && Class213.aString14.startsWith("1.")) { + if (SignLink.aString14 != null && SignLink.aString14.startsWith("1.")) { local76 = 2; @Pc(78) int local78 = 0; - while (local76 < Class213.aString14.length()) { - @Pc(90) char local90 = Class213.aString14.charAt(local76); + while (local76 < SignLink.aString14.length()) { + @Pc(90) char local90 = SignLink.aString14.charAt(local76); if (local90 < '0' || local90 > '9') { break; } @@ -310,7 +310,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } if (Static71.aClass213_3.anApplet2 != null) { - @Pc(125) Method local125 = Class213.aMethod5; + @Pc(125) Method local125 = SignLink.aMethod5; if (local125 != null) { try { local125.invoke(Static71.aClass213_3.anApplet2, Boolean.TRUE); @@ -381,7 +381,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Static39.aFrame1.toFront(); @Pc(44) Insets local44 = Static39.aFrame1.getInsets(); Static39.aFrame1.setSize(local44.left + Static72.anInt2046 + local44.right, local44.top + Static122.anInt3045 + local44.bottom); - Static69.aClass213_4 = Static71.aClass213_3 = new Class213(null, arg0, arg1, 28); + Static69.aClass213_4 = Static71.aClass213_3 = new SignLink(null, arg0, arg1, 28); @Pc(76) Class212 local76 = Static71.aClass213_3.method5130(1, this); while (local76.anInt5925 == 0) { Static231.method3983(10L); @@ -432,7 +432,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Static40.aBoolean78 = false; } if (Static71.aClass213_3 == null) { - Static69.aClass213_4 = Static71.aClass213_3 = new Class213(this, arg0, null, 0); + Static69.aClass213_4 = Static71.aClass213_3 = new SignLink(this, arg0, null, 0); } @Pc(86) Class212 local86 = Static71.aClass213_3.method5130(1, this); while (local86.anInt5925 == 0) { diff --git a/client/src/main/java/Static107.java b/client/src/main/java/Static107.java index c266ad2..2d69a58 100644 --- a/client/src/main/java/Static107.java +++ b/client/src/main/java/Static107.java @@ -43,7 +43,7 @@ public final class Static107 { } @OriginalMember(owner = "client!id", name = "a", descriptor = "(ILsignlink!ll;Ljava/awt/Component;II)Lclient!vh;") - public static Class62 method2262(@OriginalArg(0) int arg0, @OriginalArg(1) Class213 arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) { + public static Class62 method2262(@OriginalArg(0) int arg0, @OriginalArg(1) SignLink arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) { if (Static44.anInt1404 == 0) { throw new IllegalStateException(); } diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java index f71c2eb..9eb6bb3 100644 --- a/client/src/main/java/Static140.java +++ b/client/src/main/java/Static140.java @@ -89,7 +89,7 @@ public final class Static140 { } @OriginalMember(owner = "client!la", name = "a", descriptor = "(Lsignlink!ll;Ljava/lang/Object;I)V") - public static void method2708(@OriginalArg(0) Class213 arg0, @OriginalArg(1) Object arg1) { + public static void method2708(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Object arg1) { if (arg0.anEventQueue1 == null) { return; } diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index 2c2e1fc..4ac8e58 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -132,7 +132,7 @@ public final class Static156 { @OriginalMember(owner = "client!mf", name = "e", descriptor = "(I)V") public static void method2958() { - if (Class213.aString20.toLowerCase().indexOf("microsoft") != -1) { + if (SignLink.aString20.toLowerCase().indexOf("microsoft") != -1) { Static196.anIntArray407[187] = 27; Static196.anIntArray407[223] = 28; Static196.anIntArray407[221] = 43; @@ -147,7 +147,7 @@ public final class Static156 { Static196.anIntArray407[189] = 26; return; } - if (Class213.aMethod6 == null) { + if (SignLink.aMethod6 == null) { Static196.anIntArray407[192] = 58; Static196.anIntArray407[222] = 59; } else { diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java index 6bd0091..3c441f5 100644 --- a/client/src/main/java/Static169.java +++ b/client/src/main/java/Static169.java @@ -46,7 +46,7 @@ public final class Static169 { } @OriginalMember(owner = "client!nf", name = "a", descriptor = "(IIIIILsignlink!ll;)Ljava/awt/Frame;") - public static Frame method3176(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1, @OriginalArg(4) int arg2, @OriginalArg(5) Class213 arg3) { + public static Frame method3176(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1, @OriginalArg(4) int arg2, @OriginalArg(5) SignLink arg3) { if (!arg3.method5111()) { return null; } diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java index 56012af..292ea29 100644 --- a/client/src/main/java/Static176.java +++ b/client/src/main/java/Static176.java @@ -34,7 +34,7 @@ public final class Static176 { @Pc(3) Class10_Sub1 local3 = Static54.method1310(arg0); if (local3 == null) { return false; - } else if (Class213.anInt5928 == 1 || Class213.anInt5928 == 2 || Static83.anInt370 == 2) { + } else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || Static83.anInt370 == 2) { @Pc(31) byte[] local31 = local3.aClass100_71.method3148(); Static60.aString1 = new String(local31, 0, local31.length); Static125.anInt3103 = local3.anInt382; diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index f4f9fa3..686cdda 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -119,7 +119,7 @@ public final class Static19 { @OriginalMember(owner = "client!bi", name = "a", descriptor = "(BLjava/awt/Component;)V") public static void method591(@OriginalArg(1) Component arg0) { - @Pc(10) Method local10 = Class213.aMethod6; + @Pc(10) Method local10 = SignLink.aMethod6; if (local10 != null) { try { local10.invoke(arg0, Boolean.FALSE); diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java index 928702e..571062a 100644 --- a/client/src/main/java/Static197.java +++ b/client/src/main/java/Static197.java @@ -26,7 +26,7 @@ public final class Static197 { public static Class100 aClass100_873 = aClass100_874; @OriginalMember(owner = "client!pm", name = "a", descriptor = "(ILsignlink!ll;)[Lclient!od;") - public static Class114[] method3558(@OriginalArg(1) Class213 arg0) { + public static Class114[] method3558(@OriginalArg(1) SignLink arg0) { if (!arg0.method5111()) { return new Class114[0]; } diff --git a/client/src/main/java/Static202.java b/client/src/main/java/Static202.java index 0a5a0fa..e1239a3 100644 --- a/client/src/main/java/Static202.java +++ b/client/src/main/java/Static202.java @@ -29,7 +29,7 @@ public final class Static202 { } @OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V") - public static void method3654(@OriginalArg(0) Class213 arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) { + public static void method3654(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) { @Pc(17) Class3_Sub11 local17 = new Class3_Sub11(); local17.anInt1725 = arg1.method2229(); local17.anInt1732 = arg1.method2174(); diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java index 83ccca4..fc49933 100644 --- a/client/src/main/java/Static203.java +++ b/client/src/main/java/Static203.java @@ -70,7 +70,7 @@ public final class Static203 { } @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Lsignlink!ll;B)V") - public static void method3663(@OriginalArg(0) Class213 arg0) { + public static void method3663(@OriginalArg(0) SignLink arg0) { @Pc(11) Class214 local11 = null; try { @Pc(16) Class212 local16 = arg0.method5112("runescape"); diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java index ac62aea..0aee00a 100644 --- a/client/src/main/java/Static25.java +++ b/client/src/main/java/Static25.java @@ -39,7 +39,7 @@ public final class Static25 { } @OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V") - public static void method714(@OriginalArg(0) Frame arg0, @OriginalArg(2) Class213 arg1) { + public static void method714(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) { while (true) { @Pc(16) Class212 local16 = arg1.method5115(arg0); while (local16.anInt5925 == 0) { diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index e758772..a8f587d 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -1042,7 +1042,7 @@ public final class Static4 { @Pc(3848) byte[] local3848 = new byte[Static223.anInt5028]; Static57.aClass3_Sub15_Sub1_3.method2237(local3848, Static223.anInt5028); local156 = Static10.method346(local3848, Static223.anInt5028, 0); - if (Static39.aFrame1 == null && (Class213.anInt5928 == 3 || !Class213.aString15.startsWith("win") || Static178.aBoolean203)) { + if (Static39.aFrame1 == null && (SignLink.anInt5928 == 3 || !SignLink.aString15.startsWith("win") || Static178.aBoolean203)) { Static169.method3175(local156, true); } else { Static175.aClass100_797 = local156; diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java index d23178c..70d715f 100644 --- a/client/src/main/java/Static69.java +++ b/client/src/main/java/Static69.java @@ -9,7 +9,7 @@ public final class Static69 { public static Frame aFrame2; @OriginalMember(owner = "client!fh", name = "cb", descriptor = "Lsignlink!ll;") - public static Class213 aClass213_4; + public static SignLink aClass213_4; @OriginalMember(owner = "client!fh", name = "P", descriptor = "Z") public static volatile boolean aBoolean115 = true; diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index 28ff792..227237c 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -11,7 +11,7 @@ public final class Static71 { public static int[][] anIntArrayArray10; @OriginalMember(owner = "client!fk", name = "l", descriptor = "Lsignlink!ll;") - public static Class213 aClass213_3; + public static SignLink aClass213_3; @OriginalMember(owner = "client!fk", name = "q", descriptor = "Lclient!uc;") public static Class111 aClass111_2; diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java index 6c2ab9e..a7bd2e7 100644 --- a/client/src/main/java/Static80.java +++ b/client/src/main/java/Static80.java @@ -35,7 +35,7 @@ public final class Static80 { } @OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lsignlink!ll;I)V") - public static void method3615(@OriginalArg(0) Class213 arg0) { + public static void method3615(@OriginalArg(0) SignLink arg0) { Static113.anInt4609 = 3; Static53.method1293(true); aBoolean231 = true; diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index a3cdeeb..9bddffb 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -2979,7 +2979,7 @@ public final class Static88 { continue; } if (local226 == 5420) { - Static254.anIntArray487[local28++] = Class213.anInt5928 == 3 ? 1 : 0; + Static254.anIntArray487[local28++] = SignLink.anInt5928 == 3 ? 1 : 0; continue; } if (local226 == 5421) { @@ -2991,7 +2991,7 @@ public final class Static88 { local26--; local609 = Static3.aClass100Array176[local26]; @Pc(8356) Class100 local8356 = Static34.method882(new Class100[] { Static15.method479(), local609 }); - if (Static39.aFrame1 != null || local1552 && Class213.anInt5928 != 3 && Class213.aString15.startsWith("win") && !Static178.aBoolean203) { + if (Static39.aFrame1 != null || local1552 && SignLink.anInt5928 != 3 && SignLink.aString15.startsWith("win") && !Static178.aBoolean203) { Static164.aBoolean194 = local1552; Static175.aClass100_797 = local8356; Static33.aClass212_1 = Static71.aClass213_3.method5131(new String(local8356.method3148(), "ISO-8859-1")); diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java index 9ea4cea..3923e83 100644 --- a/client/src/main/java/Static89.java +++ b/client/src/main/java/Static89.java @@ -130,7 +130,7 @@ public final class Static89 { if (Static69.aClass213_4.anApplet2 == null) { return; } - @Pc(109) Class212 local109 = Static69.aClass213_4.method5118(new URL(Static69.aClass213_4.anApplet2.getCodeBase(), "clienterror.ws?c=" + Static131.anInt3252 + "&u=" + Static101.aLong98 + "&v1=" + Class213.aString20 + "&v2=" + Class213.aString14 + "&e=" + local13)); + @Pc(109) Class212 local109 = Static69.aClass213_4.method5118(new URL(Static69.aClass213_4.anApplet2.getCodeBase(), "clienterror.ws?c=" + Static131.anInt3252 + "&u=" + Static101.aLong98 + "&v1=" + SignLink.aString20 + "&v2=" + SignLink.aString14 + "&e=" + local13)); while (local109.anInt5925 == 0) { Static231.method3983(1L); } diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 09f7238..eb0200a 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -360,7 +360,7 @@ public final class client extends GameShell { Static208.anInt4784 = Static249.anInt5428; Static259.aShortArray88 = Static62.aShortArray19 = Static232.aShortArray74 = Static259.aShortArray87 = new short[256]; Static209.anInt4794 = Static208.anInt4784; - if (Class213.anInt5928 == 3 && Static83.anInt370 != 2) { + if (SignLink.anInt5928 == 3 && Static83.anInt370 != 2) { Static125.anInt3103 = Static187.anInt4413; } Static156.method2958(); @@ -370,7 +370,7 @@ public final class client extends GameShell { if (Static71.aClass111_2 != null) { Static71.aClass111_2.method3293(Static154.aCanvas1); } - Static7.anInt986 = Class213.anInt5928; + Static7.anInt986 = SignLink.anInt5928; try { if (Static71.aClass213_3.aClass214_2 != null) { Static172.aClass38_4 = new Class38(Static71.aClass213_3.aClass214_2, 5200, 0); diff --git a/signlink/src/main/java/Class213.java b/signlink/src/main/java/SignLink.java similarity index 99% rename from signlink/src/main/java/Class213.java rename to signlink/src/main/java/SignLink.java index fa4aba9..c9c97db 100644 --- a/signlink/src/main/java/Class213.java +++ b/signlink/src/main/java/SignLink.java @@ -21,7 +21,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("signlink!ll") -public final class Class213 implements Runnable { +public final class SignLink implements Runnable { @OriginalMember(owner = "signlink!ll", name = "o", descriptor = "Ljava/lang/String;") public static String aString14; @@ -166,7 +166,7 @@ public final class Class213 implements Runnable { } @OriginalMember(owner = "signlink!ll", name = "", descriptor = "(Ljava/applet/Applet;ILjava/lang/String;I)V") - public Class213(@OriginalArg(0) Applet arg0, @OriginalArg(1) int arg1, @OriginalArg(2) String arg2, @OriginalArg(3) int arg3) throws Exception { + public SignLink(@OriginalArg(0) Applet arg0, @OriginalArg(1) int arg1, @OriginalArg(2) String arg2, @OriginalArg(3) int arg3) throws Exception { aString14 = "1.1"; this.aString19 = arg2; this.anInt5929 = arg1;