From f2d633ae56e590cb8654c89e693f9d86e9a92b38 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 27 Jun 2019 16:25:35 +0200 Subject: [PATCH] Fix menu swaps not working when left clicking items --- .../attributes/code/instructions/AALoad.java | 5 + .../net/runelite/injector/InjectUtil.java | 5 + .../main/java/net/runelite/api/MenuEntry.java | 13 + .../api/events/MenuOptionClicked.java | 7 +- .../client/menus/ComparableEntry.java | 10 + .../runelite/client/menus/MenuManager.java | 36 +- runescape-client/src/main/java/Actor.java | 718 +++++++++--------- runescape-client/src/main/java/Client.java | 6 +- runescape-client/src/main/java/class171.java | 90 +-- runescape-client/src/main/java/class231.java | 3 +- 10 files changed, 477 insertions(+), 416 deletions(-) diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java index 469cfe50dc..287c85ba1a 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java @@ -42,6 +42,11 @@ public class AALoad extends Instruction implements ArrayLoad super(instructions, type); } + public AALoad(Instructions instructions) + { + super(instructions, InstructionType.AALOAD); + } + @Override public InstructionContext execute(Frame frame) { diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java index d9680d1fed..e00b76428a 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java @@ -99,6 +99,11 @@ public class InjectUtil if (hint != null) { ClassFile c = inject.getDeobfuscated().findClass(hint); + if (c == null) + { + throw new InjectionException("Class " + hint + " doesn't exist. (check capitalization)"); + } + for (Field f : c.getFields()) { if (!f.getName().equals(name)) diff --git a/runelite-api/src/main/java/net/runelite/api/MenuEntry.java b/runelite-api/src/main/java/net/runelite/api/MenuEntry.java index cda2997a21..d554f91043 100644 --- a/runelite-api/src/main/java/net/runelite/api/MenuEntry.java +++ b/runelite-api/src/main/java/net/runelite/api/MenuEntry.java @@ -70,4 +70,17 @@ public class MenuEntry * This is used for shift click */ private boolean forceLeftClick; + + public static MenuEntry copy(MenuEntry src) + { + return new MenuEntry( + src.getOption(), + src.getTarget(), + src.getIdentifier(), + src.getType(), + src.getParam0(), + src.getParam1(), + src.isForceLeftClick() + ); + } } diff --git a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java index e186ca0bf1..2180458228 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java +++ b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java @@ -42,10 +42,15 @@ import net.runelite.api.MenuEntry; @Data public class MenuOptionClicked { + public MenuOptionClicked(MenuEntry entry) + { + menuEntry = entry; + } + /** * The actual MenuEntry object representing what was clicked */ - private final MenuEntry menuEntry; + private MenuEntry menuEntry; /** * The option text added to the menu. diff --git a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java index 29efd58742..e7525c901c 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java @@ -72,6 +72,16 @@ public class ComparableEntry this.strictTarget = strictTarget; } + // This is only used for type checking, which is why it has everything but target + // target sometimes changes to option. + public ComparableEntry(MenuEntry e) + { + this.option = e.getOption(); + this.id = e.getIdentifier(); + this.type = e.getType(); + this.strictOption = true; + } + boolean matches(MenuEntry entry) { String opt = Text.standardize(entry.getOption()); diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 82f76b877d..13ae8adcd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -39,6 +39,7 @@ import java.util.Set; import java.util.regex.Pattern; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.MenuAction; @@ -96,7 +97,7 @@ public class MenuManager private final Set hiddenEntries = new HashSet<>(); private final Map swaps = new HashMap<>(); - private final Map originalTypes = new HashMap<>(); + private EntryTypeMapping originalType; @Inject private MenuManager(Client client, EventBus eventBus) @@ -227,7 +228,7 @@ public class MenuManager @Subscribe private void onClientTick(ClientTick event) { - originalTypes.clear(); + originalType = null; client.sortMenuEntries(); final MenuEntry[] oldentries = client.getMenuEntries(); @@ -273,8 +274,9 @@ public class MenuManager int newType = getLeftClickType(type); if (newType != -1 && newType != type) { + MenuEntry original = MenuEntry.copy(e); e.setType(newType); - originalTypes.put(e, type); + originalType = new EntryTypeMapping(new ComparableEntry(e), original); } } @@ -409,18 +411,18 @@ public class MenuManager @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (originalTypes.containsKey(event.getMenuEntry()) && - !event.getTarget().equals("do not edit")) + // Type is changed in check + if (originalType != null && originalType.check(event)) { event.consume(); client.invokeMenuAction( event.getActionParam0(), event.getActionParam1(), - originalTypes.get(event.getMenuEntry()), + event.getType(), event.getIdentifier(), - event.getOption(), "do not edit", + event.getTarget(), client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getY() ); @@ -749,4 +751,24 @@ public class MenuManager { hiddenEntries.remove(entry); } + + @AllArgsConstructor + private class EntryTypeMapping + { + private final ComparableEntry comparable; + private final MenuEntry target; + + private boolean check(MenuOptionClicked event) + { + MenuEntry entry = event.getMenuEntry(); + + if (!entry.getTarget().equals(entry.getOption()) && !comparable.matches(entry)) + { + return false; + } + + event.setMenuEntry(target); + return true; + } + } } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index ded998f3de..ecd96ba288 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -566,343 +566,343 @@ public abstract class Actor extends Entity { garbageValue = "493234011" ) @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if(var2 >= 2000) { - var2 -= 2000; + static final void menuAction(int arg1, int arg2, int opcode, int arg0, String action, String target, int mouseX, int mouseY) { + if(opcode >= 2000) { + opcode -= 2000; } PacketBufferNode var8; - if(var2 == 1) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if(opcode == 1) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_an, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(GraphicsObject.baseY + var1); + var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2); var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot); var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); var8.packetBuffer.writeIntLE(ServerPacket.selectedItemWidget); - var8.packetBuffer.__bx_323(var0 + class50.baseX); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.__bx_323(arg1 + class50.baseX); + var8.packetBuffer.writeShort(arg0); var8.packetBuffer.writeShortLE(MenuAction.selectedItemId); Client.packetWriter.__q_167(var8); - } else if(var2 == 2) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 2) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_cg, Client.packetWriter.isaacCipher); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.writeShort(var0 + class50.baseX); - var8.packetBuffer.__bo_322(var3); + var8.packetBuffer.writeShort(arg1 + class50.baseX); + var8.packetBuffer.__bo_322(arg0); var8.packetBuffer.writeIntLE16(ServerBuild.__iy_lo); var8.packetBuffer.writeShort(Client.__client_lc); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2); Client.packetWriter.__q_167(var8); - } else if(var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 3) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_d, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2); var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.__bo_322(var3); - var8.packetBuffer.__bx_323(var0 + class50.baseX); + var8.packetBuffer.__bo_322(arg0); + var8.packetBuffer.__bx_323(arg1 + class50.baseX); Client.packetWriter.__q_167(var8); - } else if(var2 == 4) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 4) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_cv, Client.packetWriter.isaacCipher); var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.writeShort(arg0); + var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2); + var8.packetBuffer.writeShort(arg1 + class50.baseX); Client.packetWriter.__q_167(var8); - } else if(var2 == 5) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 5) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_cq, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(var0 + class50.baseX); - var8.packetBuffer.__bo_322(var3); - var8.packetBuffer.__bx_323(GraphicsObject.baseY + var1); + var8.packetBuffer.__bx_323(arg1 + class50.baseX); + var8.packetBuffer.__bo_322(arg0); + var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2); var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var8); - } else if(var2 == 6) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 6) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_w, Client.packetWriter.isaacCipher); var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.__bo_322(GraphicsObject.baseY + var1); - var8.packetBuffer.__bo_322(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2); + var8.packetBuffer.__bo_322(arg1 + class50.baseX); + var8.packetBuffer.writeShortLE(arg0); Client.packetWriter.__q_167(var8); } else { PacketBufferNode var9; Npc var13; - if(var2 == 7) { - var13 = Client.npcs[var3]; + if(opcode == 7) { + var13 = Client.npcs[arg0]; if(var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_r, Client.packetWriter.isaacCipher); var9.packetBuffer.__bx_323(MenuAction.selectedItemId); var9.packetBuffer.writeShort(HealthBarDefinition.selectedItemSlot); - var9.packetBuffer.__bx_323(var3); + var9.packetBuffer.__bx_323(arg0); var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); var9.packetBuffer.writeInt(ServerPacket.selectedItemWidget); Client.packetWriter.__q_167(var9); } - } else if(var2 == 8) { - var13 = Client.npcs[var3]; + } else if(opcode == 8) { + var13 = Client.npcs[arg0]; if(var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_cb, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bx_323(var3); + var9.packetBuffer.__bx_323(arg0); var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); var9.packetBuffer.writeIntLE(ServerBuild.__iy_lo); var9.packetBuffer.__bo_322(Client.__client_lc); Client.packetWriter.__q_167(var9); } - } else if(var2 == 9) { - var13 = Client.npcs[var3]; + } else if(opcode == 9) { + var13 = Client.npcs[arg0]; if(var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_bt, Client.packetWriter.isaacCipher); var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(arg0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 10) { - var13 = Client.npcs[var3]; + } else if(opcode == 10) { + var13 = Client.npcs[arg0]; if(var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_f, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bo_322(var3); + var9.packetBuffer.__bo_322(arg0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 11) { - var13 = Client.npcs[var3]; + } else if(opcode == 11) { + var13 = Client.npcs[arg0]; if(var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_ah, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bx_323(var3); + var9.packetBuffer.__bx_323(arg0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 12) { - var13 = Client.npcs[var3]; + } else if(opcode == 12) { + var13 = Client.npcs[arg0]; if(var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_bc, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(arg0); var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 13) { - var13 = Client.npcs[var3]; + } else if(opcode == 13) { + var13 = Client.npcs[arg0]; if(var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_ac, Client.packetWriter.isaacCipher); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bo_322(var3); + var9.packetBuffer.__bo_322(arg0); Client.packetWriter.__q_167(var9); } } else { Player var15; - if(var2 == 14) { - var15 = Client.players[var3]; + if(opcode == 14) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_cy, Client.packetWriter.isaacCipher); var9.packetBuffer.__bx_323(HealthBarDefinition.selectedItemSlot); var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); var9.packetBuffer.writeIntME(ServerPacket.selectedItemWidget); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(arg0); var9.packetBuffer.writeShort(MenuAction.selectedItemId); Client.packetWriter.__q_167(var9); } - } else if(var2 == 15) { - var15 = Client.players[var3]; + } else if(opcode == 15) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_bq, Client.packetWriter.isaacCipher); var9.packetBuffer.writeIntLE16(ServerBuild.__iy_lo); var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); var9.packetBuffer.__bo_322(Client.__client_lc); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(arg0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 16) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_t, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerPacket.selectedItemWidget); var8.packetBuffer.__bx_323(MenuAction.selectedItemId); var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot); - var8.packetBuffer.__bx_323(var3); - var8.packetBuffer.__bx_323(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.__bx_323(arg0); + var8.packetBuffer.__bx_323(arg1 + class50.baseX); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2); Client.packetWriter.__q_167(var8); - } else if(var2 == 17) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 17) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_bb, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerBuild.__iy_lo); var8.packetBuffer.writeShort(Client.__client_lc); - var8.packetBuffer.__bo_322(GraphicsObject.baseY + var1); - var8.packetBuffer.__bo_322(var0 + class50.baseX); + var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2); + var8.packetBuffer.__bo_322(arg1 + class50.baseX); var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(arg0); Client.packetWriter.__q_167(var8); - } else if(var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 18) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_u, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShortLE(var0 + class50.baseX); + var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2); + var8.packetBuffer.writeShortLE(arg0); + var8.packetBuffer.writeShortLE(arg1 + class50.baseX); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var8); - } else if(var2 == 19) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 19) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_bh, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(var3); - var8.packetBuffer.__bo_322(var0 + class50.baseX); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.__bx_323(arg0); + var8.packetBuffer.__bo_322(arg1 + class50.baseX); + var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var8); - } else if(var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 20) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_g, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2); var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.writeShortLE(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(arg1 + class50.baseX); + var8.packetBuffer.writeShortLE(arg0); Client.packetWriter.__q_167(var8); - } else if(var2 == 21) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 21) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_av, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bo_322(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2); + var8.packetBuffer.writeShortLE(arg0); + var8.packetBuffer.writeShort(arg1 + class50.baseX); var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var8); - } else if(var2 == 22) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if(opcode == 22) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_ai, Client.packetWriter.isaacCipher); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.__bx_323(var3); - var8.packetBuffer.__bo_322(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.__bx_323(arg0); + var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2); + var8.packetBuffer.writeShort(arg1 + class50.baseX); Client.packetWriter.__q_167(var8); - } else if(var2 == 23) { + } else if(opcode == 23) { if(Client.isMenuOpen) { class65.scene.__as_250(); } else { - class65.scene.menuOpen(SoundSystem.plane, var0, var1, true); + class65.scene.menuOpen(SoundSystem.plane, arg1, arg2, true); } } else { PacketBufferNode var10; Widget var16; - if(var2 == 24) { - var16 = Huffman.getWidget(var1); + if(opcode == 24) { + var16 = Huffman.getWidget(arg2); boolean var12 = true; if(var16.contentType > 0) { var12 = ViewportMouse.method2957(var16); @@ -910,15 +910,15 @@ public abstract class Actor extends Entity { if(var12) { var10 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeInt(arg2); Client.packetWriter.__q_167(var10); } } else { - if(var2 == 25) { - var16 = class204.getWidgetChild(var1, var0); + if(opcode == 25) { + var16 = class204.getWidgetChild(arg2, arg1); if(var16 != null) { Player.method1281(); - class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var16)), var16.itemId); + class25.method350(arg2, arg1, class211.method4107(class1.getWidgetClickMask(var16)), var16.itemId); Client.isItemSelected = 0; Client.selectedSpellActionName = class198.method3745(var16); if(Client.selectedSpellActionName == null) { @@ -935,26 +935,26 @@ public abstract class Actor extends Entity { return; } - if(var2 == 26) { + if(opcode == 26) { WorldMapLabelSize.method198(); } else { int var11; Widget var14; - if(var2 == 28) { + if(opcode == 28) { var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeInt(arg2); Client.packetWriter.__q_167(var8); - var14 = Huffman.getWidget(var1); + var14 = Huffman.getWidget(arg2); if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { var11 = var14.cs1Instructions[0][1]; Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; IndexCache.method4703(var11); } - } else if(var2 == 29) { + } else if(opcode == 29) { var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeInt(arg2); Client.packetWriter.__q_167(var8); - var14 = Huffman.getWidget(var1); + var14 = Huffman.getWidget(arg2); if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { var11 = var14.cs1Instructions[0][1]; if(Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { @@ -962,90 +962,90 @@ public abstract class Actor extends Entity { IndexCache.method4703(var11); } } - } else if(var2 == 30) { + } else if(opcode == 30) { if(Client.__client_mo == null) { - TilePaint.method3060(var1, var0); - Client.__client_mo = class204.getWidgetChild(var1, var0); + TilePaint.method3060(arg2, arg1); + Client.__client_mo = class204.getWidgetChild(arg2, arg1); class22.method295(Client.__client_mo); } - } else if(var2 == 31) { + } else if(opcode == 31) { var8 = Interpreter.method1915(ClientPacket.__gs_bu, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeIntME(arg2); var8.packetBuffer.writeIntLE16(ServerPacket.selectedItemWidget); var8.packetBuffer.__bx_323(HealthBarDefinition.selectedItemSlot); var8.packetBuffer.writeShortLE(MenuAction.selectedItemId); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.__bx_323(var3); + var8.packetBuffer.writeShortLE(arg1); + var8.packetBuffer.__bx_323(arg0); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 32) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 32) { var8 = Interpreter.method1915(ClientPacket.__gs_q, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerBuild.__iy_lo); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeInt(arg2); + var8.packetBuffer.writeShort(arg1); + var8.packetBuffer.writeShortLE(arg0); var8.packetBuffer.writeShortLE(Client.__client_lc); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 33) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 33) { var8 = Interpreter.method1915(ClientPacket.__gs_ck, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShortLE(arg0); + var8.packetBuffer.writeIntME(arg2); + var8.packetBuffer.writeShort(arg1); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 34) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 34) { var8 = Interpreter.method1915(ClientPacket.__gs_cc, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bo_322(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.__bx_323(var0); + var8.packetBuffer.__bo_322(arg0); + var8.packetBuffer.writeIntLE16(arg2); + var8.packetBuffer.__bx_323(arg1); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 35) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 35) { var8 = Interpreter.method1915(ClientPacket.__gs_bp, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.__bx_323(var0); - var8.packetBuffer.__bx_323(var3); + var8.packetBuffer.writeIntLE(arg2); + var8.packetBuffer.__bx_323(arg1); + var8.packetBuffer.__bx_323(arg0); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 36) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 36) { var8 = Interpreter.method1915(ClientPacket.__gs_l, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.__bx_323(var0); + var8.packetBuffer.__bx_323(arg0); + var8.packetBuffer.writeInt(arg2); + var8.packetBuffer.__bx_323(arg1); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 37) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 37) { var8 = Interpreter.method1915(ClientPacket.__gs_bd, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(arg2); + var8.packetBuffer.writeShort(arg1); + var8.packetBuffer.writeShort(arg0); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; } else { - if(var2 == 38) { + if(opcode == 38) { Player.method1281(); - var16 = Huffman.getWidget(var1); + var16 = Huffman.getWidget(arg2); Client.isItemSelected = 1; - HealthBarDefinition.selectedItemSlot = var0; - ServerPacket.selectedItemWidget = var1; - MenuAction.selectedItemId = var3; + HealthBarDefinition.selectedItemSlot = arg1; + ServerPacket.selectedItemWidget = arg2; + MenuAction.selectedItemId = arg0; class22.method295(var16); - Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(var3).name + BufferedFile.colorStartTag(16777215); + Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(arg0).name + BufferedFile.colorStartTag(16777215); if(Client.selectedItemName == null) { Client.selectedItemName = "null"; } @@ -1053,174 +1053,174 @@ public abstract class Actor extends Entity { return; } - if(var2 == 39) { + if(opcode == 39) { var8 = Interpreter.method1915(ClientPacket.__gs_au, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.__bx_323(arg0); + var8.packetBuffer.writeIntLE16(arg2); + var8.packetBuffer.writeShortLE(arg1); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 40) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 40) { var8 = Interpreter.method1915(ClientPacket.__gs_ag, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.__bo_322(var3); + var8.packetBuffer.writeIntLE16(arg2); + var8.packetBuffer.writeShortLE(arg1); + var8.packetBuffer.__bo_322(arg0); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 41) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 41) { var8 = Interpreter.method1915(ClientPacket.__gs_bl, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.__bo_322(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeIntLE(arg2); + var8.packetBuffer.__bo_322(arg1); + var8.packetBuffer.writeShort(arg0); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 42) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 42) { var8 = Interpreter.method1915(ClientPacket.__gs_bm, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.__bo_322(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(arg2); + var8.packetBuffer.__bo_322(arg1); + var8.packetBuffer.writeShort(arg0); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 43) { + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 43) { var8 = Interpreter.method1915(ClientPacket.__gs_ay, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShort(arg0); + var8.packetBuffer.writeIntME(arg2); + var8.packetBuffer.writeShort(arg1); Client.packetWriter.__q_167(var8); Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; - } else if(var2 == 44) { - var15 = Client.players[var3]; + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; + } else if(opcode == 44) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_ao, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(arg0); var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 45) { - var15 = Client.players[var3]; + } else if(opcode == 45) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_bn, Client.packetWriter.isaacCipher); var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bo_322(var3); + var9.packetBuffer.__bo_322(arg0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 46) { - var15 = Client.players[var3]; + } else if(opcode == 46) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_by, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bo_322(var3); + var9.packetBuffer.__bo_322(arg0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 47) { - var15 = Client.players[var3]; + } else if(opcode == 47) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_aq, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bx_323(var3); + var9.packetBuffer.__bx_323(arg0); var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 48) { - var15 = Client.players[var3]; + } else if(opcode == 48) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_cm, Client.packetWriter.isaacCipher); var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bo_322(var3); + var9.packetBuffer.__bo_322(arg0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 49) { - var15 = Client.players[var3]; + } else if(opcode == 49) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_cf, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bo_322(var3); + var9.packetBuffer.__bo_322(arg0); var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 50) { - var15 = Client.players[var3]; + } else if(opcode == 50) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_be, Client.packetWriter.isaacCipher); var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(arg0); Client.packetWriter.__q_167(var9); } - } else if(var2 == 51) { - var15 = Client.players[var3]; + } else if(opcode == 51) { + var15 = Client.players[arg0]; if(var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var9 = Interpreter.method1915(ClientPacket.__gs_af, Client.packetWriter.isaacCipher); var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bx_323(var3); + var9.packetBuffer.__bx_323(arg0); Client.packetWriter.__q_167(var9); } } else { label921: { - if(var2 != 57) { - if(var2 == 58) { - var16 = class204.getWidgetChild(var1, var0); + if(opcode != 57) { + if(opcode == 58) { + var16 = class204.getWidgetChild(arg2, arg1); if(var16 != null) { var9 = Interpreter.method1915(ClientPacket.__gs_cs, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortLE(Client.__client_lc); - var9.packetBuffer.writeIntLE16(var1); + var9.packetBuffer.writeIntLE16(arg2); var9.packetBuffer.writeShortLE(Client.__client_mh); - var9.packetBuffer.__bx_323(var0); + var9.packetBuffer.__bx_323(arg1); var9.packetBuffer.writeInt(ServerBuild.__iy_lo); var9.packetBuffer.__bx_323(var16.itemId); Client.packetWriter.__q_167(var9); @@ -1228,39 +1228,39 @@ public abstract class Actor extends Entity { break label921; } - if(var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if(opcode == 1001) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = arg1; + Client.destinationY = arg2; var8 = Interpreter.method1915(ClientPacket.__gs_cp, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(arg0); var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.__bo_322(var0 + class50.baseX); - var8.packetBuffer.__bx_323(GraphicsObject.baseY + var1); + var8.packetBuffer.__bo_322(arg1 + class50.baseX); + var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2); Client.packetWriter.__q_167(var8); break label921; } - if(var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if(opcode == 1002) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; var8 = Interpreter.method1915(ClientPacket.__gs_al, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bo_322(var3); + var8.packetBuffer.__bo_322(arg0); Client.packetWriter.__q_167(var8); break label921; } - if(var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if(opcode == 1003) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - var13 = Client.npcs[var3]; + var13 = Client.npcs[arg0]; if(var13 != null) { NpcDefinition var17 = var13.definition; if(var17.transforms != null) { @@ -1276,44 +1276,44 @@ public abstract class Actor extends Entity { break label921; } - if(var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if(opcode == 1004) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; var8 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(arg0); Client.packetWriter.__q_167(var8); break label921; } - if(var2 == 1005) { - var16 = Huffman.getWidget(var1); - if(var16 != null && var16.itemQuantities[var0] >= 100000) { - WorldMapIcon1.method219(27, "", var16.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); + if(opcode == 1005) { + var16 = Huffman.getWidget(arg2); + if(var16 != null && var16.itemQuantities[arg1] >= 100000) { + WorldMapIcon1.method219(27, "", var16.itemQuantities[arg1] + " x " + Skills.getItemDefinition(arg0).name); } else { var9 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(arg0); Client.packetWriter.__q_167(var9); } Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(var1); - Client.__client_jz = var0; + BoundaryObject.__ej_jv = Huffman.getWidget(arg2); + Client.__client_jz = arg1; break label921; } - if(var2 != 1007) { - if(var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) { - class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1)); + if(opcode != 1007) { + if(opcode == 1008 || opcode == 1011 || opcode == 1010 || opcode == 1009 || opcode == 1012) { + class60.worldMap0.menuAction(opcode, arg0, new TileLocation(arg1), new TileLocation(arg2)); } break label921; } } - var16 = class204.getWidgetChild(var1, var0); + var16 = class204.getWidgetChild(arg2, arg1); if(var16 != null) { - class171.method3494(var3, var1, var0, var16.itemId, var5); + class171.method3494(arg0, arg2, arg1, var16.itemId, target); } } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 402943369d..413e46bf08 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -4262,7 +4262,7 @@ public final class Client extends GameShell implements Usernamed { } else if(menuOptionsCount > 0) { var3 = __client_ja; var4 = __client_je; - class231.method4520(UnitPriceComparator.tempMenuAction, var3, var4); + class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var3, var4); UnitPriceComparator.tempMenuAction = null; } @@ -6216,7 +6216,7 @@ public final class Client extends GameShell implements Usernamed { if(DevicePcmPlayerProvider.dragInventoryWidget != null && !__client_jl && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { int var10 = __client_ja; int var11 = __client_je; - class231.method4520(UnitPriceComparator.tempMenuAction, var10, var11); + class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var10, var11); UnitPriceComparator.tempMenuAction = null; } @@ -6448,7 +6448,7 @@ public final class Client extends GameShell implements Usernamed { } else if(menuOptionsCount > 0) { int var13 = widgetClickX + __client_nk; int var14 = widgetClickY + __client_np; - class231.method4520(UnitPriceComparator.tempMenuAction, var13, var14); + class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var13, var14); UnitPriceComparator.tempMenuAction = null; } diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 4260d72875..e097229418 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -543,14 +543,14 @@ public class class171 { signature = "(IIIILjava/lang/String;I)V", garbageValue = "49247882" ) - static void method3494(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = class204.getWidgetChild(var1, var2); + static void method3494(int opIndex, int parentID, int childID, int itemID, String target) { + Widget var5 = class204.getWidgetChild(parentID, childID); if(var5 != null) { if(var5.onOp != null) { ScriptEvent var6 = new ScriptEvent(); var6.widget = var5; - var6.opIndex = var0; - var6.targetName = var4; + var6.opIndex = opIndex; + var6.targetName = target; var6.args0 = var5.onOp; AbstractIndexCache.runScript(var6); } @@ -562,87 +562,87 @@ public class class171 { if(var11) { int var8 = class1.getWidgetClickMask(var5); - int var9 = var0 - 1; + int var9 = opIndex - 1; boolean var7 = (var8 >> var9 + 1 & 1) != 0; if(var7) { PacketBufferNode var10; - if(var0 == 1) { + if(opIndex == 1) { var10 = Interpreter.method1915(ClientPacket.__gs_bi, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 2) { + if(opIndex == 2) { var10 = Interpreter.method1915(ClientPacket.__gs_b, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 3) { + if(opIndex == 3) { var10 = Interpreter.method1915(ClientPacket.__gs_aa, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 4) { + if(opIndex == 4) { var10 = Interpreter.method1915(ClientPacket.__gs_y, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 5) { + if(opIndex == 5) { var10 = Interpreter.method1915(ClientPacket.__gs_ad, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 6) { + if(opIndex == 6) { var10 = Interpreter.method1915(ClientPacket.__gs_br, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 7) { + if(opIndex == 7) { var10 = Interpreter.method1915(ClientPacket.__gs_cu, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 8) { + if(opIndex == 8) { var10 = Interpreter.method1915(ClientPacket.__gs_a, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 9) { + if(opIndex == 9) { var10 = Interpreter.method1915(ClientPacket.__gs_cj, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } - if(var0 == 10) { + if(opIndex == 10) { var10 = Interpreter.method1915(ClientPacket.__gs_m, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); + var10.packetBuffer.writeInt(parentID); + var10.packetBuffer.writeShort(childID); + var10.packetBuffer.writeShort(itemID); Client.packetWriter.__q_167(var10); } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index f74b286451..a448e63e70 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -178,7 +178,8 @@ public enum class231 implements Enumerated { signature = "(Lcs;IIB)V", garbageValue = "1" ) - static final void method4520(MenuAction var0, int var1, int var2) { + @Export("processTempMenuAction") + static final void processTempMenuAction(MenuAction var0, int var1, int var2) { Actor.menuAction(var0.argument1, var0.argument2, var0.opcode, var0.argument0, var0.action, var0.action, var1, var2); }