From 70e0d6cc342621c4f8062a0cc1a70d33aad926e5 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 00:52:37 +0200 Subject: [PATCH] Refactor --- .../transformers/ScriptOpcodesTransformer.java | 2 +- runescape-client/src/main/java/Actor.java | 2 +- .../src/main/java/BoundaryObject.java | 4 ++-- runescape-client/src/main/java/Client.java | 10 +++++----- .../src/main/java/FriendSystem.java | 18 +++++++++--------- .../src/main/java/LoginScreenAnimation.java | 2 +- .../src/main/java/WorldMapAreaData.java | 3 ++- .../src/main/java/WorldMapCacheName.java | 3 ++- .../src/main/java/WorldMapIcon1.java | 3 ++- .../src/main/java/WorldMapSection2.java | 2 +- runescape-client/src/main/java/class206.java | 4 +++- runescape-client/src/main/java/class21.java | 10 +++++----- runescape-client/src/main/java/class22.java | 2 +- runescape-client/src/main/java/class234.java | 4 +++- runescape-client/src/main/java/class4.java | 10 +++++----- runescape-client/src/main/java/class54.java | 14 +++++++------- 16 files changed, 50 insertions(+), 43 deletions(-) diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java index aa422f83bd..3c6bb67a7c 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java @@ -61,7 +61,7 @@ public class ScriptOpcodesTransformer implements Transformer // robots in disgui ListIterator it = ins.getInstructions().listIterator(); Instruction i; - while(it.hasNext()) + while (it.hasNext()) { i = it.next(); diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 8c6154c075..e720a2944f 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -1291,7 +1291,7 @@ public abstract class Actor extends Entity { if (var2 == 1005) { var13 = Huffman.getWidget(var1); if (var13 != null && var13.itemQuantities[var0] >= 100000) { - WorldMapIcon1.method219(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); + WorldMapIcon1.addGameMessage(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); } else { var9 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortLE(var3); diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index f648c7a322..4d5e10af84 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -83,9 +83,9 @@ public final class BoundaryObject { ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden; WorldMapSection0.savePreferences(); if (ReflectionCheck.clientPreferences.roofsHidden) { - WorldMapIcon1.method219(99, "", "Roofs are now all hidden"); + WorldMapIcon1.addGameMessage(99, "", "Roofs are now all hidden"); } else { - WorldMapIcon1.method219(99, "", "Roofs will only be removed selectively"); + WorldMapIcon1.addGameMessage(99, "", "Roofs will only be removed selectively"); } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 1b4b6b2170..9410707adf 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -4967,7 +4967,7 @@ public final class Client extends GameShell implements Usernamed { String var41 = var3.readStringCp1252NullTerminated(); if (!var18) { - WorldMapIcon1.method219(var37, var17, var41); + WorldMapIcon1.addGameMessage(var37, var17, var41); } var1.serverPacket0 = null; @@ -5562,7 +5562,7 @@ public final class Client extends GameShell implements Usernamed { var3.method237(var54, 0, var54.length); Buffer var52 = new Buffer(var54); var17 = var52.readStringCp1252NullTerminated(); - WorldMapCacheName.method635(var17, true, false); + WorldMapCacheName.openURL(var17, true, false); var1.serverPacket0 = null; return true; } @@ -5793,9 +5793,9 @@ public final class Client extends GameShell implements Usernamed { } if (var29.modIcon != -1) { - WorldMapIcon1.method219(var34, ItemContainer.method1170(var29.modIcon) + var21, var57); + WorldMapIcon1.addGameMessage(var34, ItemContainer.method1170(var29.modIcon) + var21, var57); } else { - WorldMapIcon1.method219(var34, var21, var57); + WorldMapIcon1.addGameMessage(var34, var21, var57); } } @@ -5823,7 +5823,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field827 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); var4 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); - WorldMapIcon1.method219(6, var21, var4); + WorldMapIcon1.addGameMessage(6, var21, var4); var1.serverPacket0 = null; return true; } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 010faa6967..df20c9fc66 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -80,11 +80,11 @@ public class FriendSystem { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { if ((long)var1.time < class203.currentTimeMs() / 1000L - 5L) { if (var1.world > 0) { - WorldMapIcon1.method219(5, "", var1.username + " has logged in."); + WorldMapIcon1.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - WorldMapIcon1.method219(5, "", var1.username + " has logged out."); + WorldMapIcon1.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -140,25 +140,25 @@ public class FriendSystem { if (this.canAddFriend()) { var3 = null; var4 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (Canvas.localPlayer.username.equals(var2)) { var3 = null; var4 = "You can't add yourself to your own friend list"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { Object var5; if (this.isFriended(var2, false)) { var3 = (new StringBuilder()).append(var1); var5 = null; var4 = var3.append(" is already on your friend list").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (this.isIgnored(var2)) { var3 = new StringBuilder(); var5 = null; var3 = var3.append("Please remove ").append(var1); var5 = null; var4 = var3.append(" from your ignore list first").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { PacketBufferNode var6 = Interpreter.method1915(ClientPacket.field310, Client.packetWriter.isaacCipher); var6.packetBuffer.writeByte(WorldMapRegion.method550(var1)); @@ -196,11 +196,11 @@ public class FriendSystem { if (this.canAddIgnore()) { var3 = null; var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (Canvas.localPlayer.username.equals(var2)) { var3 = null; var4 = "You can't add yourself to your own ignore list"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (this.isIgnored(var2)) { class22.method294(var1); } else { @@ -211,7 +211,7 @@ public class FriendSystem { var3 = var3.append("Please remove ").append(var1); var5 = null; var4 = var3.append(" from your friend list first").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { var5 = Interpreter.method1915(ClientPacket.field312, Client.packetWriter.isaacCipher); var5.packetBuffer.writeByte(WorldMapRegion.method550(var1)); diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 6d73e2b166..5d8be7021f 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -587,7 +587,7 @@ public class LoginScreenAnimation { var19 = new String(var9.array, 0, var9.index); if (class83.method2026(var19)) { - WorldMapCacheName.method635(var19, true, false); + WorldMapCacheName.openURL(var19, true, false); return 2; } else { return 5; diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 64fff82dd1..9727a79f03 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -286,7 +286,8 @@ public class WorldMapAreaData extends WorldMapArea { signature = "(ZI)V", garbageValue = "-1746120861" ) - static void method705(boolean var0) { + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { Client.tapToDrop = var0; } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 5f0a3c4402..207c70cdd6 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -80,7 +80,8 @@ public class WorldMapCacheName { signature = "(Ljava/lang/String;ZZI)V", garbageValue = "1532180466" ) - public static void method635(String var0, boolean var1, boolean var2) { + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { if (var1) { if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { try { diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index e4b4df12a8..b1fbbf21e1 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -110,7 +110,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(ILjava/lang/String;Ljava/lang/String;I)V", garbageValue = "-460290173" ) - static void method219(int var0, String var1, String var2) { + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { GrandExchangeEvents.addChatMessage(var0, var1, var2, (String)null); } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 7be549d5f2..077d62036f 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -307,7 +307,7 @@ public class WorldMapSection2 implements WorldMapSection { } if (!var4) { - WorldMapIcon1.method219(4, "", "Unable to find " + var1); + WorldMapIcon1.addGameMessage(4, "", "Unable to find " + var1); } } diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java index 05ab4835f3..b30272a9cb 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class206.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +9,8 @@ public class class206 { signature = "(I)Z", garbageValue = "-1763054678" ) - static boolean method4028() { + @Export("getTapToDrop") + static boolean getTapToDrop() { return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 94984cac3c..41f00afe5f 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -327,9 +327,9 @@ public abstract class class21 { var3.overheadText = var0.readStringCp1252NullTerminated(); if (var3.overheadText.charAt(0) == '~') { var3.overheadText = var3.overheadText.substring(1); - WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText); + WorldMapIcon1.addGameMessage(2, var3.username.getName(), var3.overheadText); } else if (var3 == Canvas.localPlayer) { - WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText); + WorldMapIcon1.addGameMessage(2, var3.username.getName(), var3.overheadText); } var3.isAutoChatting = false; @@ -396,9 +396,9 @@ public abstract class class21 { } if (var17.modIcon != -1) { - WorldMapIcon1.method219(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14); + WorldMapIcon1.addGameMessage(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14); } else { - WorldMapIcon1.method219(var10, var3.username.getName(), var14); + WorldMapIcon1.addGameMessage(var10, var3.username.getName(), var14); } } } @@ -419,7 +419,7 @@ public abstract class class21 { } var7 = var0.readUnsignedByte(); - class234.method4534(var3, var6, var7); + class234.performPlayerAnimation(var3, var6, var7); } if (var3.field725) { diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index ca51d2e204..d721431b4d 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -73,7 +73,7 @@ public final class class22 { StringBuilder var1 = (new StringBuilder()).append(var0); Object var2 = null; String var3 = var1.append(" is already on your ignore list").toString(); - WorldMapIcon1.method219(30, "", var3); + WorldMapIcon1.addGameMessage(30, "", var3); } @ObfuscatedName("fw") diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index 2a129de9d2..d065094361 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +9,8 @@ public class class234 { signature = "(Lbr;III)V", garbageValue = "-701527010" ) - static void method4534(Player var0, int var1, int var2) { + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { if (var0.sequence == var1 && var1 != -1) { int var3 = WorldMapAreaData.getSequenceDefinition(var1).field783; if (var3 == 1) { diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 11a1a4bf22..7543a42e7a 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -64,11 +64,11 @@ final class class4 implements class0 { String var3; if (var0 == ScriptOpcodes.MES) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapIcon1.method219(0, "", var3); + WorldMapIcon1.addGameMessage(0, "", var3); return 1; } else if (var0 == ScriptOpcodes.ANIM) { RouteStrategy.Interpreter_intStackSize -= 2; - class234.method4534(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + class234.performPlayerAnimation(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); return 1; } else if (var0 == ScriptOpcodes.IF_CLOSE) { if (!Interpreter.field424) { @@ -142,7 +142,7 @@ final class class4 implements class0 { if (var0 == ScriptOpcodes.OPENURL) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapCacheName.method635(var3, var8, false); + WorldMapCacheName.openURL(var3, var8, false); return 1; } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -219,10 +219,10 @@ final class class4 implements class0 { Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); + WorldMapAreaData.setTapToDrop(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); return 1; } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028() ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.getTapToDrop() ? 1 : 0; return 1; } else if (var0 == 3129) { RouteStrategy.Interpreter_intStackSize -= 2; diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index c295c9c36d..f0e810fb17 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -115,7 +115,7 @@ public final class class54 { var18 = Varps.loginBoxCenter - 80; var19 = 291; if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); } var18 = Varps.loginBoxCenter + 80; @@ -182,7 +182,7 @@ public final class class54 { Login.loginIndex = 5; return; case 2: - WorldMapCacheName.method635("https://support.runescape.com/hc/en-gb", true, false); + WorldMapCacheName.openURL("https://support.runescape.com/hc/en-gb", true, false); } } } @@ -348,7 +348,7 @@ public final class class54 { } if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 34 && var2 <= Login.loginBoxX + 34 + 180 && var17 >= 351 && var17 <= 363) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); } var20 = Login.loginBoxX + 180 + 80; @@ -418,7 +418,7 @@ public final class class54 { if (UrlRequester.field930 != null) { var13 = UrlRequester.field930.field43 / 2; if (var1 == 1 && var2 >= UrlRequester.field930.field41 - var13 && var2 <= var13 + UrlRequester.field930.field41 && var17 >= var19 - 15 && var17 < var19) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); } } @@ -471,7 +471,7 @@ public final class class54 { var20 = Login.loginBoxX + 180 - 80; var9 = 321; if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; @@ -485,7 +485,7 @@ public final class class54 { var20 = Login.loginBoxX + 180 - 80; var9 = 321; if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { - WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false); + WorldMapCacheName.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; @@ -511,7 +511,7 @@ public final class class54 { var18 = Login.loginBoxX + 180; var19 = 276; if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { - WorldMapCacheName.method635(var21, true, false); + WorldMapCacheName.openURL(var21, true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return;