Merge pull request #2745 from Lucwousin/deob-annot

Deob/asm: Improve cfg deob, reproducible jars, smart annotations
2020-08-01 19:23:04 -04:00
parent 5a017ccc89 57b7476299
commit c460b046dc
396 changed files with 3392 additions and 4343 deletions
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -16,7 +16,7 @@ import netscape.javascript.JSObject;
 public final class Client extends GameShell implements Usernamed {
 	@ObfuscatedName("na")
 	@ObfuscatedSignature(
-		signature = "Lhd;"
+		descriptor = "Lhd;"
 	)
 	@Export("clickedWidget")
 	static Widget clickedWidget;
@@ -86,13 +86,13 @@ public final class Client extends GameShell implements Usernamed {
 	static int field852;
 	@ObfuscatedName("ng")
 	@ObfuscatedSignature(
-		signature = "Lhd;"
+		descriptor = "Lhd;"
 	)
 	@Export("clickedWidgetParent")
 	static Widget clickedWidgetParent;
 	@ObfuscatedName("oi")
 	@ObfuscatedSignature(
-		signature = "Lle;"
+		descriptor = "Lle;"
 	)
 	@Export("widgetFlags")
 	static NodeHashTable widgetFlags;
@@ -103,7 +103,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int field853;
 	@ObfuscatedName("nk")
 	@ObfuscatedSignature(
-		signature = "Lhd;"
+		descriptor = "Lhd;"
 	)
 	@Export("viewportWidget")
 	static Widget viewportWidget;
@@ -137,7 +137,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int field855;
 	@ObfuscatedName("tt")
 	@ObfuscatedSignature(
-		signature = "Lbs;"
+		descriptor = "Lbs;"
 	)
 	static final ApproximateRouteStrategy field905;
 	@ObfuscatedName("nv")
@@ -150,7 +150,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int[] rootWidgetYs;
 	@ObfuscatedName("ow")
 	@ObfuscatedSignature(
-		signature = "Ljp;"
+		descriptor = "Ljp;"
 	)
 	@Export("scriptEvents")
 	static NodeDeque scriptEvents;
@@ -219,7 +219,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int field870;
 	@ObfuscatedName("ni")
 	@ObfuscatedSignature(
-		signature = "Lhd;"
+		descriptor = "Lhd;"
 	)
 	@Export("draggedOnWidget")
 	static Widget draggedOnWidget;
@@ -235,7 +235,7 @@ public final class Client extends GameShell implements Usernamed {
 	static ArrayList archiveLoaders;
 	@ObfuscatedName("sk")
 	@ObfuscatedSignature(
-		signature = "Lhv;"
+		descriptor = "Lhv;"
 	)
 	@Export("playerAppearance")
 	static PlayerAppearance playerAppearance;
@@ -283,7 +283,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int destinationX;
 	@ObfuscatedName("sd")
 	@ObfuscatedSignature(
-		signature = "[Ld;"
+		descriptor = "[Ld;"
 	)
 	@Export("grandExchangeOffers")
 	static GrandExchangeOffer[] grandExchangeOffers;
@@ -309,7 +309,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int[] changedItemContainers;
 	@ObfuscatedName("sf")
 	@ObfuscatedSignature(
-		signature = "Lmk;"
+		descriptor = "Lmk;"
 	)
 	@Export("platformInfoProvider")
 	static PlatformInfoProvider platformInfoProvider;
@@ -320,7 +320,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int field878;
 	@ObfuscatedName("mq")
 	@ObfuscatedSignature(
-		signature = "Lhd;"
+		descriptor = "Lhd;"
 	)
 	@Export("meslayerContinueWidget")
 	static Widget meslayerContinueWidget;
@@ -376,7 +376,7 @@ public final class Client extends GameShell implements Usernamed {
 	static short field685;
 	@ObfuscatedName("qm")
 	@ObfuscatedSignature(
-		signature = "[Ldr;"
+		descriptor = "[Ldr;"
 	)
 	@Export("soundEffects")
 	static SoundEffect[] soundEffects;
@@ -433,7 +433,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int viewportOffsetX;
 	@ObfuscatedName("pw")
 	@ObfuscatedSignature(
-		signature = "[Llz;"
+		descriptor = "[Llz;"
 	)
 	@Export("mapIcons")
 	static Sprite[] mapIcons;
@@ -486,12 +486,12 @@ public final class Client extends GameShell implements Usernamed {
 	static boolean playerMod;
 	@ObfuscatedName("oj")
 	@ObfuscatedSignature(
-		signature = "Ljp;"
+		descriptor = "Ljp;"
 	)
 	static NodeDeque field891;
 	@ObfuscatedName("ot")
 	@ObfuscatedSignature(
-		signature = "Ljp;"
+		descriptor = "Ljp;"
 	)
 	static NodeDeque field691;
 	@ObfuscatedName("or")
@@ -515,13 +515,13 @@ public final class Client extends GameShell implements Usernamed {
 	static String field755;
 	@ObfuscatedName("sx")
 	@ObfuscatedSignature(
-		signature = "Lbj;"
+		descriptor = "Lbj;"
 	)
 	@Export("GrandExchangeEvents_worldComparator")
 	static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator;
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "[Lfz;"
+		descriptor = "[Lfz;"
 	)
 	@Export("collisionMaps")
 	static CollisionMap[] collisionMaps;
@@ -660,13 +660,13 @@ public final class Client extends GameShell implements Usernamed {
 	static int hintArrowSubY;
 	@ObfuscatedName("dm")
 	@ObfuscatedSignature(
-		signature = "Lco;"
+		descriptor = "Lco;"
 	)
 	@Export("playerAttackOption")
 	static AttackOption playerAttackOption;
 	@ObfuscatedName("dd")
 	@ObfuscatedSignature(
-		signature = "Lco;"
+		descriptor = "Lco;"
 	)
 	@Export("npcAttackOption")
 	static AttackOption npcAttackOption;
@@ -678,7 +678,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int titleLoadingStage;
 	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
-		signature = "Lfa;"
+		descriptor = "Lfa;"
 	)
 	@Export("js5SocketTask")
 	static Task js5SocketTask;
@@ -722,7 +722,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int field675;
 	@ObfuscatedName("er")
 	@ObfuscatedSignature(
-		signature = "Lfg;"
+		descriptor = "Lfg;"
 	)
 	static class169 field708;
 	@ObfuscatedName("el")
@@ -736,7 +736,7 @@ public final class Client extends GameShell implements Usernamed {
 	static boolean Login_isUsernameRemembered;
 	@ObfuscatedName("ev")
 	@ObfuscatedSignature(
-		signature = "Lct;"
+		descriptor = "Lct;"
 	)
 	@Export("secureRandomFuture")
 	static SecureRandomFuture secureRandomFuture;
@@ -745,7 +745,7 @@ public final class Client extends GameShell implements Usernamed {
 	static byte[] randomDatData;
 	@ObfuscatedName("fc")
 	@ObfuscatedSignature(
-		signature = "[Lcv;"
+		descriptor = "[Lcv;"
 	)
 	@Export("npcs")
 	static NPC[] npcs;
@@ -767,7 +767,7 @@ public final class Client extends GameShell implements Usernamed {
 	static int[] field719;
 	@ObfuscatedName("fn")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		descriptor = "Ldx;"
 	)
 	@Export("packetWriter")
 	public static final PacketWriter packetWriter;
@@ -784,7 +784,7 @@ public final class Client extends GameShell implements Usernamed {
 	static boolean useBufferedSocket;
 	@ObfuscatedName("fs")
 	@ObfuscatedSignature(
-		signature = "Ljy;"
+		descriptor = "Ljy;"
 	)
 	@Export("timer")
 	static Timer timer;
@@ -1090,7 +1090,7 @@ public final class Client extends GameShell implements Usernamed {
 	static boolean showLoadingMessages;
 	@ObfuscatedName("ku")
 	@ObfuscatedSignature(
-		signature = "[Lby;"
+		descriptor = "[Lby;"
 	)
 	@Export("players")
 	static Player[] players;
@@ -1141,25 +1141,25 @@ public final class Client extends GameShell implements Usernamed {
 	static int combatTargetPlayerIndex;
 	@ObfuscatedName("ka")
 	@ObfuscatedSignature(
-		signature = "[[[Ljp;"
+		descriptor = "[[[Ljp;"
 	)
 	@Export("groundItems")
 	static NodeDeque[][][] groundItems;
 	@ObfuscatedName("kg")
 	@ObfuscatedSignature(
-		signature = "Ljp;"
+		descriptor = "Ljp;"
 	)
 	@Export("pendingSpawns")
 	static NodeDeque pendingSpawns;
 	@ObfuscatedName("ky")
 	@ObfuscatedSignature(
-		signature = "Ljp;"
+		descriptor = "Ljp;"
 	)
 	@Export("projectiles")
 	static NodeDeque projectiles;
 	@ObfuscatedName("kb")
 	@ObfuscatedSignature(
-		signature = "Ljp;"
+		descriptor = "Ljp;"
 	)
 	@Export("graphicsObjects")
 	static NodeDeque graphicsObjects;
@@ -1276,18 +1276,18 @@ public final class Client extends GameShell implements Usernamed {
 	static int rootInterface;
 	@ObfuscatedName("md")
 	@ObfuscatedSignature(
-		signature = "Lle;"
+		descriptor = "Lle;"
 	)
 	@Export("interfaceParents")
 	static NodeHashTable interfaceParents;
 	@ObfuscatedName("ec")
 	@ObfuscatedSignature(
-		signature = "Lkn;"
+		descriptor = "Lkn;"
 	)
 	Buffer field929;
 	@ObfuscatedName("ee")
 	@ObfuscatedSignature(
-		signature = "Lz;"
+		descriptor = "Lz;"
 	)
 	class9 field851;

@@ -1570,7 +1570,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "1805213007"
 	)
 	@Export("resizeGame")
@@ -1585,7 +1585,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "108465933"
 	)
 	@Export("setUp")
@@ -1642,7 +1642,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "202919973"
 	)
 	@Export("doCycle")
@@ -1741,7 +1741,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		signature = "(ZS)V",
+		descriptor = "(ZS)V",
 		garbageValue = "255"
 	)
 	@Export("draw")
@@ -1856,7 +1856,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "1432958229"
 	)
 	@Export("kill0")
@@ -1894,7 +1894,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "-453140820"
 	)
 	protected final void vmethod1570() {
@@ -2010,7 +2010,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("eg")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		descriptor = "(B)V",
 		garbageValue = "-61"
 	)
 	@Export("doCycleJs5")
@@ -2241,7 +2241,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ey")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		descriptor = "(B)V",
 		garbageValue = "20"
 	)
 	@Export("doCycleJs5Connect")
@@ -2383,7 +2383,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ew")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		descriptor = "(IB)V",
 		garbageValue = "35"
 	)
 	@Export("js5Error")
@@ -2421,7 +2421,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ee")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "599725078"
 	)
 	@Export("doCycleLoggedOut")
@@ -3064,7 +3064,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ft")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "-873982601"
 	)
 	@Export("doCycleLoggedIn")
@@ -3852,7 +3852,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("fl")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "1501968527"
 	)
 	@Export("resizeJS")
@@ -3880,7 +3880,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("fb")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "1953660969"
 	)
 	@Export("drawLoggedIn")
@@ -3973,7 +3973,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("gt")
 	@ObfuscatedSignature(
-		signature = "(Ldx;B)Z",
+		descriptor = "(Ldx;B)Z",
 		garbageValue = "-15"
 	)
 	final boolean method1768(PacketWriter var1) {
@@ -5347,7 +5347,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("hr")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "-302072154"
 	)
 	@Export("menu")
@@ -5494,7 +5494,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("hh")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		descriptor = "(I)Z",
 		garbageValue = "-1243315480"
 	)
 	@Export("shouldLeftClickOpenMenu")
@@ -5505,7 +5505,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ht")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		descriptor = "(IIB)V",
 		garbageValue = "4"
 	)
 	@Export("openMenu")
@@ -5517,7 +5517,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ip")
 	@ObfuscatedSignature(
-		signature = "(ZI)V",
+		descriptor = "(ZI)V",
 		garbageValue = "-558702165"
 	)
 	@Export("resizeRoot")
@@ -5533,7 +5533,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("ig")
 	@ObfuscatedSignature(
-		signature = "(Lhd;I)V",
+		descriptor = "(Lhd;I)V",
 		garbageValue = "-985582804"
 	)
 	@Export("alignWidget")
@@ -5555,7 +5555,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("jz")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		descriptor = "(I)V",
 		garbageValue = "1745197570"
 	)
 	final void method1372() {
@@ -5642,7 +5642,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("kr")
 	@ObfuscatedSignature(
-		signature = "(B)Lkq;",
+		descriptor = "(B)Lkq;",
 		garbageValue = "-76"
 	)
 	@Export("username")
@@ -5652,7 +5652,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(II)Lih;",
+		descriptor = "(II)Lih;",
 		garbageValue = "1222368622"
 	)
 	@Export("WorldMapElement_get")
@@ -5662,7 +5662,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Ljava/io/File;Ljava/io/File;I)V",
+		descriptor = "(Ljava/io/File;Ljava/io/File;I)V",
 		garbageValue = "1015952997"
 	)
 	static void method1803(File var0, File var1) {
@@ -5686,7 +5686,7 @@ public final class Client extends GameShell implements Usernamed {

 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lbn;B)V",
+		descriptor = "(Lbn;B)V",
 		garbageValue = "2"
 	)
 	static void method1522(GameShell var0) {