ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/runelite/runelite into raids_party_display

Browse Source
This commit is contained in:
bjornenalfa
2019-03-14 13:19:30 +01:00
parent 2ac184685f a9a63ca732
commit e861582d5c
72 changed files with 4228 additions and 3730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cache-client/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<artifactId>cache-client</artifactId> <artifactId>cache-client</artifactId>
cache-updater/pom.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<name>Cache Updater</name> <name>Cache Updater</name>
cache/pom.xml
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<artifactId>cache</artifactId> <artifactId>cache</artifactId>
cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java
Vendored
+2 -2
View File
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.runelite.cache.definitions.ScriptDefinition; import net.runelite.cache.definitions.ScriptDefinition;
import net.runelite.cache.io.InputStream; import net.runelite.cache.io.InputStream;
import static net.runelite.cache.script.Opcodes.LOAD_STRING; import static net.runelite.cache.script.Opcodes.SCONST;
import static net.runelite.cache.script.Opcodes.POP_INT; import static net.runelite.cache.script.Opcodes.POP_INT;
import static net.runelite.cache.script.Opcodes.POP_STRING; import static net.runelite.cache.script.Opcodes.POP_STRING;
import static net.runelite.cache.script.Opcodes.RETURN; import static net.runelite.cache.script.Opcodes.RETURN;
@@ -94,7 +94,7 @@ public class ScriptLoader
for (int i = 0; in.getOffset() < endIdx; instructions[i++] = opcode) for (int i = 0; in.getOffset() < endIdx; instructions[i++] = opcode)
{ {
opcode = in.readUnsignedShort(); opcode = in.readUnsignedShort();
if (opcode == LOAD_STRING) if (opcode == SCONST)
{ {
stringOperands[i] = in.readString(); stringOperands[i] = in.readString();
} }
cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java
Vendored
+2 -2
View File
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.runelite.cache.definitions.ScriptDefinition; import net.runelite.cache.definitions.ScriptDefinition;
import net.runelite.cache.io.OutputStream; import net.runelite.cache.io.OutputStream;
import static net.runelite.cache.script.Opcodes.LOAD_STRING; import static net.runelite.cache.script.Opcodes.SCONST;
import static net.runelite.cache.script.Opcodes.POP_INT; import static net.runelite.cache.script.Opcodes.POP_INT;
import static net.runelite.cache.script.Opcodes.POP_STRING; import static net.runelite.cache.script.Opcodes.POP_STRING;
import static net.runelite.cache.script.Opcodes.RETURN; import static net.runelite.cache.script.Opcodes.RETURN;
@@ -48,7 +48,7 @@ public class ScriptSaver
{ {
int opcode = instructions[i]; int opcode = instructions[i];
out.writeShort(opcode); out.writeShort(opcode);
if (opcode == LOAD_STRING) if (opcode == SCONST)
{ {
out.writeString(stringOperands[i]); out.writeString(stringOperands[i]);
} }
cache/src/main/java/net/runelite/cache/script/Instruction.java
Vendored
-44
View File
@@ -28,10 +28,6 @@ public class Instruction
{ {
private final int opcode; private final int opcode;
private String name; private String name;
private int intStackPops;
private int stringStackPops;
private int intStackPushes;
private int stringStackPushes;
public Instruction(int opcode) public Instruction(int opcode)
{ {
@@ -52,44 +48,4 @@ public class Instruction
{ {
this.name = name; this.name = name;
} }
public int getIntStackPops()
{
return intStackPops;
}
public void setIntStackPops(int intStackPops)
{
this.intStackPops = intStackPops;
}
public int getStringStackPops()
{
return stringStackPops;
}
public void setStringStackPops(int stringStackPops)
{
this.stringStackPops = stringStackPops;
}
public int getIntStackPushes()
{
return intStackPushes;
}
public void setIntStackPushes(int intStackPushes)
{
this.intStackPushes = intStackPushes;
}
public int getStringStackPushes()
{
return stringStackPushes;
}
public void setStringStackPushes(int stringStackPushes)
{
this.stringStackPushes = stringStackPushes;
}
} }
cache/src/main/java/net/runelite/cache/script/Instructions.java
Vendored
+471 -520
View File
File diff suppressed because it is too large Load Diff
cache/src/main/java/net/runelite/cache/script/Opcodes.java
Vendored
+444 -364
View File
@@ -1,5 +1,7 @@
/* /*
* Copyright (c) 2017, Adam <Adam@sigterm.info> * Copyright (c) 2017, Adam <Adam@sigterm.info>
* Copyright (c) 2018-2019, Hunter WB <hunterwb.com>
* Copyright (c) 2019, Abex
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -26,10 +28,10 @@ package net.runelite.cache.script;
public class Opcodes public class Opcodes
{ {
public static final int LOAD_INT = 0; public static final int ICONST = 0;
public static final int GET_VARP = 1; public static final int GET_VARP = 1;
public static final int PUT_VARP = 2; public static final int SET_VARP = 2;
public static final int LOAD_STRING = 3; public static final int SCONST = 3;
public static final int JUMP = 6; public static final int JUMP = 6;
public static final int IF_ICMPNE = 7; public static final int IF_ICMPNE = 7;
public static final int IF_ICMPEQ = 8; public static final int IF_ICMPEQ = 8;
@@ -44,376 +46,454 @@ public class Opcodes
public static final int ISTORE = 34; public static final int ISTORE = 34;
public static final int SLOAD = 35; public static final int SLOAD = 35;
public static final int SSTORE = 36; public static final int SSTORE = 36;
public static final int STRING_APPEND = 37; public static final int JOIN_STRING = 37;
public static final int POP_INT = 38; public static final int POP_INT = 38;
public static final int POP_STRING = 39; public static final int POP_STRING = 39;
public static final int INVOKE = 40; public static final int INVOKE = 40;
public static final int GET_VARC = 42; public static final int GET_VARC_INT = 42;
public static final int PUT_VARC = 43; public static final int SET_VARC_INT = 43;
public static final int ARRAY_INITIALIZE = 44; public static final int DEFINE_ARRAY = 44;
public static final int ARRAY_LOAD = 45; public static final int GET_ARRAY_INT = 45;
public static final int ARRAY_STORE = 46; public static final int SET_ARRAY_INT = 46;
public static final int GET_VARC_STRING = 47; public static final int GET_VARC_STRING_OLD = 47;
public static final int PUT_VARC_STRING = 48; public static final int SET_VARC_STRING_OLD = 48;
public static final int GET_VARC_STRING_2 = 49; public static final int GET_VARC_STRING = 49;
public static final int PUT_VARC_STRING_2 = 50; public static final int SET_VARC_STRING = 50;
public static final int SWITCH = 60; public static final int SWITCH = 60;
public static final int WIDGET_CREATE_CHILD = 100; public static final int CC_CREATE = 100;
public static final int WIDGET_DESTROY_CHILD = 101; public static final int CC_DELETE = 101;
public static final int WIDGET_UNSET_CHILDREN = 102; public static final int CC_DELETEALL = 102;
public static final int WIDGET_LOAD_CHILD = 200; public static final int CC_FIND = 200;
public static final int WIDGET_LOAD = 201; public static final int IF_FIND = 201;
public static final int WIDGET_PUT_POSITION = 1000; public static final int CC_SETPOSITION = 1000;
public static final int WIDGET_PUT_SIZE = 1001; public static final int CC_SETSIZE = 1001;
public static final int WIDGET_PUT_HIDDEN = 1003; public static final int CC_SETHIDE = 1003;
public static final int WIDGET_PUT_NO_CLICK_THROUGH = 1005; public static final int CC_SETNOCLICKTHROUGH = 1005;
public static final int WIDGET_PUT_SCROLL = 1100; public static final int CC_SETSCROLLPOS = 1100;
public static final int WIDGET_PUT_TEXTCOLOR = 1101; public static final int CC_SETCOLOUR = 1101;
public static final int WIDGET_PUT_FILLED = 1102; public static final int CC_SETFILL = 1102;
public static final int WIDGET_PUT_OPACITY = 1103; public static final int CC_SETTRANS = 1103;
public static final int WIDGET_PUT_LINE_WIDTH = 1104; public static final int CC_SETLINEWID = 1104;
public static final int WIDGET_PUT_SPRITEID = 1105; public static final int CC_SETGRAPHIC = 1105;
public static final int WIDGET_PUT_TEXTUREID = 1106; public static final int CC_SET2DANGLE = 1106;
public static final int WIDGET_PUT_SPRITE_TILING = 1107; public static final int CC_SETTILING = 1107;
public static final int WIDGET_PUT_MODELID_1 = 1108; public static final int CC_SETMODEL = 1108;
public static final int WIDGET_PUT_3D_ROTATION = 1109; public static final int CC_SETMODELANGLE = 1109;
public static final int WIDGET_PUT_ANIMATION = 1110; public static final int CC_SETMODELANIM = 1110;
public static final int WIDGET_PUT_TEXT = 1112; public static final int CC_SETMODELORTHOG = 1111;
public static final int WIDGET_PUT_FONTID = 1113; public static final int CC_SETTEXT = 1112;
public static final int WIDGET_PUT_TEXT_ALIGNMENT = 1114; public static final int CC_SETTEXTFONT = 1113;
public static final int WIDGET_PUT_TEXT_SHADOWED = 1115; public static final int CC_SETTEXTALIGN = 1114;
public static final int WIDGET_PUT_BORDERTHICKNESS = 1116; public static final int CC_SETTEXTSHADOW = 1115;
public static final int WIDGET_PUT_SPRITE2 = 1117; public static final int CC_SETOUTLINE = 1116;
public static final int WIDGET_PUT_FLIPPEDVERTICALLY = 1118; public static final int CC_SETGRAPHICSHADOW = 1117;
public static final int WIDGET_PUT_FLIPPEDHORIZONALLY = 1119; public static final int CC_SETVFLIP = 1118;
public static final int WIDGET_PUT_SCROLLWIDTHHEIGHT = 1120; public static final int CC_SETHFLIP = 1119;
public static final int WIDGET_ADVANCE_DIALOGUE = 1121; public static final int CC_SETSCROLLSIZE = 1120;
public static final int WIDGET_PUT_MODELID_2 = 1201; public static final int CC_RESUME_PAUSEBUTTON = 1121;
public static final int WIDGET_PUT_MODELID_3 = 1202; public static final int CC_SETFILLCOLOUR = 1123;
public static final int WIDGET_PUT_ACTION = 1300; public static final int CC_SETLINEDIRECTION = 1126;
public static final int WIDGET_PUT_DRAG_PARENT = 1301; public static final int CC_SETOBJECT = 1200;
public static final int WIDGET_PUT_NAME = 1305; public static final int CC_SETNPCHEAD = 1201;
public static final int WIDGET_PUT_SELECTED_ACTION = 1306; public static final int CC_SETPLAYERHEAD_SELF = 1202;
public static final int WIDGET_PUT_ACTIONS_NULL = 1307; public static final int CC_SETOBJECT_NONUM = 1205;
public static final int WIDGET_PUT_MOUSE_PRESS_LISTENER = 1400; public static final int CC_SETOBJECT_ALWAYS_NUM = 1212;
public static final int WIDGET_PUT_DRAGGED_OVER_LISTENER = 1401; public static final int CC_SETOP = 1300;
public static final int WIDGET_PUT_MOUSE_RELEASE_LISTENER = 1402; public static final int CC_SETDRAGGABLE = 1301;
public static final int WIDGET_PUT_MOUSE_ENTER_LISTENER = 1403; public static final int CC_SETDRAGGABLEBEHAVIOR = 1302;
public static final int WIDGET_PUT_MOUSE_EXIT_LISTENER = 1404; public static final int CC_SETDRAGDEADZONE = 1303;
public static final int WIDGET_PUT_DRAG_START_LISTENER = 1405; public static final int CC_SETDRAGDEADTIME = 1304;
public static final int WIDGET_PUT_USE_WITH_LISTENER = 1406; public static final int CC_SETOPBASE = 1305;
public static final int WIDGET_PUT_CONFIG_LISTENER = 1407; public static final int CC_SETTARGETVERB = 1306;
public static final int WIDGET_PUT_RENDER_LISTENER = 1408; public static final int CC_CLEAROPS = 1307;
public static final int WIDGET_PUT_OPTION_CLICK_LISTENER = 1409; public static final int CC_SETONCLICK = 1400;
public static final int WIDGET_PUT_DRAG_RELEASE_LISTENER = 1410; public static final int CC_SETONHOLD = 1401;
public static final int WIDGET_PUT_DRAG_LISTENER = 1411; public static final int CC_SETONRELEASE = 1402;
public static final int WIDGET_PUT_MOUSE_HOVER_LISTENER = 1412; public static final int CC_SETONMOUSEOVER = 1403;
public static final int WIDGET_PUT_TABLE_LISTENER = 1414; public static final int CC_SETONMOUSELEAVE = 1404;
public static final int WIDGET_PUT_SKILL_LISTENER = 1415; public static final int CC_SETONDRAG = 1405;
public static final int WIDGET_PUT_USE_LISTENER = 1416; public static final int CC_SETONTARGETLEAVE = 1406;
public static final int WIDGET_PUT_SCROLL_LISTENER = 1417; public static final int CC_SETONVARTRANSMIT = 1407;
public static final int WIDGET_PUT_MSG_LISTENER = 1418; public static final int CC_SETONTIMER = 1408;
public static final int WIDGET_PUT_KEY_LISTENER = 1419; public static final int CC_SETONOP = 1409;
public static final int WIDGET_PUT_FRIENDS_LISTENER = 1420; public static final int CC_SETONDRAGCOMPLETE = 1410;
public static final int WIDGET_PUT_CLAN_LISTENER = 1421; public static final int CC_SETONCLICKREPEAT = 1411;
public static final int WIDGET_PUT_DIALOG_ABORT_LISTENER = 1423; public static final int CC_SETONMOUSEREPEAT = 1412;
public static final int WIDGET_PUT_OPENCLOSE_LISTENER = 1424; public static final int CC_SETONINVTRANSMIT = 1414;
public static final int WIDGET_PUT_GE_LISTENER = 1425; public static final int CC_SETONSTATTRANSMIT = 1415;
public static final int WIDGET_PUT_RESIZE_LISTENER = 1427; public static final int CC_SETONTARGETENTER = 1416;
public static final int WIDGET_GET_RELATIVEX = 1500; public static final int CC_SETONSCROLLWHEEL = 1417;
public static final int WIDGET_GET_RELATIVEY = 1501; public static final int CC_SETONCHATTRANSMIT = 1418;
public static final int WIDGET_GET_WIDTH = 1502; public static final int CC_SETONKEY = 1419;
public static final int WIDGET_GET_HEIGHT = 1503; public static final int CC_SETONFRIENDTRANSMIT = 1420;
public static final int WIDGET_GET_HIDDEN = 1504; public static final int CC_SETONCLANTRANSMIT = 1421;
public static final int WIDGET_GET_PARENTID = 1505; public static final int CC_SETONMISCTRANSMIT = 1422;
public static final int WIDGET_GET_SCROLLX = 1600; public static final int CC_SETONDIALOGABORT = 1423;
public static final int WIDGET_GET_SCROLLY = 1601; public static final int CC_SETONSUBCHANGE = 1424;
public static final int WIDGET_GET_TEXT = 1602; public static final int CC_SETONSTOCKTRANSMIT = 1425;
public static final int WIDGET_GET_SCROLLWIDTH = 1603; public static final int CC_SETONRESIZE = 1427;
public static final int WIDGET_GET_SCROLLHEIGHT = 1604; public static final int CC_GETX = 1500;
public static final int WIDGET_GET_MODELZOOM = 1605; public static final int CC_GETY = 1501;
public static final int WIDGET_GET_ROTATIONX = 1606; public static final int CC_GETWIDTH = 1502;
public static final int WIDGET_GET_ROTATIONY = 1607; public static final int CC_GETHEIGHT = 1503;
public static final int WIDGET_GET_ROTATIONZ = 1608; public static final int CC_GETHIDE = 1504;
public static final int WIDGET_GET_OPACITY = 1609; public static final int CC_GETLAYER = 1505;
public static final int WIDGET_GET_TEXTCOLOR = 1611; public static final int CC_GETSCROLLX = 1600;
public static final int WIDGET_GET_ITEMID = 1700; public static final int CC_GETSCROLLY = 1601;
public static final int WIDGET_GET_STACKSIZE = 1701; public static final int CC_GETTEXT = 1602;
public static final int WIDGET_GET_INDEX = 1702; public static final int CC_GETSCROLLWIDTH = 1603;
public static final int WIDGET_GET_CONFIG = 1800; public static final int CC_GETSCROLLHEIGHT = 1604;
public static final int WIDGET_GET_ACTION = 1801; public static final int CC_GETMODELZOOM = 1605;
public static final int WIDGET_GET_NAME = 1802; public static final int CC_GETMODELANGLE_X = 1606;
public static final int WIDGET_PUT_POSITION_WIDGET = WIDGET_PUT_POSITION + 1000; public static final int CC_GETMODELANGLE_Z = 1607;
public static final int WIDGET_PUT_SIZE_WIDGET = WIDGET_PUT_SIZE + 1000; public static final int CC_GETMODELANGLE_Y = 1608;
public static final int WIDGET_PUT_HIDDEN_WIDGET = WIDGET_PUT_HIDDEN + 1000; public static final int CC_GETTRANS = 1609;
public static final int WIDGET_PUT_NO_CLICK_THROUGH_WIDGET = WIDGET_PUT_NO_CLICK_THROUGH + 1000; public static final int CC_GETCOLOUR = 1611;
public static final int WIDGET_PUT_SCROLL_WIDGET = WIDGET_PUT_SCROLL + 1000; public static final int CC_GETFILLCOLOUR = 1612;
public static final int WIDGET_PUT_TEXTCOLOR_WIDGET = WIDGET_PUT_TEXTCOLOR + 1000; public static final int CC_GETINVOBJECT = 1700;
public static final int WIDGET_PUT_FILLED_WIDGET = WIDGET_PUT_FILLED + 1000; public static final int CC_GETINVCOUNT = 1701;
public static final int WIDGET_PUT_OPACITY_WIDGET = WIDGET_PUT_OPACITY + 1000; public static final int CC_GETID = 1702;
public static final int WIDGET_PUT_LINE_WIDTH_WIDGET = WIDGET_PUT_LINE_WIDTH + 1000; public static final int CC_GETTARGETMASK = 1800;
public static final int WIDGET_PUT_SPRITEID_WIDGET = WIDGET_PUT_SPRITEID + 1000; public static final int CC_GETOP = 1801;
public static final int WIDGET_PUT_TEXTUREID_WIDGET = WIDGET_PUT_TEXTUREID + 1000; public static final int CC_GETOPBASE = 1802;
public static final int WIDGET_PUT_SPRITE_TILING_WIDGET = WIDGET_PUT_SPRITE_TILING + 1000; public static final int CC_CALLONRESIZE = 1927;
public static final int WIDGET_PUT_MODELID_1_WIDGET = WIDGET_PUT_MODELID_1 + 1000; public static final int IF_SETPOSITION = 2000;
public static final int WIDGET_PUT_3D_ROTATION_WIDGET = WIDGET_PUT_3D_ROTATION + 1000; public static final int IF_SETSIZE = 2001;
public static final int WIDGET_PUT_ANIMATION_WIDGET = WIDGET_PUT_ANIMATION + 1000; public static final int IF_SETHIDE = 2003;
public static final int WIDGET_PUT_TEXT_WIDGET = WIDGET_PUT_TEXT + 1000; public static final int IF_SETNOCLICKTHROUGH = 2005;
public static final int WIDGET_PUT_FONTID_WIDGET = WIDGET_PUT_FONTID + 1000; public static final int IF_SETSCROLLPOS = 2100;
public static final int WIDGET_PUT_TEXT_ALIGNMENT_WIDGET = WIDGET_PUT_TEXT_ALIGNMENT + 1000; public static final int IF_SETCOLOUR = 2101;
public static final int WIDGET_PUT_TEXT_SHADOWED_WIDGET = WIDGET_PUT_TEXT_SHADOWED + 1000; public static final int IF_SETFILL = 2102;
public static final int WIDGET_PUT_BORDERTHICKNESS_WIDGET = WIDGET_PUT_BORDERTHICKNESS + 1000; public static final int IF_SETTRANS = 2103;
public static final int WIDGET_PUT_SPRITE2_WIDGET = WIDGET_PUT_SPRITE2 + 1000; public static final int IF_SETLINEWID = 2104;
public static final int WIDGET_PUT_FLIPPEDVERTICALLY_WIDGET = WIDGET_PUT_FLIPPEDVERTICALLY + 1000; public static final int IF_SETGRAPHIC = 2105;
public static final int WIDGET_PUT_FLIPPEDHORIZONALLY_WIDGET = WIDGET_PUT_FLIPPEDHORIZONALLY + 1000; public static final int IF_SET2DANGLE = 2106;
public static final int WIDGET_PUT_SCROLLWIDTHHEIGHT_WIDGET = WIDGET_PUT_SCROLLWIDTHHEIGHT + 1000; public static final int IF_SETTILING = 2107;
public static final int WIDGET_ADVANCE_DIALOGUE_WIDGET = WIDGET_ADVANCE_DIALOGUE + 1000; public static final int IF_SETMODEL = 2108;
public static final int WIDGET_PUT_MODELID_2_WIDGET = WIDGET_PUT_MODELID_2 + 1000; public static final int IF_SETMODELANGLE = 2109;
public static final int WIDGET_PUT_MODELID_3_WIDGET = WIDGET_PUT_MODELID_3 + 1000; public static final int IF_SETMODELANIM = 2110;
public static final int WIDGET_PUT_ACTION_WIDGET = WIDGET_PUT_ACTION + 1000; public static final int IF_SETMODELORTHOG = 2111;
public static final int WIDGET_PUT_DRAG_PARENT_WIDGET = WIDGET_PUT_DRAG_PARENT + 1000; public static final int IF_SETTEXT = 2112;
public static final int WIDGET_PUT_NAME_WIDGET = WIDGET_PUT_NAME + 1000; public static final int IF_SETTEXTFONT = 2113;
public static final int WIDET_PUT_SELECTED_ACTION_WIDGET = WIDGET_PUT_SELECTED_ACTION + 1000; public static final int IF_SETTEXTALIGN = 2114;
public static final int WIDGET_PUT_ACTIONS_NULL_WIDGET = WIDGET_PUT_ACTIONS_NULL + 1000; public static final int IF_SETTEXTSHADOW = 2115;
public static final int WIDGET_PUT_MOUSE_PRESS_LISTENER_WIDGET = WIDGET_PUT_MOUSE_PRESS_LISTENER + 1000; public static final int IF_SETOUTLINE = 2116;
public static final int WIDGET_PUT_DRAGGED_OVER_LISTENER_WIDGET = WIDGET_PUT_DRAGGED_OVER_LISTENER + 1000; public static final int IF_SETGRAPHICSHADOW = 2117;
public static final int WIDGET_PUT_MOUSE_RELEASE_LISTENER_WIDGET = WIDGET_PUT_MOUSE_RELEASE_LISTENER + 1000; public static final int IF_SETVFLIP = 2118;
public static final int WIDGET_PUT_MOUSE_ENTER_LISTENER_WIDGET = WIDGET_PUT_MOUSE_ENTER_LISTENER + 1000; public static final int IF_SETHFLIP = 2119;
public static final int WIDGET_PUT_MOUSE_EXIT_LISTENER_WIDGET = WIDGET_PUT_MOUSE_EXIT_LISTENER + 1000; public static final int IF_SETSCROLLSIZE = 2120;
public static final int WIDGET_PUT_DRAG_START_LISTENER_WIDGET = WIDGET_PUT_DRAG_START_LISTENER + 1000; public static final int IF_RESUME_PAUSEBUTTON = 2121;
public static final int WIDGET_PUT_USE_WITH_LISTENER_WIDGET = WIDGET_PUT_USE_WITH_LISTENER + 1000; public static final int IF_SETFILLCOLOUR = 2123;
public static final int WIDGET_PUT_CONFIG_LISTENER_WIDGET = WIDGET_PUT_CONFIG_LISTENER + 1000; public static final int IF_SETLINEDIRECTION = 2126;
public static final int WIDGET_PUT_RENDER_LISTENER_WIDGET = WIDGET_PUT_RENDER_LISTENER + 1000; public static final int IF_SETOBJECT = 2200;
public static final int WIDGET_PUT_OPTION_CLICK_LISTENER_WIDGET = WIDGET_PUT_OPTION_CLICK_LISTENER + 1000; public static final int IF_SETNPCHEAD = 2201;
public static final int WIDGET_PUT_DRAG_RELEASE_LISTENER_WIDGET = WIDGET_PUT_DRAG_RELEASE_LISTENER + 1000; public static final int IF_SETPLAYERHEAD_SELF = 2202;
public static final int WIDGET_PUT_DRAG_LISTENER_WIDGET = WIDGET_PUT_DRAG_LISTENER + 1000; public static final int IF_SETOBJECT_NONUM = 2205;
public static final int WIDGET_PUT_MOUSE_HOVER_LISTENER_WIDGET = WIDGET_PUT_MOUSE_HOVER_LISTENER + 1000; public static final int IF_SETOBJECT_ALWAYS_NUM = 2212;
public static final int WIDGET_PUT_TABLE_LISTENER_WIDGET = WIDGET_PUT_TABLE_LISTENER + 1000; public static final int IF_SETOP = 2300;
public static final int WIDGET_PUT_SKILL_LISTENER_WIDGET = WIDGET_PUT_SKILL_LISTENER + 1000; public static final int IF_SETDRAGGABLE = 2301;
public static final int WIDGET_PUT_USE_LISTENER_WIDGET = WIDGET_PUT_USE_LISTENER + 1000; public static final int IF_SETDRAGGABLEBEHAVIOR = 2302;
public static final int WIDGET_PUT_SCROLL_LISTENER_WIDGET = WIDGET_PUT_SCROLL_LISTENER + 1000; public static final int IF_SETDRAGDEADZONE = 2303;
public static final int WIDGET_PUT_MSG_LISTENER_WIDGET = WIDGET_PUT_MSG_LISTENER + 1000; public static final int IF_SETDRAGDEADTIME = 2304;
public static final int WIDGET_PUT_KEY_LISTENER_WIDGET = WIDGET_PUT_KEY_LISTENER + 1000; public static final int IF_SETOPBASE = 2305;
public static final int WIDGET_PUT_FRIENDS_LISTENER_WIDGET = WIDGET_PUT_FRIENDS_LISTENER + 1000; public static final int IF_SETTARGETVERB = 2306;
public static final int WIDGET_PUT_CLAN_LISTENER_WIDGET = WIDGET_PUT_CLAN_LISTENER + 1000; public static final int IF_CLEAROPS = 2307;
public static final int WIDGET_PUT_DIALOG_ABORT_LISTENER_WIDGET = WIDGET_PUT_DIALOG_ABORT_LISTENER + 1000; public static final int IF_SETOPKEY = 2350;
public static final int WIDGET_PUT_OPENCLOSE_LISTENER_WIDGET = WIDGET_PUT_OPENCLOSE_LISTENER + 1000; public static final int IF_SETOPTKEY = 2351;
public static final int WIDGET_PUT_GE_LISTENER_WIDGET = WIDGET_PUT_GE_LISTENER + 1000; public static final int IF_SETOPKEYRATE = 2352;
public static final int WIDGET_PUT_RESIZE_LISTENER_WIDGET = WIDGET_PUT_RESIZE_LISTENER + 1000; public static final int IF_SETOPTKEYRATE = 2353;
public static final int WIDGET_GET_RELATIVEX_WIDGET = WIDGET_GET_RELATIVEX + 1000; public static final int IF_SETOPKEYIGNOREHELD = 2354;
public static final int WIDGET_GET_RELATIVEY_WIDGET = WIDGET_GET_RELATIVEY + 1000; public static final int IF_SETOPTKEYIGNOREHELD = 2355;
public static final int WIDGET_GET_WIDTH_WIDGET = WIDGET_GET_WIDTH + 1000; public static final int IF_SETONCLICK = 2400;
public static final int WIDGET_GET_HEIGHT_WIDGET = WIDGET_GET_HEIGHT + 1000; public static final int IF_SETONHOLD = 2401;
public static final int WIDGET_GET_HIDDEN_WIDGET = WIDGET_GET_HIDDEN + 1000; public static final int IF_SETONRELEASE = 2402;
public static final int WIDGET_GET_PARENTID_WIDGET = WIDGET_GET_PARENTID + 1000; public static final int IF_SETONMOUSEOVER = 2403;
public static final int WIDGET_GET_SCROLLX_WIDGET = WIDGET_GET_SCROLLX + 1000; public static final int IF_SETONMOUSELEAVE = 2404;
public static final int WIDGET_GET_SCROLLY_WIDGET = WIDGET_GET_SCROLLY + 1000; public static final int IF_SETONDRAG = 2405;
public static final int WIDGET_GET_TEXT_WIDGET = WIDGET_GET_TEXT + 1000; public static final int IF_SETONTARGETLEAVE = 2406;
public static final int WIDGET_GET_SCROLLWIDTH_WIDGET = WIDGET_GET_SCROLLWIDTH + 1000; public static final int IF_SETONVARTRANSMIT = 2407;
public static final int WIDGET_GET_SCROLLHEIGHT_WIDGET = WIDGET_GET_SCROLLHEIGHT + 1000; public static final int IF_SETONTIMER = 2408;
public static final int WIDGET_GET_MODELZOOM_WIDGET = WIDGET_GET_MODELZOOM + 1000; public static final int IF_SETONOP = 2409;
public static final int WIDGET_GET_ROTATIONX_WIDGET = WIDGET_GET_ROTATIONX + 1000; public static final int IF_SETONDRAGCOMPLETE = 2410;
public static final int WIDGET_GET_ROTATIONY_WIDGET = WIDGET_GET_ROTATIONY + 1000; public static final int IF_SETONCLICKREPEAT = 2411;
public static final int WIDGET_GET_ROTATIONZ_WIDGET = WIDGET_GET_ROTATIONZ + 1000; public static final int IF_SETONMOUSEREPEAT = 2412;
public static final int WIDGET_GET_OPACITY_WIDGET = WIDGET_GET_OPACITY + 1000; public static final int IF_SETONINVTRANSMIT = 2414;
public static final int WIDGET_GET_TEXTCOLOR_WIDGET = WIDGET_GET_TEXTCOLOR + 1000; public static final int IF_SETONSTATTRANSMIT = 2415;
public static final int WIDGET_GET_ITEMID_WIDGET = WIDGET_GET_ITEMID + 1000; public static final int IF_SETONTARGETENTER = 2416;
public static final int WIDGET_GET_STACKSIZE_WIDGET = WIDGET_GET_STACKSIZE + 1000; public static final int IF_SETONSCROLLWHEEL = 2417;
public static final int WIGET_GET_INDEX_WIDGET = WIDGET_GET_INDEX + 1000; public static final int IF_SETONCHATTRANSMIT = 2418;
public static final int GET_WIDGET_ROOT = 2706; public static final int IF_SETONKEY = 2419;
public static final int WIDGET_GET_CONFIG_WIGET = WIDGET_GET_CONFIG + 1000; public static final int IF_SETONFRIENDTRANSMIT = 2420;
public static final int WIDGET_GET_ACTION_WIDGET = WIDGET_GET_ACTION + 1000; public static final int IF_SETONCLANTRANSMIT = 2421;
public static final int WIDGET_GET_NAME_WIDGET = WIDGET_GET_NAME + 1000; public static final int IF_SETONMISCTRANSMIT = 2422;
public static final int SEND_GAME_MESSAGE = 3100; public static final int IF_SETONDIALOGABORT = 2423;
public static final int PLAYER_ANIMATE = 3101; public static final int IF_SETONSUBCHANGE = 2424;
public static final int CLOSE_WINDOW = 3103; public static final int IF_SETONSTOCKTRANSMIT = 2425;
public static final int NUMERIC_INPUT = 3104; public static final int IF_SETONRESIZE = 2427;
public static final int STRING_INPUT_1 = 3105; public static final int IF_GETX = 2500;
public static final int STRING_INPUT_2 = 3106; public static final int IF_GETY = 2501;
public static final int PLAYER_ACTION = 3107; public static final int IF_GETWIDTH = 2502;
public static final int SET_TOP_CONTEXT_MENU_ROW = 3108; public static final int IF_GETHEIGHT = 2503;
public static final int SET_TOP_CONTEXT_MENU_ROW_2 = 3109; public static final int IF_GETHIDE = 2504;
public static final int SET_MOUSE_BUTTON_CONTROLS_CAMERA = 3110; public static final int IF_GETLAYER = 2505;
public static final int GET_HIDEROOFS = 3111; public static final int IF_GETSCROLLX = 2600;
public static final int SET_HIDEROOFS = 3112; public static final int IF_GETSCROLLY = 2601;
public static final int OPEN_URL = 3113; public static final int IF_GETTEXT = 2602;
public static final int ITEM_PRICE = 3115; public static final int IF_GETSCROLLWIDTH = 2603;
public static final int SEND_BUG_REPORT = 3116; public static final int IF_GETSCROLLHEIGHT = 2604;
public static final int SET_SHIFT_DROP_ENABLED = 3117; public static final int IF_GETMODELZOOM = 2605;
public static final int SET_CONNECTION_TEXT_ENABLED = 3126; public static final int IF_GETMODELANGLE_X = 2606;
public static final int PLAY_SOUND_EFFECT = 3200; public static final int IF_GETMODELANGLE_Z = 2607;
public static final int GET_GAMECYCLE = 3300; public static final int IF_GETMODELANGLE_Y = 2608;
public static final int GET_ITEMCONTAINER_ITEMID = 3301; public static final int IF_GETTRANS = 2609;
public static final int GET_ITEMCONTAINER_STACKSIZE = 3302; public static final int IF_GETCOLOUR = 2611;
public static final int GET_ITEMCONTAINER_STACKSIZES_TOTAL = 3303; public static final int IF_GETFILLCOLOUR = 2612;
public static final int GET_INVENTORY_SIZE = 3304; public static final int IF_GETINVOBJECT = 2700;
public static final int GET_BOOSTEDSKILLLEVELS = 3305; public static final int IF_GETINVCOUNT = 2701;
public static final int GET_REALSKILLLEVELS = 3306; public static final int IF_HASSUB = 2702;
public static final int GET_SKILLEXPERIENCES = 3307; public static final int IF_GETTOP = 2706;
public static final int GET_COORDINATES = 3308; public static final int IF_GETTARGETMASK = 2800;
public static final int DIVIDE_BY_16384 = 3309; public static final int IF_GETOP = 2801;
public static final int RIGHT_SHIFT_28 = 3310; public static final int IF_GETOPBASE = 2802;
public static final int AND_16384 = 3311; public static final int IF_CALLONRESIZE = 2927;
public static final int GET_ISMEMBERS = 3312; public static final int MES = 3100;
public static final int GET_ITEMCONTAINER_ITEMID_2 = 3313; public static final int ANIM = 3101;
public static final int GET_ITEMCONTAINER_STACKSIZE_2 = 3314; public static final int IF_CLOSE = 3103;
public static final int GET_ITEMCONTAINER_STACKSIZES_TOTAL_2 = 3315; public static final int RESUME_COUNTDIALOG = 3104;
public static final int GET_RIGHTS = 3316; public static final int RESUME_NAMEDIALOG = 3105;
public static final int GET_SYSTEM_UPDATE_TIMER = 3317; public static final int RESUME_STRINGDIALOG = 3106;
public static final int GET_WORLDNUM = 3318; public static final int OPPLAYER = 3107;
public static final int GET_ENERGY = 3321; public static final int IF_DRAGPICKUP = 3108;
public static final int GET_WEIGHT = 3322; public static final int CC_DRAGPICKUP = 3109;
public static final int GET_PLAYERMOD = 3323; public static final int MOUSECAM = 3110;
public static final int GET_FLAGS = 3324; public static final int GETREMOVEROOFS = 3111;
public static final int PACK_LOCATION = 3325; public static final int SETREMOVEROOFS = 3112;
public static final int GET_ENUM_VALUE = 3408; public static final int OPENURL = 3113;
public static final int GET_FRIENDCOUNT = 3600; public static final int RESUME_OBJDIALOG = 3115;
public static final int GET_FRIEND = 3601; public static final int BUG_REPORT = 3116;
public static final int GET_FRIEND_WORLD = 3602; public static final int SETSHIFTCLICKDROP = 3117;
public static final int GET_FRIEND_RANK = 3603; public static final int SETSHOWMOUSEOVERTEXT = 3118;
public static final int ADD_FRIEND = 3605; public static final int RENDERSELF = 3119;
public static final int REMOVE_FRIEND = 3606; public static final int SETSHOWMOUSECROSS = 3125;
public static final int ADD_IGNORE = 3607; public static final int SETSHOWLOADINGMESSAGES = 3126;
public static final int REMOVE_IGNORE = 3608; public static final int SETTAPTODROP = 3127;
public static final int IS_FRIEND = 3609; public static final int GETTAPTODROP = 3128;
public static final int GET_CLANCHAT_OWNER = 3611; public static final int GETCANVASSIZE = 3132;
public static final int GET_CLANCHATCOUNT = 3612; public static final int SETHIDEUSERNAME = 3141;
public static final int GET_CLAN_MEMBER_NAME = 3613; public static final int GETHIDEUSERNAME = 3142;
public static final int GET_CLAN_MEMBER_WORLD = 3614; public static final int SETREMEMBERUSERNAME = 3143;
public static final int GET_CLAN_MEMBER_RANK = 3615; public static final int GETREMEMBERUSERNAME = 3144;
public static final int CLANCHAT_KICK_RANK = 3616; public static final int SOUND_SYNTH = 3200;
public static final int CLANCHAT_KICK_CLANMEMBER = 3617; public static final int SOUND_SONG = 3201;
public static final int GET_CLANCHAT_RANK = 3618; public static final int SOUND_JINGLE = 3202;
public static final int JOIN_CLANCHAT = 3619; public static final int CLIENTCLOCK = 3300;
public static final int PART_CLANCHAT = 3620; public static final int INV_GETOBJ = 3301;
public static final int GET_IGNORECOUNT = 3621; public static final int INV_GETNUM = 3302;
public static final int GET_IGNORE = 3622; public static final int INV_TOTAL = 3303;
public static final int IS_IGNORE = 3623; public static final int INV_SIZE = 3304;
public static final int CLANMEMBER_ISME = 3624; public static final int STAT = 3305;
public static final int GET_CLANCHATOWNER = 3625; public static final int STAT_BASE = 3306;
public static final int GET_GRANDEXCHANGE_OFFER_IS_SELLING = 3903; public static final int STAT_XP = 3307;
public static final int GET_GRANDEXCHANGE_OFFER_ITEMID = 3904; public static final int COORD = 3308;
public static final int GET_GRANDEXCHANGE_OFFER_PRICE = 3905; public static final int COORDX = 3309;
public static final int GET_GRANDEXCHANGE_OFFER_TOTALQUANTITY = 3906; public static final int COORDZ = 3310;
public static final int GET_GRANDEXCHANGE_OFFER_QUANTITYSOLD = 3907; public static final int COORDY = 3311;
public static final int GET_GRANDEXCHANGE_OFFER_SPENT = 3908; public static final int MAP_MEMBERS = 3312;
public static final int GET_GRANDEXCHANGE_OFFER_NOT_STARTED = 3910; public static final int INVOTHER_GETOBJ = 3313;
public static final int GET_GRANDEXCHANGE_OFFER_STATUS_2 = 3911; public static final int INVOTHER_GETNUM = 3314;
public static final int GET_GRANDEXCHANGE_OFFER_DONE = 3912; public static final int INVOTHER_TOTAL = 3315;
public static final int IADD = 4000; public static final int STAFFMODLEVEL = 3316;
public static final int ISUB = 4001; public static final int REBOOTTIMER = 3317;
public static final int IMUL = 4002; public static final int MAP_WORLD = 3318;
public static final int IDIV = 4003; public static final int RUNENERGY_VISIBLE = 3321;
public static final int RAND_EXCL = 4004; public static final int RUNWEIGHT_VISIBLE = 3322;
public static final int RAND_INCL = 4005; public static final int PLAYERMOD = 3323;
public static final int WORLDFLAGS = 3324;
public static final int MOVECOORD = 3325;
public static final int ENUM_STRING = 3400;
public static final int ENUM = 3408;
public static final int ENUM_GETOUTPUTCOUNT = 3411;
public static final int FRIEND_COUNT = 3600;
public static final int FRIEND_GETNAME = 3601;
public static final int FRIEND_GETWORLD = 3602;
public static final int FRIEND_GETRANK = 3603;
public static final int FRIEND_SETRANK = 3604;
public static final int FRIEND_ADD = 3605;
public static final int FRIEND_DEL = 3606;
public static final int IGNORE_ADD = 3607;
public static final int IGNORE_DEL = 3608;
public static final int FRIEND_TEST = 3609;
public static final int CLAN_GETCHATDISPLAYNAME = 3611;
public static final int CLAN_GETCHATCOUNT = 3612;
public static final int CLAN_GETCHATUSERNAME = 3613;
public static final int CLAN_GETCHATUSERWORLD = 3614;
public static final int CLAN_GETCHATUSERRANK = 3615;
public static final int CLAN_GETCHATMINKICK = 3616;
public static final int CLAN_KICKUSER = 3617;
public static final int CLAN_GETCHATRANK = 3618;
public static final int CLAN_JOINCHAT = 3619;
public static final int CLAN_LEAVECHAT = 3620;
public static final int IGNORE_COUNT = 3621;
public static final int IGNORE_GETNAME = 3622;
public static final int IGNORE_TEST = 3623;
public static final int CLAN_ISSELF = 3624;
public static final int CLAN_GETCHATOWNERNAME = 3625;
public static final int CLAN_ISFRIEND = 3626;
public static final int CLAN_ISIGNORE = 3627;
public static final int STOCKMARKET_GETOFFERTYPE = 3903;
public static final int STOCKMARKET_GETOFFERITEM = 3904;
public static final int STOCKMARKET_GETOFFERPRICE = 3905;
public static final int STOCKMARKET_GETOFFERCOUNT = 3906;
public static final int STOCKMARKET_GETOFFERCOMPLETEDCOUNT = 3907;
public static final int STOCKMARKET_GETOFFERCOMPLETEDGOLD = 3908;
public static final int STOCKMARKET_ISOFFEREMPTY = 3910;
public static final int STOCKMARKET_ISOFFERSTABLE = 3911;
public static final int STOCKMARKET_ISOFFERFINISHED = 3912;
public static final int STOCKMARKET_ISOFFERADDING = 3913;
public static final int TRADINGPOST_SORTBY_NAME = 3914;
public static final int TRADINGPOST_SORTBY_PRICE = 3915;
public static final int TRADINGPOST_SORTFILTERBY_WORLD = 3916;
public static final int TRADINGPOST_SORTBY_AGE = 3917;
public static final int TRADINGPOST_SORTBY_COUNT = 3918;
public static final int TRADINGPOST_GETTOTALOFFERS = 3919;
public static final int TRADINGPOST_GETOFFERWORLD = 3920;
public static final int TRADINGPOST_GETOFFERNAME = 3921;
public static final int TRADINGPOST_GETOFFERPREVIOUSNAME = 3922;
public static final int TRADINGPOST_GETOFFERAGE = 3923;
public static final int TRADINGPOST_GETOFFERCOUNT = 3924;
public static final int TRADINGPOST_GETOFFERPRICE = 3925;
public static final int TRADINGPOST_GETOFFERITEM = 3926;
public static final int ADD = 4000;
public static final int SUB = 4001;
public static final int MULTIPLY = 4002;
public static final int DIV = 4003;
public static final int RANDOM = 4004;
public static final int RANDOMINC = 4005;
public static final int INTERPOLATE = 4006; public static final int INTERPOLATE = 4006;
public static final int ADD_PERCENT = 4007; public static final int ADDPERCENT = 4007;
public static final int SET_BIT = 4008; public static final int SETBIT = 4008;
public static final int CLEAR_BIT = 4009; public static final int CLEARBIT = 4009;
public static final int TEST_BIT = 4010; public static final int TESTBIT = 4010;
public static final int MODULO = 4011; public static final int MOD = 4011;
public static final int POW = 4012; public static final int POW = 4012;
public static final int INVPOW = 4013; public static final int INVPOW = 4013;
public static final int AND = 4014; public static final int AND = 4014;
public static final int OR = 4015; public static final int OR = 4015;
public static final int SCALE = 4018; public static final int SCALE = 4018;
public static final int CONCAT_INT = 4100; public static final int APPEND_NUM = 4100;
public static final int CONCAT_STRING = 4101; public static final int APPEND = 4101;
public static final int TOLOWERCASE = 4103; public static final int APPEND_SIGNNUM = 4102;
public static final int FORMAT_DATE = 4104; public static final int LOWERCASE = 4103;
public static final int SWITCH_MALE_OR_FEMALE = 4105; public static final int FROMDATE = 4104;
public static final int INT_TO_STRING = 4106; public static final int TEXT_GENDER = 4105;
public static final int STRING_COMPARE = 4107; public static final int TOSTRING = 4106;
public static final int GET_LINE_COUNT = 4108; public static final int COMPARE = 4107;
public static final int GET_MAX_LINE_WIDTH = 4109; public static final int PARAHEIGHT = 4108;
public static final int SWITCH_STRING = 4110; public static final int PARAWIDTH = 4109;
public static final int APPENDTAGS = 4111; public static final int TEXT_SWITCH = 4110;
public static final int CONCAT_CHAR = 4112; public static final int ESCAPE = 4111;
public static final int CHAR_IS_PRINTABLE = 4113; public static final int APPEND_CHAR = 4112;
public static final int ISALNUM = 4114; public static final int CHAR_ISPRINTABLE = 4113;
public static final int ISALPHA = 4115; public static final int CHAR_ISALPHANUMERIC = 4114;
public static final int ISDIGIT = 4116; public static final int CHAR_ISALPHA = 4115;
public static final int CHAR_ISNUMERIC = 4116;
public static final int STRING_LENGTH = 4117; public static final int STRING_LENGTH = 4117;
public static final int STRING_SUBSTRING = 4118; public static final int SUBSTRING = 4118;
public static final int STRING_REMOVE_HTML = 4119; public static final int REMOVETAGS = 4119;
public static final int STRING_INDEXOF = 4120; public static final int STRING_INDEXOF_CHAR = 4120;
public static final int STRING_INDEXOF_FROM = 4121; public static final int STRING_INDEXOF_STRING = 4121;
public static final int GET_ITEM_NAME = 4200; public static final int OC_NAME = 4200;
public static final int GET_ITEM_GROUND_ACTION = 4201; public static final int OC_OP = 4201;
public static final int GET_ITEM_INVENTORY_ACTION = 4202; public static final int OC_IOP = 4202;
public static final int GET_ITEM_PRICE = 4203; public static final int OC_COST = 4203;
public static final int GET_ITEM_STACKABLE = 4204; public static final int OC_STACKABLE = 4204;
public static final int GET_ITEM_NOTE_1 = 4205; public static final int OC_CERT = 4205;
public static final int GET_ITEM_NOTE_2 = 4206; public static final int OC_UNCERT = 4206;
public static final int GET_ITEM_ISMEMBERS = 4207; public static final int OC_MEMBERS = 4207;
public static final int SEARCH_ITEM = 4210; public static final int OC_PLACEHOLDER = 4208;
public static final int NEXT_SEARCH_RESULT = 4211; public static final int OC_UNPLACEHOLDER = 4209;
public static final int CHATFILTER_UPDATE = 5001; public static final int OC_FIND = 4210;
public static final int REPORT_PLAYER = 5002; public static final int OC_FINDNEXT = 4211;
public static final int GET_CHAT_MESSAGE_TYPE = 5003; public static final int OC_FINDRESET = 4212;
public static final int GET_CHAT_MESSAGE = 5004; public static final int CHAT_GETFILTER_PUBLIC = 5000;
public static final int CHATBOX_INPUT = 5008; public static final int CHAT_SETFILTER = 5001;
public static final int PRIVMSG = 5009; public static final int CHAT_SENDABUSEREPORT = 5002;
public static final int GET_LOCALPLAYER_NAME = 5015; public static final int CHAT_GETHISTORY_BYTYPEANDLINE = 5003;
public static final int GET_CHATLINEBUFFER_LENGTH = 5017; public static final int CHAT_GETHISTORY_BYUID = 5004;
public static final int GET_MESSAGENODE_PREV_ID = 5018; public static final int CHAT_GETFILTER_PRIVATE = 5005;
public static final int GET_MESSAGENODE_NEXT_ID = 5019; public static final int CHAT_SENDPUBLIC = 5008;
public static final int RUN_COMMAND = 5020; public static final int CHAT_SENDPRIVATE = 5009;
public static final int GET_ISRESIZED = 5306; public static final int CHAT_PLAYERNAME = 5015;
public static final int SET_ISRESIZED = 5307; public static final int CHAT_GETFILTER_TRADE = 5016;
public static final int GET_SCREENTYPE = 5308; public static final int CHAT_GETHISTORYLENGTH = 5017;
public static final int SET_SCREENTYPE = 5309; public static final int CHAT_GETNEXTUID = 5018;
public static final int GET_MAPANGLE = 5506; public static final int CHAT_GETPREVUID = 5019;
public static final int SET_CAMERA_FOCAL_POINT_HEIGHT = 5530; public static final int DOCHEAT = 5020;
public static final int GET_CAMERA_FOCAL_POINT_HEIGHT = 5531; public static final int CHAT_SETMESSAGEFILTER = 5021;
public static final int CANCEL_LOGIN = 5630; public static final int CHAT_GETMESSAGEFILTER = 5022;
public static final int SET_ZOOM_DISTANCE = 6201; public static final int GETWINDOWMODE = 5306;
public static final int GET_VIEWPORT_SIZE = 6203; public static final int SETWINDOWMODE = 5307;
public static final int GET_ZOOM_DISTANCE = 6204; public static final int GETDEFAULTWINDOWMODE = 5308;
public static final int LOAD_WORLDS = 6500; public static final int SETDEFAULTWINDOWMODE = 5309;
public static final int GET_FIRST_WORLD = 6501; public static final int CAM_FORCEANGLE = 5504;
public static final int GET_NEXT_WORLD = 6502; public static final int CAM_GETANGLE_XA = 5505;
public static final int GET_WORLD_BY_ID = 6506; public static final int CAM_GETANGLE_YA = 5506;
public static final int GET_WORLD_BY_INDEX = 6511; public static final int CAM_SETFOLLOWHEIGHT = 5530;
public static final int GET_IS_MOBILE = 6518; public static final int CAM_GETFOLLOWHEIGHT = 5531;
public static final int GET_MAP_SURFACE_NAME_BY_ID = 6601; public static final int LOGOUT = 5630;
public static final int SET_CURRENT_MAP_SURFACE = 6602; public static final int VIEWPORT_SETFOV = 6200;
public static final int GET_CURRENT_MAP_ZOOM = 6603; public static final int VIEWPORT_SETZOOM = 6201;
public static final int SET_CURRENT_MAP_ZOOM = 6604; public static final int VIEWPORT_CLAMPFOV = 6202;
public static final int SET_MAP_POSITION = 6606; public static final int VIEWPORT_GETEFFECTIVESIZE = 6203;
public static final int SET_MAP_POSITION_IMMEDIATE = 6607; public static final int VIEWPORT_GETZOOM = 6204;
public static final int SET_MAP_POSITION_2 = 6608; public static final int VIEWPORT_GETFOV = 6205;
public static final int SET_MAP_POSITION_IMMEDIATE_2 = 6609; public static final int WORLDLIST_FETCH = 6500;
public static final int GET_MAP_POSITION = 6610; public static final int WORLDLIST_START = 6501;
public static final int GET_MAP_DEFAULT_POSITION_BY_ID = 6611; public static final int WORLDLIST_NEXT = 6502;
public static final int GET_MAP_DIMENSIONS_BY_ID = 6612; public static final int WORLDLIST_SPECIFIC = 6506;
public static final int GET_MAP_BOUNDS_BY_ID = 6613; public static final int WORLDLIST_SORT = 6507;
public static final int GET_MAP_INITAL_ZOOM_BY_ID = 6614; public static final int SETFOLLOWEROPSLOWPRIORITY = 6512;
public static final int GET_CURRENT_MAP_ID = 6616; public static final int NC_PARAM = 6513;
public static final int MAP_ID_CONTAINS_COORD = 6621; public static final int LC_PARAM = 6514;
public static final int GET_MAP_DISPLAY_DIMENSIONS = 6622; public static final int OC_PARAM = 6515;
public static final int GET_MAP_ID_CONTAINING_COORD = 6623; public static final int STRUCT_PARAM = 6516;
public static final int SET_MAP_ICON_FLASH_COUNT = 6624; public static final int ON_MOBILE = 6518;
public static final int RESET_MAP_ICON_FLASH_COUNT = 6625; public static final int CLIENTTYPE = 6519;
public static final int SET_MAP_ICON_FLASH_PERIOD = 6626; public static final int BATTERYLEVEL = 6524;
public static final int RESET_MAP_ICON_FLASH_PERIOD = 6627; public static final int BATTERYCHARGING = 6525;
public static final int SET_MAP_ICON_FLASH_FOREVER = 6628; public static final int WIFIAVAILABLE = 6526;
public static final int FLASH_MAP_ICONS_BY_ID = 6629; public static final int WORLDMAP_GETMAPNAME = 6601;
public static final int FLASH_MAP_ICONS_BY_GROUP = 6630; public static final int WORLDMAP_SETMAP = 6602;
public static final int CLEAR_FLASHING_ICONS = 6631; public static final int WORLDMAP_GETZOOM = 6603;
public static final int SET_MAP_ICONS_DISABLED = 6632; public static final int WORLDMAP_SETZOOM = 6604;
public static final int SET_MAP_ICONS_ENABLED_BY_ID = 6633; public static final int WORLDMAP_ISLOADED = 6605;
public static final int SET_MAP_ICONS_ENABLED_BY_GROUP = 6634; public static final int WORLDMAP_JUMPTODISPLAYCOORD = 6606;
public static final int GET_MAP_ICONS_DISABLED = 6635; public static final int WORLDMAP_JUMPTODISPLAYCOORD_INSTANT = 6607;
public static final int GET_MAP_ICONS_ENABLED_BY_ID = 6636; public static final int WORLDMAP_JUMPTOSOURCECOORD = 6608;
public static final int GET_MAP_ICONS_ENABLED_BY_GROUP = 6637; public static final int WORLDMAP_JUMPTOSOURCECOORD_INSTANT = 6609;
public static final int GET_FIRST_MAP_ICON = 6639; public static final int WORLDMAP_GETDISPLAYPOSITION = 6610;
public static final int GET_NEXT_MAP_ICON = 6640; public static final int WORLDMAP_GETCONFIGORIGIN = 6611;
public static final int GET_MAPICON_NAME_BY_ID = 6693; public static final int WORLDMAP_GETCONFIGSIZE = 6612;
public static final int GET_MAPICON_FONT_SIZE = 6694; public static final int WORLDMAP_GETCONFIGBOUNDS = 6613;
public static final int GET_MAPICON_GROUP_BY_ID = 6695; public static final int WORLDMAP_GETCONFIGZOOM = 6614;
public static final int GET_MAPICON_SPRITE_BY_ID = 6696; public static final int WORLDMAP_GETCURRENTMAP = 6616;
public static final int GET_CURRENT_MAPICON_ID = 6697; public static final int WORLDMAP_GETDISPLAYCOORD = 6617;
public static final int GET_CURRENT_MAPICON_COORD = 6698; public static final int WORLDMAP_COORDINMAP = 6621;
public static final int GET_CURRENT_MAPICON_OTHER_COORD = 6699; public static final int WORLDMAP_GETSIZE = 6622;
public static final int WORLDMAP_PERPETUALFLASH = 6628;
public static final int WORLDMAP_FLASHELEMENT = 6629;
public static final int WORLDMAP_FLASHELEMENTCATEGORY = 6630;
public static final int WORLDMAP_STOPCURRENTFLASHES = 6631;
public static final int WORLDMAP_DISABLEELEMENTS = 6632;
public static final int WORLDMAP_DISABLEELEMENT = 6633;
public static final int WORLDMAP_DISABLEELEMENTCATEGORY = 6634;
public static final int WORLDMAP_GETDISABLEELEMENTS = 6635;
public static final int WORLDMAP_GETDISABLEELEMENT = 6636;
public static final int WORLDMAP_GETDISABLEELEMENTCATEGORY = 6637;
public static final int WORLDMAP_LISTELEMENT_START = 6639;
public static final int WORLDMAP_LISTELEMENT_NEXT = 6640;
public static final int MEC_TEXT = 6693;
public static final int MEC_TEXTSIZE = 6694;
public static final int MEC_CATEGORY = 6695;
public static final int MEC_SPRITE = 6696;
} }
cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java
Vendored
+1 -1
View File
@@ -204,7 +204,7 @@ public class Disassembler
switch (opcode) switch (opcode)
{ {
case Opcodes.LOAD_INT: case Opcodes.ICONST:
case Opcodes.ILOAD: case Opcodes.ILOAD:
case Opcodes.SLOAD: case Opcodes.SLOAD:
case Opcodes.ISTORE: case Opcodes.ISTORE:
cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm
Vendored
+111 -111
View File
@@ -3,28 +3,28 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 2 .int_var_count 2
.string_var_count 1 .string_var_count 1
get_varc 5 get_varc_int 5
load_int 14 iconst 14
if_icmpeq LABEL4 if_icmpeq LABEL4
jump LABEL7 jump LABEL7
LABEL4: LABEL4:
load_int 1 iconst 1
put_varc 66 set_varc_int 66
return return
LABEL7: LABEL7:
load_int -1 iconst -1
istore 0 istore 0
load_string "" sconst ""
sstore 0 sstore 0
get_varc_string 22 get_varc_string_old 22
string_length string_length
istore 1 istore 1
iload 1 iload 1
load_int 0 iconst 0
if_icmpgt LABEL18 if_icmpgt LABEL18
jump LABEL193 jump LABEL193
LABEL18: LABEL18:
get_varc 5 get_varc_int 5
switch switch
1: LABEL21 1: LABEL21
2: LABEL44 2: LABEL44
@@ -46,90 +46,90 @@ LABEL21:
return return
jump LABEL192 jump LABEL192
LABEL23: LABEL23:
get_ignorecount ignore_count
load_int 0 iconst 0
if_icmplt LABEL27 if_icmplt LABEL27
jump LABEL30 jump LABEL30
LABEL27: LABEL27:
load_string "Unable to update ignore list - system busy." sconst "Unable to update ignore list - system busy."
send_game_message mes
jump LABEL43 jump LABEL43
LABEL30: LABEL30:
get_varc 5 get_varc_int 5
load_int 4 iconst 4
if_icmpeq LABEL34 if_icmpeq LABEL34
jump LABEL37 jump LABEL37
LABEL34: LABEL34:
get_varc_string 22 get_varc_string_old 22
add_ignore ignore_add
jump LABEL43 jump LABEL43
LABEL37: LABEL37:
get_varc 5 get_varc_int 5
load_int 5 iconst 5
if_icmpeq LABEL41 if_icmpeq LABEL41
jump LABEL43 jump LABEL43
LABEL41: LABEL41:
get_varc_string 22 get_varc_string_old 22
remove_ignore ignore_del
LABEL43: LABEL43:
jump LABEL192 jump LABEL192
LABEL44: LABEL44:
get_friendcount friend_count
load_int 0 iconst 0
if_icmplt LABEL48 if_icmplt LABEL48
jump LABEL51 jump LABEL51
LABEL48: LABEL48:
load_string "Unable to complete action - system busy." sconst "Unable to complete action - system busy."
send_game_message mes
jump LABEL109 jump LABEL109
LABEL51: LABEL51:
get_varc 5 get_varc_int 5
load_int 2 iconst 2
if_icmpeq LABEL55 if_icmpeq LABEL55
jump LABEL58 jump LABEL58
LABEL55: LABEL55:
get_varc_string 22 get_varc_string_old 22
add_friend friend_add
jump LABEL109 jump LABEL109
LABEL58: LABEL58:
get_varc 5 get_varc_int 5
load_int 3 iconst 3
if_icmpeq LABEL62 if_icmpeq LABEL62
jump LABEL65 jump LABEL65
LABEL62: LABEL62:
get_varc_string 22 get_varc_string_old 22
remove_friend friend_del
jump LABEL109 jump LABEL109
LABEL65: LABEL65:
get_varc 5 get_varc_int 5
load_int 6 iconst 6
if_icmpeq LABEL69 if_icmpeq LABEL69
jump LABEL109 jump LABEL109
LABEL69: LABEL69:
get_varc 203 get_varc_int 203
load_int 0 iconst 0
if_icmpeq LABEL76 if_icmpeq LABEL76
get_varc 203 get_varc_int 203
load_int -1 iconst -1
if_icmpeq LABEL76 if_icmpeq LABEL76
jump LABEL82 jump LABEL82
LABEL76: LABEL76:
load_int 1 iconst 1
load_int 1 iconst 1
invoke 299 invoke 299
load_string "You must set a name before you can chat." sconst "You must set a name before you can chat."
send_game_message mes
return return
LABEL82: LABEL82:
5005 chat_getfilter_private
load_int 2 iconst 2
if_icmpeq LABEL86 if_icmpeq LABEL86
jump LABEL97 jump LABEL97
LABEL86: LABEL86:
5000 chat_getfilter_public
load_int 1 iconst 1
5016 chat_getfilter_trade
chatfilter_update chat_setfilter
invoke 178 invoke 178
invoke 553 invoke 553
istore 0 istore 0
@@ -139,123 +139,123 @@ LABEL86:
invoke 89 invoke 89
LABEL97: LABEL97:
get_varbit 4394 get_varbit 4394
load_int 1 iconst 1
if_icmpeq LABEL101 if_icmpeq LABEL101
jump LABEL104 jump LABEL104
LABEL101: LABEL101:
get_varc_string 23 get_varc_string_old 23
remove_friend friend_del
jump LABEL107 jump LABEL107
LABEL104: LABEL104:
get_varc_string 23 get_varc_string_old 23
get_varc_string 22 get_varc_string_old 22
privmsg chat_sendprivate
LABEL107: LABEL107:
get_gamecycle clientclock
put_varc 61 set_varc_int 61
LABEL109: LABEL109:
jump LABEL192 jump LABEL192
LABEL110: LABEL110:
get_varc_string 22 get_varc_string_old 22
invoke 212 invoke 212
numeric_input resume_countdialog
jump LABEL192 jump LABEL192
LABEL114: LABEL114:
get_varc_string 22 get_varc_string_old 22
string_remove_html removetags
put_varc_string 128 set_varc_string_old 128
get_varc_string 22 get_varc_string_old 22
string_input_1 resume_namedialog
jump LABEL192 jump LABEL192
LABEL120: LABEL120:
get_varc_string 22 get_varc_string_old 22
string_input_2 resume_stringdialog
jump LABEL192 jump LABEL192
LABEL123: LABEL123:
get_varc 203 get_varc_int 203
load_int 0 iconst 0
if_icmpeq LABEL130 if_icmpeq LABEL130
get_varc 203 get_varc_int 203
load_int -1 iconst -1
if_icmpeq LABEL130 if_icmpeq LABEL130
jump LABEL136 jump LABEL136
LABEL130: LABEL130:
load_int 1 iconst 1
load_int 1 iconst 1
invoke 299 invoke 299
load_string "You must set a name before you can chat." sconst "You must set a name before you can chat."
send_game_message mes
return return
LABEL136: LABEL136:
get_varc_string 22 get_varc_string_old 22
string_remove_html removetags
put_varc_string 129 set_varc_string_old 129
get_varc_string 22 get_varc_string_old 22
join_clanchat clan_joinchat
jump LABEL192 jump LABEL192
LABEL142: LABEL142:
iload 1 iload 1
load_int 10 iconst 10
if_icmpgt LABEL146 if_icmpgt LABEL146
jump LABEL152 jump LABEL152
LABEL146: LABEL146:
get_varc_string 22 get_varc_string_old 22
load_int 0 iconst 0
load_int 9 iconst 9
string_substring substring
sstore 0 sstore 0
jump LABEL154 jump LABEL154
LABEL152: LABEL152:
get_varc_string 22 get_varc_string_old 22
sstore 0 sstore 0
LABEL154: LABEL154:
sload 0 sload 0
tolowercase lowercase
5021 chat_setmessagefilter
invoke 553 invoke 553
invoke 84 invoke 84
jump LABEL192 jump LABEL192
LABEL160: LABEL160:
get_varc 203 get_varc_int 203
load_int 0 iconst 0
if_icmpeq LABEL167 if_icmpeq LABEL167
get_varc 203 get_varc_int 203
load_int -1 iconst -1
if_icmpeq LABEL167 if_icmpeq LABEL167
jump LABEL173 jump LABEL173
LABEL167: LABEL167:
load_int 1 iconst 1
load_int 1 iconst 1
invoke 299 invoke 299
load_string "You must set a name before you can chat." sconst "You must set a name before you can chat."
send_game_message mes
return return
LABEL173: LABEL173:
get_varc_string 22 get_varc_string_old 22
load_int 0 iconst 0
put_varc 62 set_varc_int 62
put_varc_string 28 set_varc_string_old 28
invoke 95 invoke 95
load_int 552 iconst 552
load_int -2147483645 iconst -2147483645
load_int 1 iconst 1
load_string "I1" sconst "I1"
load_int 10616843 iconst 10616843
widget_put_render_listener_widget if_setontimer
jump LABEL192 jump LABEL192
LABEL185: LABEL185:
load_int 0 iconst 0
load_int 1 iconst 1
invoke 299 invoke 299
return return
jump LABEL192 jump LABEL192
LABEL190: LABEL190:
get_varc_string 22 get_varc_string_old 22
invoke 2061 invoke 2061
LABEL192: LABEL192:
jump LABEL199 jump LABEL199
LABEL193: LABEL193:
get_varc 5 get_varc_int 5
switch switch
16: LABEL198 16: LABEL198
7: LABEL196 7: LABEL196
@@ -269,7 +269,7 @@ LABEL196:
LABEL198: LABEL198:
return return
LABEL199: LABEL199:
load_int 1 iconst 1
load_int 1 iconst 1
invoke 299 invoke 299
return return
cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm
Vendored
+36 -36
View File
@@ -12,111 +12,111 @@
jump LABEL84 jump LABEL84
LABEL3: LABEL3:
iload 1 iload 1
get_varc 175 get_varc_int 175
if_icmplt LABEL7 if_icmplt LABEL7
jump LABEL9 jump LABEL9
LABEL7: LABEL7:
load_int 0 iconst 0
return return
LABEL9: LABEL9:
sload 0 sload 0
string_remove_html removetags
is_ignore ignore_test
load_int 1 iconst 1
if_icmpeq LABEL15 if_icmpeq LABEL15
jump LABEL17 jump LABEL17
LABEL15: LABEL15:
load_int 0 iconst 0
return return
LABEL17: LABEL17:
load_int 1 iconst 1
return return
jump LABEL84 jump LABEL84
LABEL20: LABEL20:
iload 1 iload 1
get_varc 175 get_varc_int 175
if_icmplt LABEL24 if_icmplt LABEL24
jump LABEL26 jump LABEL26
LABEL24: LABEL24:
load_int 0 iconst 0
return return
LABEL26: LABEL26:
sload 0 sload 0
string_remove_html removetags
is_ignore ignore_test
load_int 1 iconst 1
if_icmpeq LABEL32 if_icmpeq LABEL32
jump LABEL34 jump LABEL34
LABEL32: LABEL32:
load_int 0 iconst 0
return return
LABEL34: LABEL34:
5005 chat_getfilter_private
load_int 0 iconst 0
if_icmpeq LABEL38 if_icmpeq LABEL38
jump LABEL40 jump LABEL40
LABEL38: LABEL38:
load_int 1 iconst 1
return return
LABEL40: LABEL40:
5005 chat_getfilter_private
load_int 1 iconst 1
if_icmpeq LABEL44 if_icmpeq LABEL44
jump LABEL51 jump LABEL51
LABEL44: LABEL44:
sload 0 sload 0
is_friend friend_test
load_int 1 iconst 1
if_icmpeq LABEL49 if_icmpeq LABEL49
jump LABEL51 jump LABEL51
LABEL49: LABEL49:
load_int 1 iconst 1
return return
LABEL51: LABEL51:
load_int 0 iconst 0
return return
jump LABEL84 jump LABEL84
LABEL54: LABEL54:
iload 1 iload 1
get_varc 175 get_varc_int 175
if_icmplt LABEL58 if_icmplt LABEL58
jump LABEL60 jump LABEL60
LABEL58: LABEL58:
load_int 0 iconst 0
return return
LABEL60: LABEL60:
iload 0 iload 0
load_int 5 iconst 5
if_icmpeq LABEL64 if_icmpeq LABEL64
jump LABEL76 jump LABEL76
LABEL64: LABEL64:
get_varbit 1627 get_varbit 1627
load_int 0 iconst 0
if_icmpeq LABEL68 if_icmpeq LABEL68
jump LABEL76 jump LABEL76
LABEL68: LABEL68:
get_gamecycle clientclock
iload 1 iload 1
isub sub
load_int 500 iconst 500
if_icmpge LABEL74 if_icmpge LABEL74
jump LABEL76 jump LABEL76
LABEL74: LABEL74:
load_int 0 iconst 0
return return
LABEL76: LABEL76:
5005 chat_getfilter_private
load_int 2 iconst 2
if_icmpne LABEL80 if_icmpne LABEL80
jump LABEL82 jump LABEL82
LABEL80: LABEL80:
load_int 1 iconst 1
return return
LABEL82: LABEL82:
load_int 0 iconst 0
return return
LABEL84: LABEL84:
load_int 0 iconst 0
return return
load_int -1 iconst -1
return return
cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm
Vendored
+1 -1
View File
@@ -3,5 +3,5 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 0 .int_var_count 0
.string_var_count 0 .string_var_count 0
load_string ": " sconst ": "
return return
http-api/pom.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<name>Web API</name> <name>Web API</name>
http-service/pom.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<name>Web Service</name> <name>Web Service</name>
pom.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>RuneLite</name> <name>RuneLite</name>
protocol-api/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<artifactId>protocol-api</artifactId> <artifactId>protocol-api</artifactId>
protocol/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<artifactId>protocol</artifactId> <artifactId>protocol</artifactId>
runelite-api/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<artifactId>runelite-api</artifactId> <artifactId>runelite-api</artifactId>
runelite-api/src/main/java/net/runelite/api/ItemID.java
+6 -2
View File
@@ -6494,7 +6494,7 @@ public final class ItemID
public static final int ZAMORAK_CHAPS = 10372; public static final int ZAMORAK_CHAPS = 10372;
public static final int ZAMORAK_COIF = 10374; public static final int ZAMORAK_COIF = 10374;
public static final int GUTHIX_BRACERS = 10376; public static final int GUTHIX_BRACERS = 10376;
public static final int GUTHIX_DRAGONHIDE = 10378; public static final int GUTHIX_DHIDE = 10378;
public static final int GUTHIX_CHAPS = 10380; public static final int GUTHIX_CHAPS = 10380;
public static final int GUTHIX_COIF = 10382; public static final int GUTHIX_COIF = 10382;
public static final int SARADOMIN_BRACERS = 10384; public static final int SARADOMIN_BRACERS = 10384;
@@ -6801,7 +6801,7 @@ public final class ItemID
public static final int GUTHIX_ROBE_TOP_10788 = 10788; public static final int GUTHIX_ROBE_TOP_10788 = 10788;
public static final int ZAMORAK_DHIDE_10790 = 10790; public static final int ZAMORAK_DHIDE_10790 = 10790;
public static final int SARADOMIN_DHIDE_10792 = 10792; public static final int SARADOMIN_DHIDE_10792 = 10792;
public static final int GUTHIX_DRAGONHIDE_10794 = 10794; public static final int GUTHIX_DRAGONHIDE = 10794;
public static final int ROBIN_HOOD_HAT_10796 = 10796; public static final int ROBIN_HOOD_HAT_10796 = 10796;
public static final int RUNE_PLATEBODY_G_10798 = 10798; public static final int RUNE_PLATEBODY_G_10798 = 10798;
public static final int RUNE_PLATEBODY_T_10800 = 10800; public static final int RUNE_PLATEBODY_T_10800 = 10800;
@@ -10644,5 +10644,9 @@ public final class ItemID
public static final int ORNATE_CAPE = 23099; public static final int ORNATE_CAPE = 23099;
public static final int ORNATE_HELM = 23101; public static final int ORNATE_HELM = 23101;
public static final int BIRTHDAY_CAKE = 23108; public static final int BIRTHDAY_CAKE = 23108;
public static final int MYSTIC_SET_LIGHT = 23110;
public static final int MYSTIC_SET_BLUE = 23113;
public static final int MYSTIC_SET_DARK = 23116;
public static final int MYSTIC_SET_DUSK = 23119;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NpcID.java
+1
View File
@@ -6207,6 +6207,7 @@ public final class NpcID
public static final int SPAWN_6768 = 6768; public static final int SPAWN_6768 = 6768;
public static final int OSTEN = 6769; public static final int OSTEN = 6769;
public static final int ARCIS = 6770; public static final int ARCIS = 6770;
public static final int DREW = 6771;
public static final int LOVADA = 6772; public static final int LOVADA = 6772;
public static final int DOOMSAYER = 6773; public static final int DOOMSAYER = 6773;
public static final int DOOMSAYER_6774 = 6774; public static final int DOOMSAYER_6774 = 6774;
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+8
View File
@@ -12279,5 +12279,13 @@ public final class NullItemID
public static final int NULL_23106 = 23106; public static final int NULL_23106 = 23106;
public static final int NULL_23107 = 23107; public static final int NULL_23107 = 23107;
public static final int NULL_23109 = 23109; public static final int NULL_23109 = 23109;
public static final int NULL_23111 = 23111;
public static final int NULL_23112 = 23112;
public static final int NULL_23114 = 23114;
public static final int NULL_23115 = 23115;
public static final int NULL_23117 = 23117;
public static final int NULL_23118 = 23118;
public static final int NULL_23120 = 23120;
public static final int NULL_23121 = 23121;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
-1
View File
@@ -11440,7 +11440,6 @@ public final class NullObjectID
public static final int NULL_24552 = 24552; public static final int NULL_24552 = 24552;
public static final int NULL_24553 = 24553; public static final int NULL_24553 = 24553;
public static final int NULL_24554 = 24554; public static final int NULL_24554 = 24554;
public static final int NULL_24558 = 24558;
public static final int NULL_24570 = 24570; public static final int NULL_24570 = 24570;
public static final int NULL_24604 = 24604; public static final int NULL_24604 = 24604;
public static final int NULL_24623 = 24623; public static final int NULL_24623 = 24623;
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+4 -2
View File
@@ -13120,8 +13120,9 @@ public final class ObjectID
public static final int DISPLAY_CASE_24551 = 24551; public static final int DISPLAY_CASE_24551 = 24551;
public static final int SPECIMEN_TABLE_24555 = 24555; public static final int SPECIMEN_TABLE_24555 = 24555;
public static final int SPECIMEN_TABLE_24556 = 24556; public static final int SPECIMEN_TABLE_24556 = 24556;
public static final int ROCKS_24557 = 24557; public static final int DIG_SITE_SPECIMEN_ROCKS = 24557;
public static final int DIG_SITE_SPECIMEN_ROCKS = 24559; public static final int DIG_SITE_SPECIMEN_ROCKS_24558 = 24558;
public static final int DIG_SITE_SPECIMEN_ROCKS_24559 = 24559;
public static final int GATE_24560 = 24560; public static final int GATE_24560 = 24560;
public static final int GATE_24561 = 24561; public static final int GATE_24561 = 24561;
public static final int GAP_24562 = 24562; public static final int GAP_24562 = 24562;
@@ -13890,6 +13891,7 @@ public final class ObjectID
public static final int CHEST_26193 = 26193; public static final int CHEST_26193 = 26193;
public static final int LEVER_26194 = 26194; public static final int LEVER_26194 = 26194;
public static final int BIRTHDAY_CAKE = 26198; public static final int BIRTHDAY_CAKE = 26198;
public static final int GRINDER = 26199;
public static final int TABLE_26201 = 26201; public static final int TABLE_26201 = 26201;
public static final int TABLE_26202 = 26202; public static final int TABLE_26202 = 26202;
public static final int TABLE_26203 = 26203; public static final int TABLE_26203 = 26203;
runelite-api/src/main/java/net/runelite/api/ScriptID.java
-9
View File
@@ -116,15 +116,6 @@ public final class ScriptID
*/ */
public static final int DIARY_QUEST_UPDATE_LINECOUNT = 2523; public static final int DIARY_QUEST_UPDATE_LINECOUNT = 2523;
/**
* Initializes the chatbox input to use RuneLite callbacks
* <ul>
* <li> String Prompt text </li>
* <li> String Default value </li>
* </ul>
*/
public static final int RUNELITE_CHATBOX_INPUT_INIT = 10001;
/** /**
* Does nothing * Does nothing
* *
runelite-api/src/main/java/net/runelite/api/VarPlayer.java
+5
View File
@@ -68,6 +68,11 @@ public enum VarPlayer
*/ */
THRONE_OF_MISCELLANIA(359), THRONE_OF_MISCELLANIA(359),
/**
* Item currently active in the creation of a buy or sell offer
*/
CURRENT_GE_ITEM(1151),
/** /**
* Experience tracker goal start. * Experience tracker goal start.
*/ */
runelite-api/src/main/java/net/runelite/api/Varbits.java
+8 -1
View File
@@ -468,7 +468,14 @@ public enum Varbits
BANK_TAB_SIX_COUNT(4176), BANK_TAB_SIX_COUNT(4176),
BANK_TAB_SEVEN_COUNT(4177), BANK_TAB_SEVEN_COUNT(4177),
BANK_TAB_EIGHT_COUNT(4178), BANK_TAB_EIGHT_COUNT(4178),
BANK_TAB_NINE_COUNT(4179); BANK_TAB_NINE_COUNT(4179),
/**
* Type of GE offer currently being created
* 0 = buy
* 1 = sell
*/
GE_OFFER_CREATION_TYPE(4397);
/** /**
* The raw varbit ID. * The raw varbit ID.
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+7 -4
View File
@@ -350,6 +350,7 @@ public class WidgetID
static final int ROOT_INTERFACE_CONTAINER = 62; static final int ROOT_INTERFACE_CONTAINER = 62;
static final int BANK_CONTAINER = 64; static final int BANK_CONTAINER = 64;
static final int INTERFACE_CONTAINER = 65; static final int INTERFACE_CONTAINER = 65;
static final int INVENTORY_CONTAINER = 69;
} }
static class ResizableViewport static class ResizableViewport
@@ -383,6 +384,7 @@ public class WidgetID
static final int PRAYER_ICON = 63; static final int PRAYER_ICON = 63;
static final int MAGIC_ICON = 64; static final int MAGIC_ICON = 64;
static final int INTERFACE_CONTAINER = 65; static final int INTERFACE_CONTAINER = 65;
static final int INVENTORY_CONTAINER = 71;
} }
static class ResizableViewportBottomLine static class ResizableViewportBottomLine
@@ -415,6 +417,7 @@ public class WidgetID
static final int MUSIC_TAB = 40; static final int MUSIC_TAB = 40;
static final int MUSIC_ICON = 46; static final int MUSIC_ICON = 46;
static final int MAGIC_ICON = 63; static final int MAGIC_ICON = 63;
static final int INVENTORY_CONTAINER = 71;
} }
static class Chatbox static class Chatbox
@@ -689,7 +692,7 @@ public class WidgetID
static class Minigames static class Minigames
{ {
static final int TELEPORT_BUTTON = 31; static final int TELEPORT_BUTTON = 26;
} }
static class StandardSpellBook static class StandardSpellBook
@@ -753,8 +756,8 @@ public class WidgetID
static class QuestList static class QuestList
{ {
static final int FREE_CONTAINER = 9; static final int FREE_CONTAINER = 6;
static final int MEMBERS_CONTAINER = 10; static final int MEMBERS_CONTAINER = 7;
static final int MINIQUEST_CONTAINER = 11; static final int MINIQUEST_CONTAINER = 8;
} }
} }
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
+3 -2
View File
@@ -76,8 +76,6 @@ public enum WidgetInfo
EMOTE_WINDOW(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_WINDOW), EMOTE_WINDOW(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_WINDOW),
EMOTE_CONTAINER(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_CONTAINER), EMOTE_CONTAINER(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_CONTAINER),
DIARY_LIST(WidgetID.DIARY_GROUP_ID, 10),
DIARY_QUEST_WIDGET_TITLE(WidgetID.DIARY_QUEST_GROUP_ID, WidgetID.Diary.DIARY_TITLE), DIARY_QUEST_WIDGET_TITLE(WidgetID.DIARY_QUEST_GROUP_ID, WidgetID.Diary.DIARY_TITLE),
DIARY_QUEST_WIDGET_TEXT(WidgetID.DIARY_QUEST_GROUP_ID, WidgetID.Diary.DIARY_TEXT), DIARY_QUEST_WIDGET_TEXT(WidgetID.DIARY_QUEST_GROUP_ID, WidgetID.Diary.DIARY_TEXT),
@@ -168,6 +166,7 @@ public enum WidgetInfo
FIXED_VIEWPORT_ROOT_INTERFACE_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.ROOT_INTERFACE_CONTAINER), FIXED_VIEWPORT_ROOT_INTERFACE_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.ROOT_INTERFACE_CONTAINER),
FIXED_VIEWPORT_BANK_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.BANK_CONTAINER), FIXED_VIEWPORT_BANK_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.BANK_CONTAINER),
FIXED_VIEWPORT_INTERFACE_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.INTERFACE_CONTAINER), FIXED_VIEWPORT_INTERFACE_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.INTERFACE_CONTAINER),
FIXED_VIEWPORT_INVENTORY_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.INVENTORY_CONTAINER),
FIXED_VIEWPORT_COMBAT_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.COMBAT_TAB), FIXED_VIEWPORT_COMBAT_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.COMBAT_TAB),
FIXED_VIEWPORT_STATS_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.STATS_TAB), FIXED_VIEWPORT_STATS_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.STATS_TAB),
FIXED_VIEWPORT_QUESTS_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.QUESTS_TAB), FIXED_VIEWPORT_QUESTS_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.QUESTS_TAB),
@@ -258,7 +257,9 @@ public enum WidgetInfo
RESIZABLE_VIEWPORT_BOTTOM_LINE_OPTIONS_ICON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.SETTINGS_ICON), RESIZABLE_VIEWPORT_BOTTOM_LINE_OPTIONS_ICON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.SETTINGS_ICON),
RESIZABLE_VIEWPORT_BOTTOM_LINE_EMOTES_ICON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.EMOTE_ICON), RESIZABLE_VIEWPORT_BOTTOM_LINE_EMOTES_ICON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.EMOTE_ICON),
RESIZABLE_VIEWPORT_BOTTOM_LINE_MUSIC_ICON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MUSIC_ICON), RESIZABLE_VIEWPORT_BOTTOM_LINE_MUSIC_ICON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MUSIC_ICON),
RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.INVENTORY_CONTAINER),
RESIZABLE_VIEWPORT_INTERFACE_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.INTERFACE_CONTAINER), RESIZABLE_VIEWPORT_INTERFACE_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.INTERFACE_CONTAINER),
RESIZABLE_VIEWPORT_INVENTORY_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.INVENTORY_CONTAINER),
RESIZABLE_VIEWPORT_BOTTOM_LINE_INTERFACE_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewport.INTERFACE_CONTAINER), RESIZABLE_VIEWPORT_BOTTOM_LINE_INTERFACE_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewport.INTERFACE_CONTAINER),
PRAYER_THICK_SKIN(WidgetID.PRAYER_GROUP_ID, WidgetID.Prayer.THICK_SKIN), PRAYER_THICK_SKIN(WidgetID.PRAYER_GROUP_ID, WidgetID.Prayer.THICK_SKIN),
runelite-client/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<artifactId>client</artifactId> <artifactId>client</artifactId>
runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
+18 -27
View File
@@ -99,6 +99,9 @@ public class ConfigManager
public final void switchSession(AccountSession session) public final void switchSession(AccountSession session)
{ {
// Ensure existing config is saved
sendConfig();
if (session == null) if (session == null)
{ {
this.session = null; this.session = null;
@@ -315,7 +318,7 @@ public class ConfigManager
} }
} }
private synchronized void saveToFile(final File propertiesFile) throws IOException private void saveToFile(final File propertiesFile) throws IOException
{ {
propertiesFile.getParentFile().mkdirs(); propertiesFile.getParentFile().mkdirs();
@@ -392,19 +395,6 @@ public class ConfigManager
pendingChanges.put(groupName + "." + key, value); pendingChanges.put(groupName + "." + key, value);
} }
Runnable task = () ->
{
try
{
saveToFile(propertiesFile);
}
catch (IOException ex)
{
log.warn("unable to save configuration file", ex);
}
};
executor.execute(task);
ConfigChanged configChanged = new ConfigChanged(); ConfigChanged configChanged = new ConfigChanged();
configChanged.setGroup(groupName); configChanged.setGroup(groupName);
configChanged.setKey(key); configChanged.setKey(key);
@@ -435,19 +425,6 @@ public class ConfigManager
pendingChanges.put(groupName + "." + key, null); pendingChanges.put(groupName + "." + key, null);
} }
Runnable task = () ->
{
try
{
saveToFile(propertiesFile);
}
catch (IOException ex)
{
log.warn("unable to save configuration file", ex);
}
};
executor.execute(task);
ConfigChanged configChanged = new ConfigChanged(); ConfigChanged configChanged = new ConfigChanged();
configChanged.setGroup(groupName); configChanged.setGroup(groupName);
configChanged.setKey(key); configChanged.setKey(key);
@@ -653,6 +630,7 @@ public class ConfigManager
public void sendConfig() public void sendConfig()
{ {
boolean changed;
synchronized (pendingChanges) synchronized (pendingChanges)
{ {
if (client != null) if (client != null)
@@ -672,7 +650,20 @@ public class ConfigManager
} }
} }
} }
changed = !pendingChanges.isEmpty();
pendingChanges.clear(); pendingChanges.clear();
} }
if (changed)
{
try
{
saveToFile(propertiesFile);
}
catch (IOException ex)
{
log.warn("unable to save configuration file", ex);
}
}
} }
} }
runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java
-158
View File
@@ -1,158 +0,0 @@
/*
* Copyright (c) 2018 Abex
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.game;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.function.Consumer;
import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.ScriptID;
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.client.callback.ClientThread;
import net.runelite.client.eventbus.EventBus;
import net.runelite.client.eventbus.Subscribe;
@Singleton
public class ChatboxInputManager
{
public static final int NO_LIMIT = Integer.MAX_VALUE;
private final Client client;
private final ClientThread clientThread;
private Consumer<String> done;
private Consumer<String> changed;
private int characterLimit = NO_LIMIT;
@Getter
private boolean open = false;
@Inject
public ChatboxInputManager(Client client, ClientThread clientThread, EventBus eventBus)
{
this.client = client;
this.clientThread = clientThread;
eventBus.register(this);
}
/**
* Opens a RuneScape-style chatbox input
*
* @param text Text to show at the top of the window
* @param defaul Default text in the editable field
* @param done Callback when the text box has been exited, called with "" on esc
*/
public void openInputWindow(String text, String defaul, Consumer<String> done)
{
openInputWindow(text, defaul, NO_LIMIT, done);
}
public void openInputWindow(String text, String defaul, int characterLimit, Consumer<String> done)
{
openInputWindow(text, defaul, characterLimit, null, done);
}
public void openInputWindow(String text, String defaul, int characterLimit, Consumer<String> changed, Consumer<String> done)
{
this.done = done;
this.changed = changed;
this.characterLimit = characterLimit;
this.open = true;
clientThread.invoke(() -> client.runScript(
ScriptID.RUNELITE_CHATBOX_INPUT_INIT,
text,
defaul
));
}
/**
* Closes the RuneScape-style chatbox input
*/
public void closeInputWindow()
{
if (!this.open)
{
return;
}
this.open = false;
clientThread.invoke(() -> client.runScript(
ScriptID.RESET_CHATBOX_INPUT,
1,
1
));
}
@Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent ev)
{
// This replaces script 74 and most of 112
if ("chatboxInputHandler".equals(ev.getEventName()))
{
int intStackSize = client.getIntStackSize();
int stringStackSize = client.getStringStackSize();
int typedKey = client.getIntStack()[--intStackSize];
String str = client.getStringStack()[--stringStackSize];
boolean isDone = false;
switch (typedKey)
{
case 27: // Escape
str = "";
// fallthrough
case '\n':
this.open = false;
isDone = true;
break;
case '\b':
if (!str.isEmpty())
{
str = str.substring(0, str.length() - 1);
}
break;
default:
// If we wanted to do numbers only, we could add a limit here
if (typedKey >= 32 && (str.length() < characterLimit))
{
str += Character.toString((char) typedKey);
}
}
if (changed != null)
{
changed.accept(str);
}
if (isDone && done != null)
{
done.accept(str);
}
client.getStringStack()[stringStackSize++] = str;
client.getIntStack()[intStackSize++] = isDone ? 1 : 0;
client.setIntStackSize(intStackSize);
client.setStringStackSize(stringStackSize);
}
}
}
runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
+1 -1
View File
@@ -195,7 +195,7 @@ public enum ItemMapping
BLACK_MASK, BLACK_MASK_I, BLACK_MASK_1, BLACK_MASK_1_I, BLACK_MASK_2, BLACK_MASK_2_I, BLACK_MASK_3, BLACK_MASK_3_I, BLACK_MASK_4, BLACK_MASK_4_I, BLACK_MASK_5, BLACK_MASK, BLACK_MASK_I, BLACK_MASK_1, BLACK_MASK_1_I, BLACK_MASK_2, BLACK_MASK_2_I, BLACK_MASK_3, BLACK_MASK_3_I, BLACK_MASK_4, BLACK_MASK_4_I, BLACK_MASK_5,
BLACK_MASK_5_I, BLACK_MASK_6, BLACK_MASK_6_I, BLACK_MASK_7, BLACK_MASK_7_I, BLACK_MASK_8, BLACK_MASK_8_I, BLACK_MASK_9, BLACK_MASK_9_I, BLACK_MASK_10_I, BLACK_MASK_5_I, BLACK_MASK_6, BLACK_MASK_6_I, BLACK_MASK_7, BLACK_MASK_7_I, BLACK_MASK_8, BLACK_MASK_8_I, BLACK_MASK_9, BLACK_MASK_9_I, BLACK_MASK_10_I,
SLAYER_HELMET, SLAYER_HELMET_I, BLACK_SLAYER_HELMET, BLACK_SLAYER_HELMET_I, PURPLE_SLAYER_HELMET, PURPLE_SLAYER_HELMET_I, RED_SLAYER_HELMET, RED_SLAYER_HELMET_I, SLAYER_HELMET, SLAYER_HELMET_I, BLACK_SLAYER_HELMET, BLACK_SLAYER_HELMET_I, PURPLE_SLAYER_HELMET, PURPLE_SLAYER_HELMET_I, RED_SLAYER_HELMET, RED_SLAYER_HELMET_I,
GREEN_SLAYER_HELMET, GREEN_SLAYER_HELMET_I, TURQUOISE_SLAYER_HELMET, TURQUOISE_SLAYER_HELMET_I), GREEN_SLAYER_HELMET, GREEN_SLAYER_HELMET_I, TURQUOISE_SLAYER_HELMET, TURQUOISE_SLAYER_HELMET_I, HYDRA_SLAYER_HELMET, HYDRA_SLAYER_HELMET_I),
// Pharaoh's Sceptres // Pharaoh's Sceptres
ITEM_PHARAOHS_SCEPTRE_1(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_1), ITEM_PHARAOHS_SCEPTRE_1(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_1),
runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
+20
View File
@@ -366,6 +366,11 @@ public class ChatCommandsPlugin extends Plugin
return; return;
} }
if (message.length() <= KILLCOUNT_COMMAND_STRING.length())
{
return;
}
ChatMessageType type = chatMessage.getType(); ChatMessageType type = chatMessage.getType();
String search = message.substring(KILLCOUNT_COMMAND_STRING.length() + 1); String search = message.substring(KILLCOUNT_COMMAND_STRING.length() + 1);
@@ -483,6 +488,11 @@ public class ChatCommandsPlugin extends Plugin
return; return;
} }
if (message.length() <= PB_COMMAND.length())
{
return;
}
ChatMessageType type = chatMessage.getType(); ChatMessageType type = chatMessage.getType();
String search = message.substring(PB_COMMAND.length() + 1); String search = message.substring(PB_COMMAND.length() + 1);
@@ -574,6 +584,11 @@ public class ChatCommandsPlugin extends Plugin
return; return;
} }
if (message.length() <= PRICE_COMMAND_STRING.length())
{
return;
}
MessageNode messageNode = chatMessage.getMessageNode(); MessageNode messageNode = chatMessage.getMessageNode();
String search = message.substring(PRICE_COMMAND_STRING.length() + 1); String search = message.substring(PRICE_COMMAND_STRING.length() + 1);
@@ -637,6 +652,11 @@ public class ChatCommandsPlugin extends Plugin
} }
else else
{ {
if (message.length() <= LEVEL_COMMAND_STRING.length())
{
return;
}
search = message.substring(LEVEL_COMMAND_STRING.length() + 1); search = message.substring(LEVEL_COMMAND_STRING.length() + 1);
} }
runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
+15 -6
View File
@@ -167,7 +167,7 @@ public class FriendNotesPlugin extends Plugin
if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() && event.getOption().equals("Message")) if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() && event.getOption().equals("Message"))
{ {
// Friends have color tags // Friends have color tags
setHoveredFriend(Text.removeTags(event.getTarget())); setHoveredFriend(Text.toJagexName(Text.removeTags(event.getTarget())));
// Build "Add Note" or "Edit Note" menu entry // Build "Add Note" or "Edit Note" menu entry
final MenuEntry addNote = new MenuEntry(); final MenuEntry addNote = new MenuEntry();
@@ -197,13 +197,13 @@ public class FriendNotesPlugin extends Plugin
return; return;
} }
//Friends have color tags
final String sanitizedTarget = Text.removeTags(event.getMenuTarget());
// Handle clicks on "Add Note" or "Edit Note" // Handle clicks on "Add Note" or "Edit Note"
if (event.getMenuOption().equals(ADD_NOTE) || event.getMenuOption().equals(EDIT_NOTE)) if (event.getMenuOption().equals(ADD_NOTE) || event.getMenuOption().equals(EDIT_NOTE))
{ {
event.consume(); event.consume();
//Friends have color tags
final String sanitizedTarget = Text.toJagexName(Text.removeTags(event.getMenuTarget()));
final String note = getFriendNote(sanitizedTarget); final String note = getFriendNote(sanitizedTarget);
// Open the new chatbox input dialog // Open the new chatbox input dialog
@@ -234,7 +234,16 @@ public class FriendNotesPlugin extends Plugin
{ {
// Migrate a friend's note to their new display name // Migrate a friend's note to their new display name
final Friend friend = (Friend) nameable; final Friend friend = (Friend) nameable;
migrateFriendNote(friend.getName(), friend.getPrevName()); String name = friend.getName();
String prevName = friend.getPrevName();
if (prevName != null)
{
migrateFriendNote(
Text.toJagexName(name),
Text.toJagexName(prevName)
);
}
} }
} }
@@ -242,7 +251,7 @@ public class FriendNotesPlugin extends Plugin
public void onRemovedFriend(RemovedFriend event) public void onRemovedFriend(RemovedFriend event)
{ {
// Delete a friend's note if they are removed // Delete a friend's note if they are removed
final String displayName = event.getName(); final String displayName = Text.toJagexName(event.getName());
log.debug("Remove friend: '{}'", displayName); log.debug("Remove friend: '{}'", displayName);
setFriendNote(displayName, null); setFriendNote(displayName, null);
} }
runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatConfig.java
+10
View File
@@ -52,6 +52,16 @@ public interface ItemStatConfig extends Config
return true; return true;
} }
@ConfigItem(
keyName = "geStats",
name = "Enable GE item information",
description = "Shows an item information panel when buying items in the GE"
)
default boolean geStats()
{
return true;
}
@ConfigItem( @ConfigItem(
keyName = "relative", keyName = "relative",
name = "Show Relative", name = "Show Relative",
runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
+365
View File
@@ -24,13 +24,46 @@
*/ */
package net.runelite.client.plugins.itemstats; package net.runelite.client.plugins.itemstats;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.FontMetrics;
import java.util.List;
import java.util.Map;
import java.util.Set;
import net.runelite.api.Client;
import net.runelite.api.FontID;
import net.runelite.api.InventoryID;
import net.runelite.api.Item;
import net.runelite.api.ItemContainer;
import net.runelite.api.ItemID;
import net.runelite.api.SpriteID;
import net.runelite.api.VarPlayer;
import net.runelite.api.Varbits;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.events.VarbitChanged;
import net.runelite.api.widgets.JavaScriptCallback;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetTextAlignment;
import net.runelite.api.widgets.WidgetType;
import net.runelite.client.callback.ClientThread;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.game.ItemManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.JagexColors;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.util.StackFormatter;
import net.runelite.http.api.item.ItemEquipmentStats;
import net.runelite.http.api.item.ItemStats;
@PluginDescriptor( @PluginDescriptor(
name = "Item Stats", name = "Item Stats",
@@ -39,12 +72,30 @@ import net.runelite.client.ui.overlay.OverlayManager;
) )
public class ItemStatPlugin extends Plugin public class ItemStatPlugin extends Plugin
{ {
private static final int ORANGE_TEXT = JagexColors.DARK_ORANGE_INTERFACE_TEXT.getRGB();
private static final int YELLOW_TEXT = JagexColors.YELLOW_INTERFACE_TEXT.getRGB();
private static final int TEXT_HEIGHT = 11;
@Inject @Inject
private OverlayManager overlayManager; private OverlayManager overlayManager;
@Inject @Inject
private ItemStatOverlay overlay; private ItemStatOverlay overlay;
@Inject
private Client client;
@Inject
private ItemManager itemManager;
@Inject
private ItemStatConfig config;
@Inject
private ClientThread clientThread;
private Widget itemInformationTitle;
@Provides @Provides
ItemStatConfig getConfig(ConfigManager configManager) ItemStatConfig getConfig(ConfigManager configManager)
{ {
@@ -67,5 +118,319 @@ public class ItemStatPlugin extends Plugin
protected void shutDown() throws Exception protected void shutDown() throws Exception
{ {
overlayManager.remove(overlay); overlayManager.remove(overlay);
clientThread.invokeLater(this::resetGEInventory);
}
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
if (event.getKey().equals("geStats"))
{
clientThread.invokeLater(this::resetGEInventory);
}
}
@Subscribe
public void onGameTick(GameTick event)
{
if (itemInformationTitle != null && config.geStats()
&& client.getWidget(WidgetInfo.GRAND_EXCHANGE_WINDOW_CONTAINER) == null)
{
resetGEInventory();
}
}
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
if (client.getVar(VarPlayer.CURRENT_GE_ITEM) == -1 && config.geStats())
{
resetGEInventory();
}
}
@Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent event)
{
if (event.getEventName().equals("geBuilt") && config.geStats())
{
int currentGeItem = client.getVar(VarPlayer.CURRENT_GE_ITEM);
if (currentGeItem != -1 && client.getVar(Varbits.GE_OFFER_CREATION_TYPE) == 0)
{
createItemInformation(currentGeItem);
}
}
}
private void createItemInformation(int id)
{
final ItemStats itemStats = itemManager.getItemStats(id, false);
if (itemStats == null || !itemStats.isEquipable())
{
return;
}
final ItemEquipmentStats equipmentStats = itemStats.getEquipment();
if (equipmentStats == null)
{
return;
}
final Widget geInv = client.getWidget(WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER);
if (geInv == null)
{
return;
}
final Widget invContainer = getInventoryContainer();
if (invContainer == null)
{
return;
}
invContainer.deleteAllChildren();
geInv.setHidden(true);
int yPos = 0;
final FontMetrics smallFM = client.getCanvas().getFontMetrics(FontManager.getRunescapeSmallFont());
// HEADER
itemInformationTitle = createText(invContainer, "Item Information", FontID.BOLD_12, ORANGE_TEXT,
8, 8, invContainer.getWidth(), 16);
itemInformationTitle.setYTextAlignment(WidgetTextAlignment.CENTER);
Widget closeButton = invContainer.createChild(-1, WidgetType.GRAPHIC);
closeButton.setOriginalY(8);
closeButton.setOriginalX(invContainer.getWidth() - 24);
closeButton.setOriginalHeight(16);
closeButton.setOriginalWidth(16);
closeButton.setSpriteId(SpriteID.BOTTOM_LINE_MODE_WINDOW_CLOSE_BUTTON_SMALL);
closeButton.setAction(0, "Close");
closeButton.setOnMouseOverListener((JavaScriptCallback) (ev) ->
{
closeButton.setSpriteId(SpriteID.BOTTOM_LINE_MODE_WINDOW_CLOSE_BUTTON_SMALL_HOVERED);
});
closeButton.setOnMouseLeaveListener((JavaScriptCallback) (ev) ->
{
closeButton.setSpriteId(SpriteID.BOTTOM_LINE_MODE_WINDOW_CLOSE_BUTTON_SMALL);
});
closeButton.setOnOpListener((JavaScriptCallback) (ev) -> resetGEInventory());
closeButton.setHasListener(true);
closeButton.revalidate();
yPos += 15;
createSeparator(invContainer, yPos);
// ICON AND TITLE
yPos += 25;
Widget icon = invContainer.createChild(-1, WidgetType.GRAPHIC);
icon.setOriginalX(8);
icon.setOriginalY(yPos);
icon.setOriginalWidth(36);
icon.setOriginalHeight(32);
icon.setItemId(id);
icon.setItemQuantityMode(0);
icon.setBorderType(1);
icon.revalidate();
Widget itemName = createText(invContainer, itemManager.getItemComposition(id).getName(), FontID.PLAIN_12, ORANGE_TEXT,
50, yPos, invContainer.getWidth() - 40, 30);
itemName.setYTextAlignment(WidgetTextAlignment.CENTER);
yPos += 20;
createSeparator(invContainer, yPos);
// STATS HEADER
yPos += 25;
createText(invContainer, "Attack", FontID.PLAIN_11, ORANGE_TEXT, 5, yPos, 50, -1);
int defenceXPos = invContainer.getWidth() - (smallFM.stringWidth("Defence") + 5);
createText(invContainer, "Defence", FontID.PLAIN_11, ORANGE_TEXT, defenceXPos, yPos, 50, -1);
// STYLE BONUSES
final Set<String> stats = ImmutableSet.of(
"Stab",
"Slash",
"Crush",
"Magic",
"Ranged"
);
final List<Integer> attackStats = ImmutableList.of(
equipmentStats.getAstab(),
equipmentStats.getAslash(),
equipmentStats.getAcrush(),
equipmentStats.getAmagic(),
equipmentStats.getArange()
);
final List<Integer> defenceStats = ImmutableList.of(
equipmentStats.getDstab(),
equipmentStats.getDslash(),
equipmentStats.getDcrush(),
equipmentStats.getDmagic(),
equipmentStats.getDrange()
);
int index = 0;
for (final String stat : stats)
{
yPos += TEXT_HEIGHT + 2;
// Style label
final Widget styleText = createText(invContainer, stat, FontID.PLAIN_11, ORANGE_TEXT,
0, yPos, invContainer.getWidth(), -1);
styleText.setXTextAlignment(WidgetTextAlignment.CENTER);
// Attack bonus
createText(invContainer, attackStats.get(index).toString(), FontID.PLAIN_11, YELLOW_TEXT,
5, yPos, 50, -1);
// Defence bonus
final int defenceX = invContainer.getWidth() - (smallFM.stringWidth(defenceStats.get(index).toString()) + 5);
createText(invContainer, defenceStats.get(index).toString(), FontID.PLAIN_11, YELLOW_TEXT,
defenceX, yPos, 50, -1);
index++;
}
// MISC BONUSES
yPos += TEXT_HEIGHT + 8;
final Map<String, Integer> miscStats = ImmutableMap.of(
"Strength", equipmentStats.getStr(),
"Ranged Strength", equipmentStats.getRstr(),
"Magic Damage", equipmentStats.getMdmg(),
"Prayer Bonus", equipmentStats.getPrayer()
);
for (final Map.Entry<String, Integer> miscStat : miscStats.entrySet())
{
final String name = miscStat.getKey();
final String value = miscStat.getValue().toString();
// Stat label
createText(invContainer, name, FontID.PLAIN_11, ORANGE_TEXT, 5, yPos, 50, -1);
// Stat bonus
int valueXPos = invContainer.getWidth() - (smallFM.stringWidth(value) + 5);
createText(invContainer, value, FontID.PLAIN_11, YELLOW_TEXT, valueXPos, yPos, 50, -1);
yPos += TEXT_HEIGHT + 2;
}
// COINS
createSeparator(invContainer, invContainer.getHeight() - 40);
final String coinText = "You have " + StackFormatter.quantityToRSStackSize(getCurrentGP())
+ (getCurrentGP() == 1 ? " coin." : " coins.");
final Widget coinWidget = createText(invContainer, coinText, FontID.PLAIN_12, ORANGE_TEXT,
0, invContainer.getHeight() - 18, invContainer.getWidth(), -1);
coinWidget.setXTextAlignment(WidgetTextAlignment.CENTER);
}
private static Widget createText(Widget parent, String text, int fontId, int textColor,
int x, int y, int width, int height)
{
final Widget widget = parent.createChild(-1, WidgetType.TEXT);
widget.setText(text);
widget.setFontId(fontId);
widget.setTextColor(textColor);
widget.setTextShadowed(true);
widget.setOriginalHeight(height == -1 ? TEXT_HEIGHT : height);
widget.setOriginalWidth(width);
widget.setOriginalY(y);
widget.setOriginalX(x);
widget.revalidate();
return widget;
}
private static void createSeparator(Widget parent, int y)
{
Widget separator = parent.createChild(-1, WidgetType.GRAPHIC);
separator.setOriginalWidth(parent.getWidth());
separator.setOriginalY(y);
separator.setOriginalHeight(32);
separator.setSpriteId(SpriteID.UNKNOWN_BORDER_EDGE_HORIZONTAL_995);
separator.revalidate();
}
private void resetGEInventory()
{
final Widget invContainer = getInventoryContainer();
if (invContainer == null)
{
return;
}
if (itemInformationTitle != null && invContainer.getChild(0) == itemInformationTitle)
{
invContainer.deleteAllChildren();
itemInformationTitle = null;
}
final Widget geInv = client.getWidget(WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER);
if (geInv != null)
{
geInv.setHidden(false);
}
}
private int getCurrentGP()
{
final ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY);
if (inventory == null)
{
return 0;
}
for (final Item item : inventory.getItems())
{
if (item.getId() == ItemID.COINS_995)
{
return item.getQuantity();
}
}
return 0;
}
private Widget getInventoryContainer()
{
if (client.isResized())
{
if (client.getVar(Varbits.SIDE_PANELS) == 1)
{
return client.getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_CONTAINER);
}
else
{
return client.getWidget(WidgetInfo.RESIZABLE_VIEWPORT_INVENTORY_CONTAINER);
}
}
else
{
return client.getWidget(WidgetInfo.FIXED_VIEWPORT_INVENTORY_CONTAINER);
}
} }
} }
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java
+2 -2
View File
@@ -148,8 +148,8 @@ enum PrayerItems
ANCIENT_DHIDE(ItemID.ANCIENT_DHIDE, 1), ANCIENT_DHIDE(ItemID.ANCIENT_DHIDE, 1),
ARMADYL_DHIDE(ItemID.ARMADYL_DHIDE, 1), ARMADYL_DHIDE(ItemID.ARMADYL_DHIDE, 1),
BANDOS_DHIDE(ItemID.BANDOS_DHIDE, 1), BANDOS_DHIDE(ItemID.BANDOS_DHIDE, 1),
GUTHIX_DRAGONHIDE(ItemID.GUTHIX_DRAGONHIDE, 1), GUTHIX_DRAGONHIDE(ItemID.GUTHIX_DHIDE, 1),
GUTHIX_DRAGONHIDE_10794(ItemID.GUTHIX_DRAGONHIDE_10794, 1), GUTHIX_DRAGONHIDE_10794(ItemID.GUTHIX_DRAGONHIDE, 1),
SARADOMIN_DHIDE(ItemID.SARADOMIN_DHIDE, 1), SARADOMIN_DHIDE(ItemID.SARADOMIN_DHIDE, 1),
SARADOMIN_DHIDE_10792(ItemID.SARADOMIN_DHIDE_10792, 1), SARADOMIN_DHIDE_10792(ItemID.SARADOMIN_DHIDE_10792, 1),
ZAMORAK_DHIDE(ItemID.ZAMORAK_DHIDE, 1), ZAMORAK_DHIDE(ItemID.ZAMORAK_DHIDE, 1),
runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
+1 -1
View File
@@ -65,7 +65,7 @@ enum Task
CAVE_SLIMES("Cave slimes", ItemID.SWAMP_CAVE_SLIME), CAVE_SLIMES("Cave slimes", ItemID.SWAMP_CAVE_SLIME),
CERBERUS("Cerberus", ItemID.HELLPUPPY), CERBERUS("Cerberus", ItemID.HELLPUPPY),
CHAOS_ELEMENTAL("Chaos Elemental", ItemID.PET_CHAOS_ELEMENTAL), CHAOS_ELEMENTAL("Chaos Elemental", ItemID.PET_CHAOS_ELEMENTAL),
CHAOS_FANATIC("Chaos Fanatic", ItemID.PET_CHAOS_ELEMENTAL), CHAOS_FANATIC("Chaos Fanatic", ItemID.ANCIENT_STAFF),
COCKATRICE("Cockatrice", ItemID.COCKATRICE, "Cockathrice"), COCKATRICE("Cockatrice", ItemID.COCKATRICE, "Cockathrice"),
COWS("Cows", ItemID.COW_MASK), COWS("Cows", ItemID.COW_MASK),
CRAWLING_HANDS("Crawling hands", ItemID.CRAWLING_HAND, "Crushing hand"), CRAWLING_HANDS("Crawling hands", ItemID.CRAWLING_HAND, "Crushing hand"),
runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
+7 -1
View File
@@ -131,6 +131,9 @@ public class WikiPlugin extends Plugin
return; return;
} }
children[0] = null; children[0] = null;
onDeselect();
client.setSpellSelected(false);
}); });
} }
@@ -186,7 +189,10 @@ public class WikiPlugin extends Plugin
private void onDeselect() private void onDeselect()
{ {
wikiSelected = false; wikiSelected = false;
icon.setSpriteId(WikiSprite.WIKI_ICON.getSpriteId()); if (icon != null)
{
icon.setSpriteId(WikiSprite.WIKI_ICON.getSpriteId());
}
} }
@Subscribe @Subscribe
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java
+3 -2
View File
@@ -79,7 +79,7 @@ class XpState
if (state.getStartXp() == -1) if (state.getStartXp() == -1)
{ {
if (currentXp > 0) if (currentXp >= 0)
{ {
initializeSkill(skill, currentXp); initializeSkill(skill, currentXp);
return XpUpdateResult.INITIALIZED; return XpUpdateResult.INITIALIZED;
@@ -198,7 +198,8 @@ class XpState
boolean isInitialized(Skill skill) boolean isInitialized(Skill skill)
{ {
return xpSkills.containsKey(skill); XpStateSingle xpStateSingle = xpSkills.get(skill);
return xpStateSingle != null && xpStateSingle.getStartXp() != -1;
} }
@NonNull @NonNull
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
+3 -1
View File
@@ -305,7 +305,9 @@ public class XpTrackerPlugin extends Plugin
if (skill == Skill.CONSTRUCTION && updateResult == XpUpdateResult.INITIALIZED) if (skill == Skill.CONSTRUCTION && updateResult == XpUpdateResult.INITIALIZED)
{ {
// Construction is the last skill initialized on login, now initialize the total experience // Construction is the last skill initialized on login, now initialize the total experience
xpState.initializeSkill(Skill.OVERALL, client.getOverallExperience()); long overallXp = client.getOverallExperience();
log.debug("Initializing XP tracker with {} overall exp", overallXp);
xpState.initializeSkill(Skill.OVERALL, overallXp);
} }
else if (xpState.isInitialized(Skill.OVERALL)) else if (xpState.isInitialized(Skill.OVERALL))
{ {
runelite-client/src/main/java/net/runelite/client/ui/JagexColors.java
+6
View File
@@ -62,4 +62,10 @@ public class JagexColors
public static final Color TOOLTIP_BACKGROUND = new Color(255, 255, 160); public static final Color TOOLTIP_BACKGROUND = new Color(255, 255, 160);
public static final Color TOOLTIP_BORDER = Color.BLACK; public static final Color TOOLTIP_BORDER = Color.BLACK;
public static final Color TOOLTIP_TEXT = Color.BLACK; public static final Color TOOLTIP_TEXT = Color.BLACK;
/*
* Colors used in interfaces
*/
public static final Color DARK_ORANGE_INTERFACE_TEXT = new Color(255, 152, 31);
public static final Color YELLOW_INTERFACE_TEXT = Color.YELLOW;
} }
runelite-client/src/main/resources/item_variations.json
+6 -4
View File
@@ -6705,10 +6705,6 @@
10370, 10370,
10790 10790
], ],
"guthix dragonhide": [
10378,
10794
],
"saradomin dhide": [ "saradomin dhide": [
10386, 10386,
10792 10792
@@ -8908,5 +8904,11 @@
23067, 23067,
23068, 23068,
23070 23070
],
"mystic set": [
23110,
23113,
23116,
23119
] ]
} }
runelite-client/src/main/scripts/BankSearchFilter.rs2asm
+34 -34
View File
@@ -3,68 +3,68 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 1 .int_var_count 1
.string_var_count 2 .string_var_count 2
load_string "" sconst ""
sstore 0 sstore 0
load_string "" sconst ""
sstore 1 sstore 1
invoke 514 invoke 514
load_int 1 iconst 1
if_icmpeq LABEL8 if_icmpeq LABEL8
jump LABEL34 jump LABEL34
LABEL8: LABEL8:
049 359 ; Skip truncating of varcstr 22 by not calling 280 get_varc_string 359 ; Skip truncating of varcstr 22 by not calling 280
tolowercase ; instead get the var directly and lowercase it lowercase ; instead get the var directly and lowercase it
sstore 1 sstore 1
sload 1 sload 1
string_length string_length
load_int 0 iconst 0
if_icmpgt LABEL15 if_icmpgt LABEL15
jump LABEL34 jump LABEL34
LABEL15: LABEL15:
iload 0 iload 0
load_int -1 iconst -1
if_icmpne LABEL19 if_icmpne LABEL19
jump LABEL23 jump LABEL23
LABEL19: LABEL19:
iload 0 iload 0
get_item_name oc_name
tolowercase lowercase
sstore 0 sstore 0
LABEL1337: ; check if the bank tags plugin is active LABEL1337:; check if the bank tags plugin is active
load_int 1 ; true iconst 1 ; true
load_int 0 ; load active boolean iconst 0 ; load active boolean
load_string "bankTagsActive" ; push event name sconst "bankTagsActive" ; push event name
runelite_callback ; invoke callback runelite_callback ; invoke callback
if_icmpeq LABEL1338 ; if the plugin is active then jump to the label that decides if the if_icmpeq LABEL1338 ; if the plugin is active then jump to the label that decides if the
; item should be shown ; item should be shown
jump LABEL23 ; if the plugin is not active then jump to the normal label jump LABEL23 ; if the plugin is not active then jump to the normal label
LABEL1338: ; let the bank tag plugin decide if the item should be shown LABEL1338:; let the bank tag plugin decide if the item should be shown
load_int 0 ; load return value iconst 0 ; load return value
iload 0 ; load item id iload 0 ; load item id
sload 0 ; load item name sload 0 ; load item name
sload 1 ; load search string sload 1 ; load search string
load_string "bankSearchFilter" ; push event name sconst "bankSearchFilter" ; push event name
runelite_callback ; invoke callback runelite_callback ; invoke callback
pop_int ; pop item id pop_int ; pop item id
pop_string ; pop search string pop_string ; pop search string
pop_string ; pop item name pop_string ; pop item name
return ; return value return ; return value
LABEL23: LABEL23:
sload 0 sload 0
sload 1 sload 1
load_int 0 iconst 0
string_indexof_from string_indexof_string
load_int -1 iconst -1
if_icmpne LABEL30 if_icmpne LABEL30
jump LABEL32 jump LABEL32
LABEL30: LABEL30:
load_int 1 iconst 1
return return
LABEL32: LABEL32:
load_int 0 iconst 0
return return
LABEL34: LABEL34:
load_int 1 iconst 1
return return
load_int -1 iconst -1
return return
runelite-client/src/main/scripts/BankSearchLayout.rs2asm
+288 -288
View File
File diff suppressed because it is too large Load Diff
runelite-client/src/main/scripts/ChatBuilder.rs2asm
+453 -453
View File
File diff suppressed because it is too large Load Diff
runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
+285 -285
View File
@@ -3,207 +3,207 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 16 .int_var_count 16
.string_var_count 4 .string_var_count 4
load_int 0 iconst 0
istore 1 istore 1
load_int 2 iconst 2
istore 2 istore 2
load_int 103 iconst 103
istore 3 istore 3
load_int 4 iconst 4
istore 4 istore 4
load_int 23 iconst 23
istore 5 istore 5
invoke 900 invoke 900
istore 6 istore 6
load_int 103 iconst 103
load_int 105 iconst 105
load_int 1136 iconst 1136
iload 6 iload 6
get_enum_value enum
load_int 0 iconst 0
if_icmpgt LABEL20 if_icmpgt LABEL20
jump LABEL58 jump LABEL58
LABEL20: LABEL20:
iload 6 iload 6
load_int 1745 iconst 1745
if_icmpeq LABEL24 if_icmpeq LABEL24
jump LABEL36 jump LABEL36
LABEL24: LABEL24:
load_int 0 iconst 0
load_int 102 iconst 102
load_int 103 iconst 103
load_int 105 iconst 105
load_int 1960 iconst 1960
iload 6 iload 6
get_enum_value enum
load_int 30 iconst 30
istore 5 istore 5
istore 1 istore 1
istore 3 istore 3
istore 2 istore 2
LABEL36: LABEL36:
get_varc 41 get_varc_int 41
load_int -1 iconst -1
if_icmpeq LABEL40 if_icmpeq LABEL40
jump LABEL49 jump LABEL49
LABEL40: LABEL40:
invoke 922 invoke 922
load_int 1 iconst 1
if_icmpeq LABEL44 if_icmpeq LABEL44
jump LABEL49 jump LABEL49
LABEL44: LABEL44:
iload 4 iload 4
iload 5 iload 5
iadd add
istore 4 istore 4
jump LABEL58 jump LABEL58
LABEL49: LABEL49:
iload 4 iload 4
load_int 73 iconst 73
load_int 73 iconst 73
iload 6 iload 6
load_int 10551325 iconst 10551325
get_enum_value enum
widget_get_height_widget if_getheight
iadd add
istore 4 istore 4
LABEL58: LABEL58:
iload 4 iload 4
istore 7 istore 7
load_int 10682368 iconst 10682368
widget_get_width_widget if_getwidth
istore 8 istore 8
load_int 0 iconst 0
istore 9 istore 9
load_int 105 iconst 105
load_int 73 iconst 73
load_int 580 iconst 580
iload 9 iload 9
get_enum_value enum
istore 10 istore 10
load_int 0 iconst 0
istore 11 istore 11
load_string "" sconst ""
sstore 0 sstore 0
get_system_update_timer reboottimer
load_int 0 iconst 0
if_icmpgt LABEL79 if_icmpgt LABEL79
jump LABEL156 jump LABEL156
LABEL79: LABEL79:
get_system_update_timer reboottimer
load_int 50 iconst 50
idiv div
load_int 60 iconst 60
modulo mod
istore 11 istore 11
iload 11 iload 11
load_int 10 iconst 10
if_icmplt LABEL89 if_icmplt LABEL89
jump LABEL100 jump LABEL100
LABEL89: LABEL89:
load_string "System update in: " sconst "System update in: "
get_system_update_timer reboottimer
load_int 3000 iconst 3000
idiv div
int_to_string tostring
load_string ":0" sconst ":0"
iload 11 iload 11
int_to_string tostring
string_append 4 join_string 4
sstore 0 sstore 0
jump LABEL110 jump LABEL110
LABEL100: LABEL100:
load_string "System update in: " sconst "System update in: "
get_system_update_timer reboottimer
load_int 3000 iconst 3000
idiv div
int_to_string tostring
load_string ":" sconst ":"
iload 11 iload 11
int_to_string tostring
string_append 4 join_string 4
sstore 0 sstore 0
LABEL110: LABEL110:
iload 7 iload 7
sload 0 sload 0
iload 9 iload 9
iload 10 iload 10
load_int 10682368 iconst 10682368
iload 8 iload 8
iload 1 iload 1
load_int 13 iconst 13
iload 7 iload 7
iload 2 iload 2
iload 3 iload 3
load_int 16776960 iconst 16776960
load_int 1 iconst 1
invoke 199 invoke 199
iadd add
istore 7 istore 7
iload 10 iload 10
widget_put_actions_null_widget if_clearops
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_option_click_listener_widget if_setonop
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_mouse_exit_listener_widget if_setonmouseleave
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
iload 10 iload 10
widget_put_size_widget if_setsize
iload 9 iload 9
load_int 1 iconst 1
iadd add
istore 9 istore 9
load_int 105 iconst 105
load_int 73 iconst 73
load_int 580 iconst 580
iload 9 iload 9
get_enum_value enum
istore 10 istore 10
LABEL156: LABEL156:
load_int -1 iconst -1
istore 12 istore 12
load_int -1 iconst -1
istore 13 istore 13
load_string "" sconst ""
sstore 1 sstore 1
load_int 0 iconst 0
istore 14 istore 14
load_string "" sconst ""
sstore 2 sstore 2
load_string "" sconst ""
sstore 3 sstore 3
get_varc 55 get_varc_int 55
get_varc 202 get_varc_int 202
if_icmpge LABEL172 if_icmpge LABEL172
jump LABEL282 jump LABEL282
LABEL172: LABEL172:
get_varc 55 get_varc_int 55
get_gamecycle clientclock
load_int 3000 iconst 3000
isub sub
if_icmpgt LABEL178 if_icmpgt LABEL178
jump LABEL282 jump LABEL282
LABEL178: LABEL178:
load_int 14 iconst 14
get_chatlinebuffer_length chat_gethistorylength
load_int 0 iconst 0
if_icmpgt LABEL183 if_icmpgt LABEL183
jump LABEL282 jump LABEL282
LABEL183: LABEL183:
load_int 14 iconst 14
load_int 0 iconst 0
get_chat_message_type chat_gethistory_bytypeandline
istore 14 istore 14
sstore 0 sstore 0
sstore 2 sstore 2
@@ -211,7 +211,7 @@ LABEL183:
istore 13 istore 13
istore 12 istore 12
iload 12 iload 12
load_int -1 iconst -1
if_icmpne LABEL196 if_icmpne LABEL196
jump LABEL282 jump LABEL282
LABEL196: LABEL196:
@@ -223,124 +223,124 @@ LABEL196:
sload 0 sload 0
iload 9 iload 9
iload 10 iload 10
load_int 10682368 iconst 10682368
iload 8 iload 8
iload 1 iload 1
load_int 13 iconst 13
iload 7 iload 7
iload 2 iload 2
iload 3 iload 3
load_int 16776960 iconst 16776960
load_int 1 iconst 1
invoke 199 invoke 199
iadd add
istore 7 istore 7
iload 10 iload 10
widget_put_actions_null_widget if_clearops
sload 3 sload 3
string_length string_length
load_int 0 iconst 0
if_icmpgt LABEL223 if_icmpgt LABEL223
jump LABEL248 jump LABEL248
LABEL223: LABEL223:
load_int 6 iconst 6
load_string "Open" sconst "Open"
iload 10 iload 10
widget_put_action_widget if_setop
load_int 7 iconst 7
load_string "Check" sconst "Check"
iload 10 iload 10
widget_put_action_widget if_setop
load_int 2065 iconst 2065
iload 10 iload 10
widget_get_parentid_widget if_getlayer
iload 9 iload 9
load_int 16777215 iconst 16777215
load_string "Iii" sconst "Iii"
iload 10 iload 10
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int 2065 iconst 2065
iload 10 iload 10
widget_get_parentid_widget if_getlayer
iload 9 iload 9
load_int 16776960 iconst 16776960
load_string "Iii" sconst "Iii"
iload 10 iload 10
widget_put_mouse_exit_listener_widget if_setonmouseleave
jump LABEL256 jump LABEL256
LABEL248: LABEL248:
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_mouse_exit_listener_widget if_setonmouseleave
LABEL256: LABEL256:
load_int 9 iconst 9
load_string "Clear history" sconst "Clear history"
iload 10 iload 10
widget_put_action_widget if_setop
load_string "<col=ff9040>" sconst "<col=ff9040>"
load_string "Notification" sconst "Notification"
load_string "</col>" sconst "</col>"
string_append 3 join_string 3
iload 10 iload 10
widget_put_name_widget if_setopbase
load_int 2064 iconst 2064
load_int -2147483644 iconst -2147483644
sload 3 sload 3
load_string "is" sconst "is"
iload 10 iload 10
widget_put_option_click_listener_widget if_setonop
iload 9 iload 9
load_int 1 iconst 1
iadd add
istore 9 istore 9
load_int 105 iconst 105
load_int 73 iconst 73
load_int 580 iconst 580
iload 9 iload 9
get_enum_value enum
istore 10 istore 10
LABEL282: LABEL282:
iload 0 iload 0
istore 12 istore 12
load_int 0 iconst 0
istore 15 istore 15
get_varp 287 get_varp 287
load_int 1 iconst 1
if_icmpeq LABEL290 if_icmpeq LABEL290
jump LABEL479 jump LABEL479
LABEL290: LABEL290:
get_varc 41 get_varc_int 41
load_int -1 iconst -1
if_icmpne LABEL297 if_icmpne LABEL297
get_varbit 4089 get_varbit 4089
load_int 0 iconst 0
if_icmpeq LABEL297 if_icmpeq LABEL297
jump LABEL479 jump LABEL479
LABEL297: LABEL297:
iload 12 iload 12
load_int -1 iconst -1
if_icmpne LABEL301 if_icmpne LABEL301
jump LABEL479 jump LABEL479
LABEL301: LABEL301:
iload 10 iload 10
load_int -1 iconst -1
if_icmpne LABEL305 if_icmpne LABEL305
jump LABEL479 jump LABEL479
LABEL305: LABEL305:
iload 7 iload 7
iload 4 iload 4
isub sub
load_int 57 iconst 57
if_icmplt LABEL311 if_icmplt LABEL311
jump LABEL479 jump LABEL479
LABEL311: LABEL311:
iload 12 iload 12
get_chat_message chat_gethistory_byuid
istore 14 istore 14
sstore 0 sstore 0
sstore 2 sstore 2
@@ -352,7 +352,7 @@ LABEL311:
iload 13 iload 13
iload 14 iload 14
invoke 91 invoke 91
load_int 1 iconst 1
if_icmpeq LABEL327 if_icmpeq LABEL327
jump LABEL475 jump LABEL475
LABEL327: LABEL327:
@@ -364,50 +364,50 @@ LABEL327:
jump LABEL372 jump LABEL372
LABEL330: LABEL330:
iload 7 iload 7
load_string "From " sconst "From "
sload 1 sload 1
load_string ":" sconst ":"
load_string "privateChatSplitFrom" sconst "privateChatSplitFrom"
runelite_callback runelite_callback
string_append 3 join_string 3
sload 0 sload 0
iload 9 iload 9
iload 10 iload 10
load_int 10682368 iconst 10682368
iload 8 iload 8
iload 1 iload 1
load_int 13 iconst 13
iload 7 iload 7
iload 2 iload 2
iload 3 iload 3
load_int 65535 iconst 65535
load_int 1 iconst 1
invoke 203 invoke 203
iadd add
istore 7 istore 7
jump LABEL407 jump LABEL407
LABEL351: LABEL351:
iload 7 iload 7
load_string "To " sconst "To "
sload 1 sload 1
load_string ":" sconst ":"
load_string "privateChatSplitTo" sconst "privateChatSplitTo"
runelite_callback runelite_callback
string_append 3 join_string 3
sload 0 sload 0
iload 9 iload 9
iload 10 iload 10
load_int 10682368 iconst 10682368
iload 8 iload 8
iload 1 iload 1
load_int 13 iconst 13
iload 7 iload 7
iload 2 iload 2
iload 3 iload 3
load_int 65535 iconst 65535
load_int 1 iconst 1
invoke 203 invoke 203
iadd add
istore 7 istore 7
jump LABEL407 jump LABEL407
LABEL372: LABEL372:
@@ -415,184 +415,184 @@ LABEL372:
sload 0 sload 0
iload 9 iload 9
iload 10 iload 10
load_int 10682368 iconst 10682368
iload 8 iload 8
iload 1 iload 1
load_int 13 iconst 13
iload 7 iload 7
iload 2 iload 2
iload 3 iload 3
load_int 65535 iconst 65535
load_int 1 iconst 1
invoke 199 invoke 199
iadd add
istore 7 istore 7
iload 15 iload 15
load_int 5 iconst 5
if_icmpeq LABEL392 if_icmpeq LABEL392
jump LABEL407 jump LABEL407
LABEL392: LABEL392:
get_varbit 1627 get_varbit 1627
load_int 0 iconst 0
if_icmpeq LABEL396 if_icmpeq LABEL396
jump LABEL407 jump LABEL407
LABEL396: LABEL396:
iload 13 iload 13
load_int 500 iconst 500
iadd add
load_int 1 iconst 1
iadd add
put_varc 65 set_varc_int 65
load_int 664 iconst 664
load_int 0 iconst 0
load_string "1" sconst "1"
load_int 10616832 iconst 10616832
widget_put_render_listener_widget if_setontimer
LABEL407: LABEL407:
iload 10 iload 10
widget_put_actions_null_widget if_clearops
iload 15 iload 15
load_int 3 iconst 3
if_icmpeq LABEL419 if_icmpeq LABEL419
iload 15 iload 15
load_int 6 iconst 6
if_icmpeq LABEL419 if_icmpeq LABEL419
iload 15 iload 15
load_int 7 iconst 7
if_icmpeq LABEL419 if_icmpeq LABEL419
jump LABEL453 jump LABEL453
LABEL419: LABEL419:
iload 14 iload 14
load_int 1 iconst 1
if_icmpeq LABEL423 if_icmpeq LABEL423
jump LABEL428 jump LABEL428
LABEL423: LABEL423:
load_int 8 iconst 8
load_string "Message" sconst "Message"
iload 10 iload 10
widget_put_action_widget if_setop
jump LABEL436 jump LABEL436
LABEL428: LABEL428:
load_int 8 iconst 8
load_string "Add friend" sconst "Add friend"
iload 10 iload 10
widget_put_action_widget if_setop
load_int 9 iconst 9
load_string "Add ignore" sconst "Add ignore"
iload 10 iload 10
widget_put_action_widget if_setop
LABEL436: LABEL436:
load_int 10 iconst 10
load_string "Report" sconst "Report"
iload 10 iload 10
widget_put_action_widget if_setop
load_string "<col=ffffff>" sconst "<col=ffffff>"
sload 1 sload 1
load_string "</col>" sconst "</col>"
string_append 3 join_string 3
iload 10 iload 10
widget_put_name_widget if_setopbase
load_int 88 iconst 88
load_int -2147483644 iconst -2147483644
load_string "event_opbase" sconst "event_opbase"
load_string "is" sconst "is"
iload 10 iload 10
widget_put_option_click_listener_widget if_setonop
jump LABEL457 jump LABEL457
LABEL453: LABEL453:
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_option_click_listener_widget if_setonop
LABEL457: LABEL457:
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_mouse_exit_listener_widget if_setonmouseleave
iload 9 iload 9
load_int 1 iconst 1
iadd add
istore 9 istore 9
load_int 105 iconst 105
load_int 73 iconst 73
load_int 580 iconst 580
iload 9 iload 9
get_enum_value enum
istore 10 istore 10
LABEL475: LABEL475:
iload 12 iload 12
get_messagenode_next_id chat_getprevuid
istore 12 istore 12
jump LABEL297 jump LABEL297
LABEL479: LABEL479:
iload 10 iload 10
load_int -1 iconst -1
if_icmpne LABEL483 if_icmpne LABEL483
jump LABEL540 jump LABEL540
LABEL483: LABEL483:
iload 10 iload 10
widget_put_actions_null_widget if_clearops
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_option_click_listener_widget if_setonop
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int -1 iconst -1
load_string "" sconst ""
iload 10 iload 10
widget_put_mouse_exit_listener_widget if_setonmouseleave
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
iload 10 iload 10
widget_put_size_widget if_setsize
load_int 10682368 iconst 10682368
iload 9 iload 9
load_int 2 iconst 2
imul multiply
widget_load_child cc_find
load_int 1 iconst 1
if_icmpeq LABEL511 if_icmpeq LABEL511
jump LABEL515 jump LABEL515
LABEL511: LABEL511:
load_string "" sconst ""
widget_put_text cc_settext
load_int 1 iconst 1
widget_put_hidden cc_sethide
LABEL515: LABEL515:
load_int 10682368 iconst 10682368
iload 9 iload 9
load_int 2 iconst 2
imul multiply
load_int 1 iconst 1
iadd add
widget_load_child cc_find
load_int 1 iconst 1
if_icmpeq LABEL525 if_icmpeq LABEL525
jump LABEL529 jump LABEL529
LABEL525: LABEL525:
load_string "" sconst ""
widget_put_text cc_settext
load_int 1 iconst 1
widget_put_hidden cc_sethide
LABEL529: LABEL529:
iload 9 iload 9
load_int 1 iconst 1
iadd add
istore 9 istore 9
load_int 105 iconst 105
load_int 73 iconst 73
load_int 580 iconst 580
iload 9 iload 9
get_enum_value enum
istore 10 istore 10
jump LABEL479 jump LABEL479
LABEL540: LABEL540:
runelite-client/src/main/scripts/ChatboxInput.rs2asm
+24 -24
View File
@@ -5,47 +5,47 @@
.string_var_count 1 .string_var_count 1
sload 0 ; load input sload 0 ; load input
iload 0 ; load chat type iload 0 ; load chat type
load_string "chatboxInput" ; event name sconst "chatboxInput" ; event name
runelite_callback ; invoke callback runelite_callback ; invoke callback
pop_int ; pop chat type pop_int ; pop chat type
string_length ; get string length of chat message string_length ; get string length of chat message
load_int 0 ; load 0 iconst 0 ; load 0
if_icmpne LABEL100 ; if length is not 0, continue if_icmpne LABEL100 ; if length is not 0, continue
return return
LABEL100: LABEL100:
get_varbit 4394 get_varbit 4394
load_int 1 iconst 1
if_icmpeq LABEL4 if_icmpeq LABEL4
jump LABEL24 jump LABEL24
LABEL4: LABEL4:
iload 0 iload 0
load_int 1 iconst 1
if_icmpeq LABEL8 if_icmpeq LABEL8
jump LABEL16 jump LABEL16
LABEL8: LABEL8:
get_localplayer_name chat_playername
load_string ": " sconst ": "
load_string "<col=2020ef>" sconst "<col=2020ef>"
sload 0 sload 0
load_string "</col>" sconst "</col>"
string_append 5 join_string 5
send_game_message mes
jump LABEL23 jump LABEL23
LABEL16: LABEL16:
get_localplayer_name chat_playername
load_string ": " sconst ": "
load_string "<col=0000ff>" sconst "<col=0000ff>"
sload 0 sload 0
load_string "</col>" sconst "</col>"
string_append 5 join_string 5
send_game_message mes
LABEL23: LABEL23:
jump LABEL27 jump LABEL27
LABEL24: LABEL24:
sload 0 sload 0
iload 0 iload 0
chatbox_input chat_sendpublic
LABEL27: LABEL27:
get_gamecycle clientclock
put_varc 61 set_varc_int 61
return return
runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm
-79
View File
@@ -1,79 +0,0 @@
; Copyright (c) 2018 Abex
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions are met:
;
; 1. Redistributions of source code must retain the above copyright notice, this
; list of conditions and the following disclaimer.
; 2. Redistributions in binary form must reproduce the above copyright notice,
; this list of conditions and the following disclaimer in the documentation
; and/or other materials provided with the distribution.
;
; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;
; Keylistener for ChatboxInputInit
;
; Script 112 Normal keylistener
;
; @param int pressedKey
; @param int typedKey
;;
.id 10002
.int_stack_count 1
.string_stack_count 1
.int_var_count 2
.string_var_count 1
; If we are not the active listener, the widget ids have probably changed
get_varc 5
load_int -2
if_icmpeq LABEL2
; Log the error
load_string "Got input while not active; Widget ids in ChatboxInputInit are probably wrong."
load_string "debug"
runelite_callback
return
LABEL2:
; Discard zero presses
iload 0
load_int 0
if_icmpeq LABEL1
; Call runelite
iload 0
get_varc_string 22
load_string "chatboxInputHandler"
runelite_callback
istore 0
put_varc_string 22
; Check return value
iload 0
load_int 1
if_icmpne LABEL0
; Close the dialog
load_int 1
load_int 1
invoke 299
; Update UI
LABEL0:
load_string ""
invoke 222
LABEL1:
return
runelite-client/src/main/scripts/ChatboxInputInit.rs2asm
-88
View File
@@ -1,88 +0,0 @@
; Copyright (c) 2018 Abex
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions are met:
;
; 1. Redistributions of source code must retain the above copyright notice, this
; list of conditions and the following disclaimer.
; 2. Redistributions in binary form must reproduce the above copyright notice,
; this list of conditions and the following disclaimer in the documentation
; and/or other materials provided with the distribution.
;
; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;
; Creates a chatbox text input
;
; @param String Prompt text
; @param String Default value
;
; Script 752 GE input panel
; Script 103-111 various input panels
; Script 74 validates input
; script 112 key callback
;;
.id 10001
.int_stack_count 0
.string_stack_count 2
.int_var_count 0
.string_var_count 2
; Hide the chat pane
invoke 677
; Set current value
sload 1
put_varc_string 22
; Mark varcstring22 for our use
load_int -2
put_varc 5
; Set text
sload 0
load_int 10616876
widget_put_text_widget
; Init the widgets
load_string ""
invoke 222
; Register the key listener
load_int 10002
load_int -2147483639 ; typedKey
load_string "i"
load_int 10616877
widget_put_key_listener_widget
; Restore the chatbox on exit
load_int 299
load_int 1
load_int 1
load_string "ii"
load_int 10616877
widget_put_dialog_abort_listener_widget
; 70% sure this opens the keyboard on mobile
invoke 1972
load_int 1
if_icmpeq LABEL25
jump LABEL26
LABEL25:
load_int 1
load_int 10
invoke 1983
LABEL26:
return
runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm
+109 -109
View File
@@ -3,166 +3,166 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 4 .int_var_count 4
.string_var_count 3 .string_var_count 3
load_string "<col=0000ff>" sconst "<col=0000ff>"
sstore 0 sstore 0
load_int 0 iconst 0
istore 0 istore 0
load_int 6250335 iconst 6250335
istore 1 istore 1
invoke 921 invoke 921
load_int 1 iconst 1
if_icmpeq LABEL10 if_icmpeq LABEL10
jump LABEL20 jump LABEL20
LABEL10: LABEL10:
load_string "<col=9090ff>" sconst "<col=9090ff>"
load_int 16777215 iconst 16777215
load_int 12566463 iconst 12566463
istore 1 istore 1
istore 0 istore 0
sstore 0 sstore 0
load_int 1 iconst 1
load_int 10616889 iconst 10616889
widget_put_text_shadowed_widget if_settextshadow
jump LABEL23 jump LABEL23
LABEL20: LABEL20:
load_int 0 iconst 0
load_int 10616889 iconst 10616889
widget_put_text_shadowed_widget if_settextshadow
LABEL23: LABEL23:
iload 0 iload 0
load_int 10616889 iconst 10616889
widget_put_textcolor_widget if_setcolour
049 335 get_varc_string 335
string_length string_length
istore 2 istore 2
049 335 get_varc_string 335
appendtags escape
sstore 1 sstore 1
load_string "" sconst ""
sstore 2 sstore 2
load_int 0 iconst 0
istore 3 istore 3
get_varbit 8119 get_varbit 8119
load_int 1 iconst 1
if_icmpeq LABEL40 if_icmpeq LABEL40
jump LABEL99 jump LABEL99
LABEL40: LABEL40:
load_int 105 iconst 105
load_int 115 iconst 115
load_int 1894 iconst 1894
get_varbit 1777 get_varbit 1777
get_enum_value enum
get_localplayer_name chat_playername
load_string ": " sconst ": "
sload 0 sload 0
sload 1 sload 1
load_string "</col>" sconst "</col>"
string_append 6 join_string 6
sstore 2 sstore 2
iload 2 iload 2
load_int 80 iconst 80
if_icmplt LABEL56 if_icmplt LABEL56
jump LABEL63 jump LABEL63
LABEL56: LABEL56:
sload 2 sload 2
sload 0 sload 0
load_string "*" sconst "*"
load_string "</col>" sconst "</col>"
string_append 3 join_string 3
concat_string append
sstore 2 sstore 2
LABEL63: LABEL63:
sload 2 sload 2
load_int 2147483647 iconst 2147483647
load_int 495 iconst 495
get_max_line_width parawidth
istore 3 istore 3
iload 3 iload 3
load_int 10616889 iconst 10616889
widget_get_width_widget if_getwidth
if_icmpgt LABEL73 if_icmpgt LABEL73
jump LABEL79 jump LABEL79
LABEL73: LABEL73:
load_int 2 iconst 2
load_int 2 iconst 2
load_int 0 iconst 0
load_int 10616889 iconst 10616889
widget_put_text_alignment_widget if_settextalign
jump LABEL84 jump LABEL84
LABEL79: LABEL79:
load_int 0 iconst 0
load_int 2 iconst 2
load_int 0 iconst 0
load_int 10616889 iconst 10616889
widget_put_text_alignment_widget if_settextalign
LABEL84: LABEL84:
load_int 10616889 iconst 10616889
widget_put_actions_null_widget if_clearops
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616889 iconst 10616889
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616889 iconst 10616889
widget_put_mouse_exit_listener_widget if_setonmouseleave
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616889 iconst 10616889
widget_put_option_click_listener_widget if_setonop
jump LABEL140 jump LABEL140
LABEL99: LABEL99:
load_int 105 iconst 105
load_int 115 iconst 115
load_int 1894 iconst 1894
get_varbit 1777 get_varbit 1777
get_enum_value enum
load_string " You must set a name before you can chat." sconst " You must set a name before you can chat."
string_append 2 join_string 2
sstore 2 sstore 2
load_int 1 iconst 1
load_int 2 iconst 2
load_int 0 iconst 0
load_int 10616889 iconst 10616889
widget_put_text_alignment_widget if_settextalign
load_int 10 iconst 10
load_string "Configure" sconst "Configure"
load_int 10616889 iconst 10616889
widget_put_action_widget if_setop
load_string "<col=ff9040>" sconst "<col=ff9040>"
load_string "Display name" sconst "Display name"
load_string "</col>" sconst "</col>"
string_append 3 join_string 3
load_int 10616889 iconst 10616889
widget_put_name_widget if_setopbase
load_int 45 iconst 45
load_int -2147483645 iconst -2147483645
iload 1 iload 1
load_string "Ii" sconst "Ii"
load_int 10616889 iconst 10616889
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int 45 iconst 45
load_int -2147483645 iconst -2147483645
iload 0 iload 0
load_string "Ii" sconst "Ii"
load_int 10616889 iconst 10616889
widget_put_mouse_exit_listener_widget if_setonmouseleave
load_int 489 iconst 489
load_int -2147483644 iconst -2147483644
load_int 1024 iconst 1024
load_string "ii" sconst "ii"
load_int 10616889 iconst 10616889
widget_put_option_click_listener_widget if_setonop
LABEL140: LABEL140:
sload 2 sload 2
load_int 10616889 iconst 10616889
widget_put_text_widget if_settext
load_string "setChatboxInput" sconst "setChatboxInput"
runelite_callback runelite_callback
load_int 3 iconst 3
load_int 16 iconst 16
load_int 1 iconst 1
load_int 0 iconst 0
load_int 10616889 iconst 10616889
widget_put_size_widget if_setsize
return return
runelite-client/src/main/scripts/CommandScript.rs2asm
+124 -124
View File
@@ -3,238 +3,238 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 5 .int_var_count 5
.string_var_count 0 .string_var_count 0
load_int 10616887 iconst 10616887
widget_get_hidden_widget if_gethide
load_int 1 iconst 1
if_icmpeq LABEL9 if_icmpeq LABEL9
load_int 10616888 iconst 10616888
widget_get_hidden_widget if_gethide
load_int 1 iconst 1
if_icmpeq LABEL9 if_icmpeq LABEL9
jump LABEL10 jump LABEL10
LABEL9: LABEL9:
return return
LABEL10: LABEL10:
get_varbit 8119 get_varbit 8119
load_int 0 iconst 0
if_icmpeq LABEL19 if_icmpeq LABEL19
load_int -1 iconst -1
load_int 162 iconst 162
invoke 1701 invoke 1701
load_int 0 iconst 0
if_icmpeq LABEL19 if_icmpeq LABEL19
jump LABEL20 jump LABEL20
LABEL19: LABEL19:
return return
LABEL20: LABEL20:
049 335 get_varc_string 335
string_length string_length
istore 2 istore 2
load_int 0 iconst 0
istore 3 istore 3
load_int 0 iconst 0
istore 4 istore 4
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL31 if_icmpeq LABEL31
jump LABEL37 jump LABEL37
LABEL31: LABEL31:
get_varc 41 get_varc_int 41
load_int 4 iconst 4
if_icmpeq LABEL35 if_icmpeq LABEL35
jump LABEL37 jump LABEL37
LABEL35: LABEL35:
load_int 1 iconst 1
istore 4 istore 4
LABEL37: LABEL37:
get_rights staffmodlevel
load_int 0 iconst 0
if_icmpgt LABEL41 if_icmpgt LABEL41
jump LABEL43 jump LABEL43
LABEL41: LABEL41:
load_int 1 iconst 1
istore 3 istore 3
LABEL43: LABEL43:
iload 3 iload 3
load_int 1 iconst 1
if_icmpeq LABEL47 if_icmpeq LABEL47
jump LABEL58 jump LABEL58
LABEL47: LABEL47:
load_string "`" sconst "`"
iload 1 iload 1
string_indexof string_indexof_char
load_int -1 iconst -1
if_icmpne LABEL53 if_icmpne LABEL53
jump LABEL58 jump LABEL58
LABEL53: LABEL53:
iload 2 iload 2
load_int 0 iconst 0
if_icmpeq LABEL57 if_icmpeq LABEL57
jump LABEL58 jump LABEL58
LABEL57: LABEL57:
return return
LABEL58: LABEL58:
iload 0 iload 0
load_int 84 iconst 84
if_icmpeq LABEL62 if_icmpeq LABEL62
jump LABEL179 jump LABEL179
LABEL62: LABEL62:
invoke 1984 invoke 1984
iload 2 iload 2
load_int 0 iconst 0
if_icmpgt LABEL67 if_icmpgt LABEL67
jump LABEL178 jump LABEL178
LABEL67: LABEL67:
049 335 get_varc_string 335
load_string "/" sconst "/"
load_int 0 iconst 0
string_indexof_from string_indexof_string
load_int 0 iconst 0
if_icmpeq LABEL77 if_icmpeq LABEL77
iload 4 iload 4
load_int 1 iconst 1
if_icmpeq LABEL77 if_icmpeq LABEL77
jump LABEL112 jump LABEL112
LABEL77: LABEL77:
get_clanchatcount clan_getchatcount
load_int 0 iconst 0
if_icmpgt LABEL81 if_icmpgt LABEL81
jump LABEL108 jump LABEL108
LABEL81: LABEL81:
iload 2 iload 2
load_int 1 iconst 1
if_icmple LABEL85 if_icmple LABEL85
jump LABEL90 jump LABEL90
LABEL85: LABEL85:
iload 4 iload 4
load_int 0 iconst 0
if_icmpeq LABEL89 if_icmpeq LABEL89
jump LABEL90 jump LABEL90
LABEL89: LABEL89:
return return
LABEL90: LABEL90:
get_varbit 4394 get_varbit 4394
load_int 1 iconst 1
if_icmpeq LABEL94 if_icmpeq LABEL94
jump LABEL96 jump LABEL96
LABEL94: LABEL94:
part_clanchat clan_leavechat
jump LABEL107 jump LABEL107
LABEL96: LABEL96:
iload 4 iload 4
load_int 1 iconst 1
if_icmpeq LABEL100 if_icmpeq LABEL100
jump LABEL104 jump LABEL104
LABEL100: LABEL100:
load_string "/" sconst "/"
049 335 get_varc_string 335
concat_string append
050 335 set_varc_string 335
LABEL104: LABEL104:
049 335 get_varc_string 335
load_int 2 iconst 2
invoke 96 invoke 96
LABEL107: LABEL107:
jump LABEL111 jump LABEL111
LABEL108: LABEL108:
049 335 get_varc_string 335
load_int 0 iconst 0
invoke 96 invoke 96
LABEL111: LABEL111:
jump LABEL174 jump LABEL174
LABEL112: LABEL112:
049 335 get_varc_string 335
load_string "::" sconst "::"
load_int 0 iconst 0
string_indexof_from string_indexof_string
load_int 0 iconst 0
if_icmpeq LABEL119 if_icmpeq LABEL119
jump LABEL171 jump LABEL171
LABEL119: LABEL119:
iload 2 iload 2
load_int 2 iconst 2
if_icmpgt LABEL123 if_icmpgt LABEL123
jump LABEL167 jump LABEL167
LABEL123: LABEL123:
049 335 get_varc_string 335
load_string "::toggleroof" sconst "::toggleroof"
load_int 0 iconst 0
string_indexof_from string_indexof_string
load_int 0 iconst 0
if_icmpeq LABEL130 if_icmpeq LABEL130
jump LABEL144 jump LABEL144
LABEL130: LABEL130:
get_hideroofs getremoveroofs
load_int 1 iconst 1
if_icmpeq LABEL134 if_icmpeq LABEL134
jump LABEL139 jump LABEL139
LABEL134: LABEL134:
load_int 0 iconst 0
set_hideroofs setremoveroofs
load_string "Roofs will only be removed selectively." sconst "Roofs will only be removed selectively."
send_game_message mes
jump LABEL143 jump LABEL143
LABEL139: LABEL139:
load_int 1 iconst 1
set_hideroofs setremoveroofs
load_string "Roofs are now all hidden." sconst "Roofs are now all hidden."
send_game_message mes
LABEL143: LABEL143:
jump LABEL166 jump LABEL166
LABEL144: LABEL144:
049 335 get_varc_string 335
load_string "::bank" sconst "::bank"
load_int 0 iconst 0
string_indexof_from string_indexof_string
load_int 0 iconst 0
if_icmpeq LABEL151 if_icmpeq LABEL151
load_string "runeliteCommand" ; load callback name sconst "runeliteCommand" ; load callback name
runelite_callback ; invoke callback runelite_callback ; invoke callback
jump LABEL155 jump LABEL155
LABEL151: LABEL151:
load_string "Hey, everyone, I just tried to do something very silly!" sconst "Hey, everyone, I just tried to do something very silly!"
load_int 0 iconst 0
invoke 96 invoke 96
jump LABEL166 jump LABEL166
LABEL155: LABEL155:
049 335 get_varc_string 335
invoke 224 invoke 224
050 335 set_varc_string 335
049 335 get_varc_string 335
string_length string_length
istore 2 istore 2
049 335 get_varc_string 335
load_int 2 iconst 2
iload 2 iload 2
string_substring substring
run_command docheat
LABEL166: LABEL166:
jump LABEL170 jump LABEL170
LABEL167: LABEL167:
049 335 get_varc_string 335
load_int 0 iconst 0
invoke 96 invoke 96
LABEL170: LABEL170:
jump LABEL174 jump LABEL174
LABEL171: LABEL171:
049 335 get_varc_string 335
load_int 0 iconst 0
invoke 96 invoke 96
LABEL174: LABEL174:
049 335 get_varc_string 335
invoke 77 invoke 77
load_string "" sconst ""
050 335 set_varc_string 335
LABEL178: LABEL178:
jump LABEL247 jump LABEL247
LABEL179: LABEL179:
iload 0 iload 0
load_int 104 iconst 104
if_icmpeq LABEL183 if_icmpeq LABEL183
jump LABEL189 jump LABEL189
LABEL183: LABEL183:
iload 3 iload 3
load_int 1 iconst 1
if_icmpeq LABEL187 if_icmpeq LABEL187
jump LABEL188 jump LABEL188
LABEL187: LABEL187:
@@ -243,12 +243,12 @@ LABEL188:
jump LABEL247 jump LABEL247
LABEL189: LABEL189:
iload 0 iload 0
load_int 105 iconst 105
if_icmpeq LABEL193 if_icmpeq LABEL193
jump LABEL199 jump LABEL199
LABEL193: LABEL193:
iload 3 iload 3
load_int 1 iconst 1
if_icmpeq LABEL197 if_icmpeq LABEL197
jump LABEL198 jump LABEL198
LABEL197: LABEL197:
@@ -257,68 +257,68 @@ LABEL198:
jump LABEL247 jump LABEL247
LABEL199: LABEL199:
iload 0 iload 0
load_int 80 iconst 80
if_icmpeq LABEL203 if_icmpeq LABEL203
jump LABEL241 jump LABEL241
LABEL203: LABEL203:
049 356 get_varc_string 356
string_length string_length
load_int 0 iconst 0
if_icmpgt LABEL208 if_icmpgt LABEL208
jump LABEL228 jump LABEL228
LABEL208: LABEL208:
049 356 get_varc_string 356
is_friend friend_test
load_int 1 iconst 1
if_icmpeq LABEL213 if_icmpeq LABEL213
jump LABEL216 jump LABEL216
LABEL213: LABEL213:
049 356 get_varc_string 356
invoke 107 invoke 107
return return
LABEL216: LABEL216:
get_varc 60 get_varc_int 60
get_gamecycle clientclock
if_icmpgt LABEL220 if_icmpgt LABEL220
jump LABEL221 jump LABEL221
LABEL220: LABEL220:
return return
LABEL221: LABEL221:
get_gamecycle clientclock
load_int 50 iconst 50
iadd add
put_varc 60 set_varc_int 60
load_string "That player was not found on your Friends list." sconst "That player was not found on your Friends list."
send_game_message mes
return return
LABEL228: LABEL228:
get_varc 60 get_varc_int 60
get_gamecycle clientclock
if_icmpgt LABEL232 if_icmpgt LABEL232
jump LABEL233 jump LABEL233
LABEL232: LABEL232:
return return
LABEL233: LABEL233:
get_gamecycle clientclock
load_int 50 iconst 50
iadd add
put_varc 60 set_varc_int 60
load_string "You haven't received any messages to which you can reply." sconst "You haven't received any messages to which you can reply."
send_game_message mes
return return
jump LABEL247 jump LABEL247
LABEL241: LABEL241:
049 335 get_varc_string 335
load_int 0 iconst 0
iload 0 iload 0
iload 1 iload 1
invoke 74 invoke 74
load_int 1 ; check if we're ignoring input iconst 1 ; check if we're ignoring input
load_int 0 ; iconst 0 ;
load_string "blockChatInput" ; sconst "blockChatInput" ;
runelite_callback ; runelite_callback ;
if_icmpeq LABEL247 ; don't add to input varcstr if_icmpeq LABEL247 ; don't add to input varcstr
050 335 set_varc_string 335
LABEL247: LABEL247:
invoke 223 invoke 223
return return
runelite-client/src/main/scripts/GEOffersSetupInit.hash
+1
View File
@@ -0,0 +1 @@
B370DDEEF61E0F420C1990DDA4FBBEDCEE8324F3750ABAC79B072A27268D887B
runelite-client/src/main/scripts/GEOffersSetupInit.rs2asm
+394
View File
@@ -0,0 +1,394 @@
.id 779
.int_stack_count 15
.string_stack_count 0
.int_var_count 16
.string_var_count 1
get_varbit 4397
iconst 1
if_icmpeq LABEL4
jump LABEL65
LABEL4:
iload 0
iload 1
cc_find
iconst 1
if_icmpeq LABEL10
jump LABEL12
LABEL10:
iconst 1
cc_sethide
LABEL12:
iload 0
iload 6
cc_find
iconst 1
if_icmpeq LABEL18
jump LABEL23
LABEL18:
iconst 0
cc_settrans
iconst -1
sconst ""
cc_setontimer
LABEL23:
iload 0
iload 12
cc_find
iconst 1
if_icmpeq LABEL29
jump LABEL31
LABEL29:
iconst 1
cc_sethide
LABEL31:
iload 0
iload 4
cc_find
iconst 1
if_icmpeq LABEL37
jump LABEL39
LABEL37:
sconst "Sell offer"
cc_settext
LABEL39:
iload 0
iload 5
cc_find
iconst 1
if_icmpeq LABEL45
jump LABEL47
LABEL45:
iconst 1119
cc_setgraphic
LABEL47:
iload 0
iload 2
cc_find
iconst 1
if_icmpeq LABEL53
jump LABEL56
LABEL53:
iconst 1
sconst "All"
cc_setop
LABEL56:
iload 0
iload 3
cc_find
iconst 1
if_icmpeq LABEL62
jump LABEL64
LABEL62:
sconst "All"
cc_settext
LABEL64:
jump LABEL130
LABEL65:
iload 0
iload 1
cc_find
iconst 1
if_icmpeq LABEL71
jump LABEL73
LABEL71:
iconst 0
cc_sethide
LABEL73:
iload 0
iload 6
cc_find
iconst 1
if_icmpeq LABEL79
jump LABEL89
LABEL79:
iconst 100
cc_settrans
iconst 811
iconst -2147483645
iconst -2147483643
clientclock
iconst 100
iconst 250
sconst "Iiiii"
cc_setontimer
LABEL89:
iload 0
iload 12
cc_find
iconst 1
if_icmpeq LABEL95
jump LABEL97
LABEL95:
iconst 0
cc_sethide
LABEL97:
iload 0
iload 4
cc_find
iconst 1
if_icmpeq LABEL103
jump LABEL105
LABEL103:
sconst "Buy offer"
cc_settext
LABEL105:
iload 0
iload 5
cc_find
iconst 1
if_icmpeq LABEL111
jump LABEL113
LABEL111:
iconst 1118
cc_setgraphic
LABEL113:
iload 0
iload 2
cc_find
iconst 1
if_icmpeq LABEL119
jump LABEL122
LABEL119:
iconst 1
sconst "+1K"
cc_setop
LABEL122:
iload 0
iload 3
cc_find
iconst 1
if_icmpeq LABEL128
jump LABEL130
LABEL128:
sconst "+1K"
cc_settext
LABEL130:
sconst ","
sstore 0
iconst 0
istore 15
get_varp 1151
iconst -1
if_icmpne LABEL138
jump LABEL274
LABEL138:
iload 0
iload 7
cc_find
iconst 1
if_icmpeq LABEL144
jump LABEL147
LABEL144:
get_varp 1151
get_varbit 4396
cc_setobject_nonum
LABEL147:
iload 0
iload 8
cc_find
iconst 1
if_icmpeq LABEL153
jump LABEL156
LABEL153:
get_varp 1151
oc_name
cc_settext
LABEL156:
iload 0
iload 9
cc_find
iconst 1
if_icmpeq LABEL162
jump LABEL166
LABEL162:
get_varbit 4396
sload 0
invoke 46
cc_settext
LABEL166:
iload 0
iload 10
cc_find
iconst 1
if_icmpeq LABEL172
jump LABEL185
LABEL172:
get_varbit 4398
iconst 1
if_icmpeq LABEL176
jump LABEL179
LABEL176:
sconst "1 coin"
cc_settext
jump LABEL185
LABEL179:
get_varbit 4398
sload 0
invoke 46
sconst " coins"
join_string 2
cc_settext
LABEL185:
get_varbit 4396
iconst 0
if_icmpgt LABEL189
jump LABEL211
LABEL189:
iconst 2147483647
get_varbit 4396
div
get_varbit 4398
if_icmplt LABEL195
jump LABEL211
LABEL195:
iload 0
iload 11
cc_find
iconst 1
if_icmpeq LABEL201
jump LABEL206
LABEL201:
sconst "<col=ff0000>"
sconst "Too much money!"
sconst "</col>"
join_string 3
cc_settext
LABEL206:
iload 0
iload 14
iload 13
invoke 780
jump LABEL273
LABEL211:
get_varbit 4396
get_varbit 4398
multiply
istore 15
iload 0
iload 11
cc_find
iconst 1
if_icmpeq LABEL221
jump LABEL234
LABEL221:
iload 15
iconst 1
if_icmpeq LABEL225
jump LABEL228
LABEL225:
sconst "1 coin"
cc_settext
jump LABEL234
LABEL228:
iload 15
sload 0
invoke 46
sconst " coins"
join_string 2
cc_settext
LABEL234:
iload 15
iconst 0
if_icmpgt LABEL238
jump LABEL269
LABEL238:
iload 13
invoke 208
pop_int
iconst 772
iconst -2147483645
sconst "I"
iload 13
if_setonmouserepeat
iconst 97
iconst -2147483645
sconst "I"
iload 13
if_setonmouseleave
iconst 489
iconst -2147483644
iconst 2
sconst "ii"
iload 13
if_setonop
iload 0
iload 14
cc_find
iconst 1
if_icmpeq LABEL263
jump LABEL268
LABEL263:
sconst "<col=ffffff>"
sconst "Confirm"
sconst "</col>"
join_string 3
cc_settext
LABEL268:
jump LABEL273
LABEL269:
iload 0
iload 14
iload 13
invoke 780
LABEL273:
jump LABEL319
LABEL274:
iload 0
iload 7
cc_find
iconst 1
if_icmpeq LABEL280
jump LABEL283
LABEL280:
iconst 6512
iconst 1
cc_setobject_nonum
LABEL283:
iload 0
iload 8
cc_find
iconst 1
if_icmpeq LABEL289
jump LABEL291
LABEL289:
sconst "Choose an item..."
cc_settext
LABEL291:
iload 0
iload 9
cc_find
iconst 1
if_icmpeq LABEL297
jump LABEL299
LABEL297:
sconst ""
cc_settext
LABEL299:
iload 0
iload 10
cc_find
iconst 1
if_icmpeq LABEL305
jump LABEL307
LABEL305:
sconst ""
cc_settext
LABEL307:
iload 0
iload 11
cc_find
iconst 1
if_icmpeq LABEL313
jump LABEL315
LABEL313:
sconst ""
cc_settext
LABEL315:
iload 0
iload 14
iload 13
invoke 780
LABEL319:
sconst "geBuilt" ;
runelite_callback ;
return
runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm
+23 -23
View File
@@ -3,42 +3,42 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 0 .int_var_count 0
.string_var_count 1 .string_var_count 1
get_varc 11 get_varc_int 11
load_int 1 iconst 1
if_icmpeq LABEL4 if_icmpeq LABEL4
jump LABEL5 jump LABEL5
LABEL4: LABEL4:
close_window if_close
LABEL5: LABEL5:
load_int 11 iconst 11
invoke 677 invoke 677
load_string "Show items whose names contain the following text:" sconst "Show items whose names contain the following text:"
load_string "setSearchBankInputText" ; load event name sconst "setSearchBankInputText" ; load event name
runelite_callback ; invoke callback runelite_callback ; invoke callback
load_int 10616876 iconst 10616876
widget_put_text_widget if_settext
load_string "" sconst ""
invoke 222 invoke 222
load_string "" sconst ""
sstore 0 sstore 0
load_int 112 iconst 112
load_int -2147483640 iconst -2147483640
load_int -2147483639 iconst -2147483639
sload 0 sload 0
load_string "izs" sconst "izs"
load_int 10616877 iconst 10616877
widget_put_key_listener_widget if_setonkey
load_int 138 iconst 138
load_string "" sconst ""
load_int 10616877 iconst 10616877
widget_put_dialog_abort_listener_widget if_setondialogabort
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL29 if_icmpeq LABEL29
jump LABEL32 jump LABEL32
LABEL29: LABEL29:
load_int 0 iconst 0
load_int 80 iconst 80
invoke 1983 invoke 1983
LABEL32: LABEL32:
return return
runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
+264 -264
View File
@@ -3,253 +3,253 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 21 .int_var_count 21
.string_var_count 0 .string_var_count 0
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551298 iconst 10551298
get_enum_value enum
istore 2 istore 2
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551306 iconst 10551306
get_enum_value enum
istore 3 istore 3
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551301 iconst 10551301
get_enum_value enum
istore 4 istore 4
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551308 iconst 10551308
get_enum_value enum
istore 5 istore 5
load_int 103 iconst 103
load_int 105 iconst 105
load_int 1960 iconst 1960
iload 1 iload 1
get_enum_value enum
istore 6 istore 6
load_int 103 iconst 103
load_int 105 iconst 105
load_int 1961 iconst 1961
iload 1 iload 1
get_enum_value enum
istore 7 istore 7
load_int 103 iconst 103
load_int 105 iconst 105
load_int 1135 iconst 1135
iload 1 iload 1
get_enum_value enum
istore 8 istore 8
load_int 103 iconst 103
load_int 105 iconst 105
load_int 1136 iconst 1136
iload 1 iload 1
get_enum_value enum
istore 9 istore 9
load_int 0 iconst 0
istore 10 istore 10
load_int 0 iconst 0
istore 11 istore 11
load_int 0 iconst 0
istore 12 istore 12
load_int 0 iconst 0
istore 13 istore 13
load_int 0 iconst 0
istore 14 istore 14
load_int 0 iconst 0
istore 15 istore 15
iload 0 iload 0
widget_get_width_widget if_getwidth
istore 16 istore 16
iload 0 iload 0
widget_get_height_widget if_getheight
istore 17 istore 17
iload 1 iload 1
load_int 1745 iconst 1745
if_icmpeq LABEL70 if_icmpeq LABEL70
jump LABEL84 jump LABEL84
LABEL70: LABEL70:
load_int 0 iconst 0
iload 16 iload 16
load_int 39387148 iconst 39387148
widget_get_width_widget if_getwidth
isub sub
invoke 1045 invoke 1045
istore 14 istore 14
load_int 0 iconst 0
iload 17 iload 17
load_int 39387148 iconst 39387148
widget_get_height_widget if_getheight
isub sub
invoke 1045 invoke 1045
istore 15 istore 15
LABEL84: LABEL84:
get_varbit 4606 get_varbit 4606
load_int 0 iconst 0
if_icmpne LABEL88 if_icmpne LABEL88
jump LABEL253 jump LABEL253
LABEL88: LABEL88:
get_varbit 4606 get_varbit 4606
load_int 2 iconst 2
if_icmpeq LABEL92 if_icmpeq LABEL92
jump LABEL101 jump LABEL101
LABEL92: LABEL92:
load_int 512 iconst 512
load_int 220 iconst 220
6200 viewport_setfov
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
6202 viewport_clampfov
jump LABEL106 jump LABEL106
LABEL101: LABEL101:
load_int 512 iconst 512
load_int 512 iconst 512
load_int 512 iconst 512
load_int 512 iconst 512
6202 viewport_clampfov
LABEL106: LABEL106:
load_int 50 iconst 50
set_camera_focal_point_height cam_setfollowheight
iload 2 iload 2
load_int -1 iconst -1
if_icmpne LABEL112 if_icmpne LABEL112
jump LABEL252 jump LABEL252
LABEL112: LABEL112:
iload 3 iload 3
load_int -1 iconst -1
if_icmpne LABEL116 if_icmpne LABEL116
jump LABEL252 jump LABEL252
LABEL116: LABEL116:
get_viewport_size viewport_geteffectivesize
istore 11 istore 11
istore 10 istore 10
load_int 0 iconst 0
iload 16 iload 16
iload 10 iload 10
isub sub
invoke 1045 invoke 1045
load_int 0 iconst 0
iload 17 iload 17
iload 11 iload 11
isub sub
invoke 1045 invoke 1045
istore 13 istore 13
istore 12 istore 12
iload 10 iload 10
iload 11 iload 11
load_int 0 iconst 0
load_int 0 iconst 0
iload 2 iload 2
widget_put_size_widget if_setsize
iload 10 iload 10
load_int 0 iconst 0
iload 14 iload 14
iload 12 iload 12
isub sub
invoke 1045 invoke 1045
isub sub
iload 11 iload 11
load_int 0 iconst 0
iload 15 iload 15
iload 13 iload 13
isub sub
invoke 1045 invoke 1045
isub sub
load_int 0 iconst 0
load_int 0 iconst 0
iload 3 iload 3
widget_put_size_widget if_setsize
iload 4 iload 4
load_int -1 iconst -1
if_icmpne LABEL159 if_icmpne LABEL159
jump LABEL242 jump LABEL242
LABEL159: LABEL159:
iload 5 iload 5
load_int -1 iconst -1
if_icmpne LABEL163 if_icmpne LABEL163
jump LABEL242 jump LABEL242
LABEL163: LABEL163:
iload 12 iload 12
iload 14 iload 14
isub sub
load_int 2 iconst 2
idiv div
iload 13 iload 13
iload 15 iload 15
isub sub
load_int 2 iconst 2
idiv div
istore 13 istore 13
istore 12 istore 12
load_int 0 iconst 0
iload 6 iload 6
iload 12 iload 12
isub sub
invoke 1045 invoke 1045
load_int 0 iconst 0
iload 8 iload 8
iload 12 iload 12
isub sub
invoke 1045 invoke 1045
istore 8 istore 8
istore 6 istore 6
load_int 0 iconst 0
iload 7 iload 7
iload 13 iload 13
isub sub
invoke 1045 invoke 1045
load_int 0 iconst 0
iload 9 iload 9
iload 13 iload 13
isub sub
invoke 1045 invoke 1045
istore 9 istore 9
istore 7 istore 7
iload 6 iload 6
iload 7 iload 7
load_int 0 iconst 0
load_int 0 iconst 0
iload 4 iload 4
widget_put_position_widget if_setposition
iload 6 iload 6
iload 7 iload 7
load_int 0 iconst 0
load_int 0 iconst 0
iload 5 iload 5
widget_put_position_widget if_setposition
iload 6 iload 6
iload 8 iload 8
iadd add
iload 7 iload 7
iload 9 iload 9
iadd add
load_int 1 iconst 1
load_int 1 iconst 1
iload 4 iload 4
widget_put_size_widget if_setsize
iload 6 iload 6
iload 8 iload 8
iadd add
iload 7 iload 7
iload 9 iload 9
iadd add
load_int 1 iconst 1
load_int 1 iconst 1
iload 5 iload 5
widget_put_size_widget if_setsize
iload 1 iload 1
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551307 iconst 10551307
get_enum_value enum
iload 5 iload 5
iload 8 iload 8
iload 9 iload 9
@@ -257,137 +257,137 @@ LABEL163:
jump LABEL252 jump LABEL252
LABEL242: LABEL242:
iload 1 iload 1
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551307 iconst 10551307
get_enum_value enum
iload 3 iload 3
load_int 0 iconst 0
load_int 0 iconst 0
invoke 910 invoke 910
LABEL252: LABEL252:
jump LABEL369 jump LABEL369
LABEL253: LABEL253:
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
6202 viewport_clampfov
get_varc 73 get_varc_int 73
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
if_icmpge LABEL262 if_icmpge LABEL262
jump LABEL278 jump LABEL278
LABEL262: LABEL262:
get_varc 73 get_varc_int 73
load_int 896 iconst 896
load_string "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
if_icmple LABEL266 if_icmple LABEL266
jump LABEL278 jump LABEL278
LABEL266: LABEL266:
get_varc 74 get_varc_int 74
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
if_icmpge LABEL270 if_icmpge LABEL270
jump LABEL278 jump LABEL278
LABEL270: LABEL270:
get_varc 74 get_varc_int 74
load_int 896 iconst 896
load_string "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
if_icmple LABEL274 if_icmple LABEL274
jump LABEL278 jump LABEL278
LABEL274: LABEL274:
get_varc 73 get_varc_int 73
get_varc 74 get_varc_int 74
invoke 42 invoke 42
jump LABEL281 jump LABEL281
LABEL278: LABEL278:
load_int 512 iconst 512
load_int 512 iconst 512
invoke 42 invoke 42
LABEL281: LABEL281:
get_viewport_size viewport_geteffectivesize
istore 11 istore 11
istore 10 istore 10
iload 2 iload 2
load_int -1 iconst -1
if_icmpne LABEL288 if_icmpne LABEL288
jump LABEL369 jump LABEL369
LABEL288: LABEL288:
iload 3 iload 3
load_int -1 iconst -1
if_icmpne LABEL292 if_icmpne LABEL292
jump LABEL369 jump LABEL369
LABEL292: LABEL292:
iload 10 iload 10
iload 11 iload 11
load_int 0 iconst 0
load_int 0 iconst 0
iload 2 iload 2
widget_put_size_widget if_setsize
iload 10 iload 10
iload 14 iload 14
isub sub
iload 11 iload 11
iload 15 iload 15
isub sub
load_int 0 iconst 0
load_int 0 iconst 0
iload 3 iload 3
widget_put_size_widget if_setsize
iload 4 iload 4
load_int -1 iconst -1
if_icmpne LABEL312 if_icmpne LABEL312
jump LABEL359 jump LABEL359
LABEL312: LABEL312:
iload 5 iload 5
load_int -1 iconst -1
if_icmpne LABEL316 if_icmpne LABEL316
jump LABEL359 jump LABEL359
LABEL316: LABEL316:
iload 6 iload 6
iload 7 iload 7
load_int 0 iconst 0
load_int 0 iconst 0
iload 4 iload 4
widget_put_position_widget if_setposition
iload 6 iload 6
iload 7 iload 7
load_int 0 iconst 0
load_int 0 iconst 0
iload 5 iload 5
widget_put_position_widget if_setposition
iload 6 iload 6
iload 8 iload 8
iadd add
iload 7 iload 7
iload 9 iload 9
iadd add
load_int 1 iconst 1
load_int 1 iconst 1
iload 4 iload 4
widget_put_size_widget if_setsize
iload 6 iload 6
iload 8 iload 8
iadd add
iload 7 iload 7
iload 9 iload 9
iadd add
load_int 1 iconst 1
load_int 1 iconst 1
iload 5 iload 5
widget_put_size_widget if_setsize
iload 1 iload 1
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551307 iconst 10551307
get_enum_value enum
iload 5 iload 5
iload 8 iload 8
iload 9 iload 9
@@ -395,191 +395,191 @@ LABEL316:
jump LABEL369 jump LABEL369
LABEL359: LABEL359:
iload 1 iload 1
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551307 iconst 10551307
get_enum_value enum
iload 3 iload 3
load_int 0 iconst 0
load_int 0 iconst 0
invoke 910 invoke 910
LABEL369: LABEL369:
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551309 iconst 10551309
get_enum_value enum
istore 18 istore 18
iload 18 iload 18
load_int -1 iconst -1
if_icmpne LABEL379 if_icmpne LABEL379
jump LABEL423 jump LABEL423
LABEL379: LABEL379:
invoke 1972 invoke 1972
load_int 0 iconst 0
if_icmpeq LABEL383 if_icmpeq LABEL383
jump LABEL417 jump LABEL417
LABEL383: LABEL383:
iload 18 iload 18
widget_get_index_widget if_hassub
load_int 1 iconst 1
if_icmpeq LABEL388 if_icmpeq LABEL388
jump LABEL417 jump LABEL417
LABEL388: LABEL388:
get_varc 173 get_varc_int 173
load_int -2 iconst -2
if_icmpeq LABEL392 if_icmpeq LABEL392
jump LABEL399 jump LABEL399
LABEL392: LABEL392:
load_int 512 iconst 512
load_int 0 iconst 0
load_int 0 iconst 0
load_int 1 iconst 1
iload 18 iload 18
widget_put_size_widget if_setsize
jump LABEL416 jump LABEL416
LABEL399: LABEL399:
get_varc 173 get_varc_int 173
load_int -3 iconst -3
if_icmpeq LABEL403 if_icmpeq LABEL403
jump LABEL410 jump LABEL410
LABEL403: LABEL403:
load_int 0 iconst 0
load_int 0 iconst 0
load_int 1 iconst 1
load_int 1 iconst 1
iload 18 iload 18
widget_put_size_widget if_setsize
jump LABEL416 jump LABEL416
LABEL410: LABEL410:
load_int 512 iconst 512
load_int 334 iconst 334
load_int 0 iconst 0
load_int 0 iconst 0
iload 18 iload 18
widget_put_size_widget if_setsize
LABEL416: LABEL416:
jump LABEL423 jump LABEL423
LABEL417: LABEL417:
load_int 512 iconst 512
load_int 334 iconst 334
load_int 0 iconst 0
load_int 0 iconst 0
iload 18 iload 18
widget_put_size_widget if_setsize
LABEL423: LABEL423:
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551311 iconst 10551311
get_enum_value enum
istore 18 istore 18
load_int 0 iconst 0
istore 19 istore 19
load_int 0 iconst 0
istore 20 istore 20
iload 18 iload 18
load_int -1 iconst -1
if_icmpne LABEL437 if_icmpne LABEL437
jump LABEL481 jump LABEL481
LABEL437: LABEL437:
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551303 iconst 10551303
get_enum_value enum
widget_get_index_widget if_hassub
load_int 1 iconst 1
if_icmpeq LABEL446 if_icmpeq LABEL446
jump LABEL455 jump LABEL455
LABEL446: LABEL446:
get_varbit 4692 get_varbit 4692
load_int 0 iconst 0
if_icmpne LABEL450 if_icmpne LABEL450
jump LABEL453 jump LABEL453
LABEL450: LABEL450:
load_int 0 iconst 0
istore 20 istore 20
jump LABEL455 jump LABEL455
LABEL453: LABEL453:
load_int 38 iconst 38
istore 20 istore 20
LABEL455: LABEL455:
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL459 if_icmpeq LABEL459
jump LABEL473 jump LABEL473
LABEL459: LABEL459:
get_varbit 6254 get_varbit 6254
load_int 0 iconst 0
if_icmpeq LABEL463 if_icmpeq LABEL463
jump LABEL468 jump LABEL468
LABEL463: LABEL463:
load_int 182 iconst 182
load_int 4 iconst 4
iadd add
istore 19 istore 19
jump LABEL472 jump LABEL472
LABEL468: LABEL468:
load_int 120 iconst 120
load_int 4 iconst 4
iadd add
istore 19 istore 19
LABEL472: LABEL472:
jump LABEL475 jump LABEL475
LABEL473: LABEL473:
load_int 0 iconst 0
istore 19 istore 19
LABEL475: LABEL475:
iload 19 iload 19
iload 20 iload 20
load_int 2 iconst 2
load_int 0 iconst 0
iload 18 iload 18
widget_put_position_widget if_setposition
LABEL481: LABEL481:
load_int 73 iconst 73
load_int 73 iconst 73
iload 1 iload 1
load_int 10551303 iconst 10551303
get_enum_value enum
istore 18 istore 18
load_int 0 iconst 0
istore 19 istore 19
iload 18 iload 18
load_int -1 iconst -1
if_icmpne LABEL493 if_icmpne LABEL493
jump LABEL515 jump LABEL515
LABEL493: LABEL493:
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL497 if_icmpeq LABEL497
jump LABEL507 jump LABEL507
LABEL497: LABEL497:
get_varbit 6254 get_varbit 6254
load_int 0 iconst 0
if_icmpeq LABEL501 if_icmpeq LABEL501
jump LABEL504 jump LABEL504
LABEL501: LABEL501:
load_int 182 iconst 182
istore 19 istore 19
jump LABEL506 jump LABEL506
LABEL504: LABEL504:
load_int 120 iconst 120
istore 19 istore 19
LABEL506: LABEL506:
jump LABEL509 jump LABEL509
LABEL507: LABEL507:
load_int 0 iconst 0
istore 19 istore 19
LABEL509: LABEL509:
iload 19 iload 19
load_int 0 iconst 0
load_int 1 iconst 1
load_int 1 iconst 1
iload 18 iload 18
widget_put_size_widget if_setsize
LABEL515: LABEL515:
iload 0 iload 0
iload 1 iload 1
runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm
+40 -40
View File
@@ -6,77 +6,77 @@
; locals ; locals
; 2 bar size ; 2 bar size
get_varbit 4606 get_varbit 4606
load_int 0 iconst 0
if_icmpne LABEL4 if_icmpne LABEL4
jump LABEL5 jump LABEL5
LABEL4: LABEL4:
return return
LABEL5: LABEL5:
load_int 512 iconst 512
istore 3 istore 3
load_int 512 iconst 512
istore 4 istore 4
iload 1 iload 1
widget_get_width_widget if_getwidth
iload 0 iload 0
widget_get_width_widget if_getwidth
isub sub
istore 5 istore 5
load_int 0 iconst 0
iload 2 iload 2
invoke 1045 invoke 1045
istore 2 istore 2
iload 1 iload 1
widget_get_width_widget if_getwidth
iload 0 iload 0
widget_get_width_widget if_getwidth
isub sub
iload 2 iload 2
invoke 1046 invoke 1046
istore 2 istore 2
load_int 896 iconst 896
load_string "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
isub sub
istore 6 ; resizable delta istore 6 ; resizable delta
load_int 896 iconst 896
load_string "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
isub sub
istore 7 ; fixed delta istore 7 ; fixed delta
iload 2 iload 2
iload 6 iload 6
imul multiply
iload 5 iload 5
idiv div
iload 6 iload 6
load_string "zoomLinToExp" sconst "zoomLinToExp"
runelite_callback runelite_callback
pop_int pop_int
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
iadd add
istore 3 istore 3
iload 2 iload 2
iload 7 iload 7
imul multiply
iload 5 iload 5
idiv div
iload 7 iload 7
load_string "zoomLinToExp" sconst "zoomLinToExp"
runelite_callback runelite_callback
pop_int pop_int
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
iadd add
istore 4 istore 4
iload 4 iload 4
iload 3 iload 3
runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
+43 -43
View File
@@ -7,77 +7,77 @@
; 0 resizableZoomRange ; 0 resizableZoomRange
; 1 fixedZoomRange ; 1 fixedZoomRange
; 2 bar size ; 2 bar size
load_int 896 iconst 896
load_string "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
isub sub
istore 0 istore 0
load_int 896 iconst 896
load_string "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
isub sub
istore 1 istore 1
load_int 17104910 iconst 17104910
widget_get_width_widget if_getwidth
load_int 17104911 iconst 17104911
widget_get_width_widget if_getwidth
isub sub
istore 2 istore 2
load_int 0 iconst 0
istore 3 istore 3
load_int 0 iconst 0
istore 4 istore 4
get_viewport_size viewport_geteffectivesize
istore 4 istore 4
istore 3 istore 3
load_int 0 iconst 0
istore 5 istore 5
iload 3 iload 3
load_int 334 iconst 334
if_icmpgt LABEL27 if_icmpgt LABEL27
jump LABEL36 jump LABEL36
LABEL27: LABEL27:
get_varc 74 get_varc_int 74
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
isub sub
iload 0 iload 0
load_string "zoomExpToLin" sconst "zoomExpToLin"
runelite_callback runelite_callback
pop_int pop_int
iload 2 iload 2
imul multiply
iload 0 iload 0
idiv div
istore 5 istore 5
jump LABEL44 jump LABEL44
LABEL36: LABEL36:
get_varc 73 get_varc_int 73
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
isub sub
iload 0 iload 0
load_string "zoomExpToLin" sconst "zoomExpToLin"
runelite_callback runelite_callback
pop_int pop_int
iload 2 iload 2
imul multiply
iload 1 iload 1
idiv div
istore 5 istore 5
LABEL44: LABEL44:
iload 5 iload 5
load_int 0 iconst 0
load_int 0 iconst 0
load_int 0 iconst 0
load_int 17104911 iconst 17104911
widget_put_position_widget if_setposition
return return
runelite-client/src/main/scripts/PrivateMessage.rs2asm
+105 -105
View File
@@ -3,28 +3,28 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 2 .int_var_count 2
.string_var_count 1 .string_var_count 1
get_varc 5 get_varc_int 5
load_int 14 iconst 14
if_icmpeq LABEL4 if_icmpeq LABEL4
jump LABEL7 jump LABEL7
LABEL4: LABEL4:
load_int 1 iconst 1
put_varc 66 set_varc_int 66
return return
LABEL7: LABEL7:
load_int -1 iconst -1
istore 0 istore 0
load_string "" sconst ""
sstore 0 sstore 0
049 359 get_varc_string 359
string_length string_length
istore 1 istore 1
iload 1 iload 1
load_int 0 iconst 0
if_icmpgt LABEL18 if_icmpgt LABEL18
jump LABEL184 jump LABEL184
LABEL18: LABEL18:
get_varc 5 get_varc_int 5
switch switch
1: LABEL21 1: LABEL21
2: LABEL44 2: LABEL44
@@ -46,87 +46,87 @@ LABEL21:
return return
jump LABEL183 jump LABEL183
LABEL23: LABEL23:
get_ignorecount ignore_count
load_int 0 iconst 0
if_icmplt LABEL27 if_icmplt LABEL27
jump LABEL30 jump LABEL30
LABEL27: LABEL27:
load_string "Unable to update ignore list - system busy." sconst "Unable to update ignore list - system busy."
send_game_message mes
jump LABEL43 jump LABEL43
LABEL30: LABEL30:
get_varc 5 get_varc_int 5
load_int 4 iconst 4
if_icmpeq LABEL34 if_icmpeq LABEL34
jump LABEL37 jump LABEL37
LABEL34: LABEL34:
049 359 get_varc_string 359
add_ignore ignore_add
jump LABEL43 jump LABEL43
LABEL37: LABEL37:
get_varc 5 get_varc_int 5
load_int 5 iconst 5
if_icmpeq LABEL41 if_icmpeq LABEL41
jump LABEL43 jump LABEL43
LABEL41: LABEL41:
049 359 get_varc_string 359
remove_ignore ignore_del
LABEL43: LABEL43:
jump LABEL183 jump LABEL183
LABEL44: LABEL44:
get_friendcount friend_count
load_int 0 iconst 0
if_icmplt LABEL48 if_icmplt LABEL48
jump LABEL51 jump LABEL51
LABEL48: LABEL48:
load_string "Unable to complete action - system busy." sconst "Unable to complete action - system busy."
send_game_message mes
jump LABEL106 jump LABEL106
LABEL51: LABEL51:
get_varc 5 get_varc_int 5
load_int 2 iconst 2
if_icmpeq LABEL55 if_icmpeq LABEL55
jump LABEL58 jump LABEL58
LABEL55: LABEL55:
049 359 get_varc_string 359
add_friend friend_add
jump LABEL106 jump LABEL106
LABEL58: LABEL58:
get_varc 5 get_varc_int 5
load_int 3 iconst 3
if_icmpeq LABEL62 if_icmpeq LABEL62
jump LABEL65 jump LABEL65
LABEL62: LABEL62:
049 359 get_varc_string 359
remove_friend friend_del
jump LABEL106 jump LABEL106
LABEL65: LABEL65:
get_varc 5 get_varc_int 5
load_int 6 iconst 6
if_icmpeq LABEL69 if_icmpeq LABEL69
jump LABEL106 jump LABEL106
LABEL69: LABEL69:
get_varbit 8119 get_varbit 8119
load_int 0 iconst 0
if_icmpeq LABEL73 if_icmpeq LABEL73
jump LABEL79 jump LABEL79
LABEL73: LABEL73:
load_int 1 iconst 1
load_int 1 iconst 1
invoke 299 invoke 299
load_string "You must set a name before you can chat." sconst "You must set a name before you can chat."
send_game_message mes
return return
LABEL79: LABEL79:
5005 chat_getfilter_private
load_int 2 iconst 2
if_icmpeq LABEL83 if_icmpeq LABEL83
jump LABEL94 jump LABEL94
LABEL83: LABEL83:
5000 chat_getfilter_public
load_int 1 iconst 1
5016 chat_getfilter_trade
chatfilter_update chat_setfilter
invoke 178 invoke 178
invoke 553 invoke 553
istore 0 istore 0
@@ -136,122 +136,122 @@ LABEL83:
invoke 89 invoke 89
LABEL94: LABEL94:
get_varbit 4394 get_varbit 4394
load_int 1 iconst 1
if_icmpeq LABEL98 if_icmpeq LABEL98
jump LABEL101 jump LABEL101
LABEL98: LABEL98:
049 360 get_varc_string 360
remove_friend friend_del
jump LABEL104 jump LABEL104
LABEL101: LABEL101:
049 360 get_varc_string 360
049 359 get_varc_string 359
load_string "privateMessage" ; load event name sconst "privateMessage" ; load event name
load_int 0 ; whether or not to skip iconst 0 ; whether or not to skip
runelite_callback ; invoke callback runelite_callback ; invoke callback
load_int 1 iconst 1
if_icmpeq LABEL104 ; if skipped, do not message if_icmpeq LABEL104 ; if skipped, do not message
privmsg chat_sendprivate
LABEL104: LABEL104:
get_gamecycle clientclock
put_varc 61 set_varc_int 61
LABEL106: LABEL106:
jump LABEL183 jump LABEL183
LABEL107: LABEL107:
049 359 get_varc_string 359
invoke 212 invoke 212
numeric_input resume_countdialog
jump LABEL183 jump LABEL183
LABEL111: LABEL111:
049 359 get_varc_string 359
string_remove_html removetags
050 361 set_varc_string 361
049 359 get_varc_string 359
string_input_1 resume_namedialog
jump LABEL183 jump LABEL183
LABEL117: LABEL117:
049 359 get_varc_string 359
string_input_2 resume_stringdialog
jump LABEL183 jump LABEL183
LABEL120: LABEL120:
get_varbit 8119 get_varbit 8119
load_int 0 iconst 0
if_icmpeq LABEL124 if_icmpeq LABEL124
jump LABEL130 jump LABEL130
LABEL124: LABEL124:
load_int 1 iconst 1
load_int 1 iconst 1
invoke 299 invoke 299
load_string "You must set a name before you can chat." sconst "You must set a name before you can chat."
send_game_message mes
return return
LABEL130: LABEL130:
049 359 get_varc_string 359
string_remove_html removetags
050 362 set_varc_string 362
049 359 get_varc_string 359
join_clanchat clan_joinchat
jump LABEL183 jump LABEL183
LABEL136: LABEL136:
iload 1 iload 1
load_int 10 iconst 10
if_icmpgt LABEL140 if_icmpgt LABEL140
jump LABEL146 jump LABEL146
LABEL140: LABEL140:
049 359 get_varc_string 359
load_int 0 iconst 0
load_int 9 iconst 9
string_substring substring
sstore 0 sstore 0
jump LABEL148 jump LABEL148
LABEL146: LABEL146:
049 359 get_varc_string 359
sstore 0 sstore 0
LABEL148: LABEL148:
sload 0 sload 0
tolowercase lowercase
5021 chat_setmessagefilter
invoke 553 invoke 553
invoke 84 invoke 84
jump LABEL183 jump LABEL183
LABEL154: LABEL154:
get_varbit 8119 get_varbit 8119
load_int 0 iconst 0
if_icmpeq LABEL158 if_icmpeq LABEL158
jump LABEL164 jump LABEL164
LABEL158: LABEL158:
load_int 1 iconst 1
load_int 1 iconst 1
invoke 299 invoke 299
load_string "You must set a name before you can chat." sconst "You must set a name before you can chat."
send_game_message mes
return return
LABEL164: LABEL164:
049 359 get_varc_string 359
load_int 0 iconst 0
put_varc 62 set_varc_int 62
050 358 set_varc_string 358
invoke 95 invoke 95
load_int 552 iconst 552
load_int -2147483645 iconst -2147483645
load_int 1 iconst 1
load_string "I1" sconst "I1"
load_int 10616845 iconst 10616845
widget_put_render_listener_widget if_setontimer
jump LABEL183 jump LABEL183
LABEL176: LABEL176:
load_int 0 iconst 0
load_int 1 iconst 1
invoke 299 invoke 299
return return
jump LABEL183 jump LABEL183
LABEL181: LABEL181:
049 359 get_varc_string 359
invoke 2061 invoke 2061
LABEL183: LABEL183:
jump LABEL190 jump LABEL190
LABEL184: LABEL184:
get_varc 5 get_varc_int 5
switch switch
16: LABEL189 16: LABEL189
7: LABEL187 7: LABEL187
@@ -265,7 +265,7 @@ LABEL187:
LABEL189: LABEL189:
return return
LABEL190: LABEL190:
load_int 1 iconst 1
load_int 1 iconst 1
invoke 299 invoke 299
return return
runelite-client/src/main/scripts/ResetChatboxInput.rs2asm
+130 -130
View File
@@ -3,19 +3,19 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 3 .int_var_count 3
.string_var_count 0 .string_var_count 0
load_string "resetChatboxInput" sconst "resetChatboxInput"
runelite_callback runelite_callback
load_int 1 iconst 1
load_int 10616872 iconst 10616872
widget_put_hidden_widget if_sethide
load_int 0 iconst 0
load_int 10616887 iconst 10616887
widget_put_hidden_widget if_sethide
invoke 923 invoke 923
load_int 0 iconst 0
istore 2 istore 2
iload 1 iload 1
load_int 1 iconst 1
if_icmpeq LABEL13 if_icmpeq LABEL13
jump LABEL27 jump LABEL27
LABEL13: LABEL13:
@@ -26,144 +26,144 @@ LABEL13:
iload 2 iload 2
invoke 89 invoke 89
invoke 223 invoke 223
load_int 1 iconst 1
invoke 927 invoke 927
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL26 if_icmpeq LABEL26
jump LABEL27 jump LABEL27
LABEL26: LABEL26:
invoke 1984 invoke 1984
LABEL27: LABEL27:
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL31 if_icmpeq LABEL31
jump LABEL32 jump LABEL32
LABEL31: LABEL31:
invoke 2581 invoke 2581
LABEL32: LABEL32:
load_int 0 iconst 0
put_varc 5 set_varc_int 5
iload 0 iload 0
load_int 1 iconst 1
if_icmpeq LABEL38 if_icmpeq LABEL38
jump LABEL40 jump LABEL40
LABEL38: LABEL38:
load_string "" sconst ""
050 359 set_varc_string 359
LABEL40: LABEL40:
load_int 0 iconst 0
load_int -8 iconst -8
load_int 1 iconst 1
load_int 1 iconst 1
load_int 10616876 iconst 10616876
widget_put_position_widget if_setposition
load_int 0 iconst 0
load_int 40 iconst 40
load_int 1 iconst 1
load_int 0 iconst 0
load_int 10616876 iconst 10616876
widget_put_size_widget if_setsize
load_int 0 iconst 0
load_int 22 iconst 22
load_int 1 iconst 1
load_int 1 iconst 1
load_int 10616877 iconst 10616877
widget_put_position_widget if_setposition
load_int 0 iconst 0
load_int 20 iconst 20
load_int 1 iconst 1
load_int 0 iconst 0
load_int 10616877 iconst 10616877
widget_put_size_widget if_setsize
load_int 0 iconst 0
load_int 10616876 iconst 10616876
widget_put_hidden_widget if_sethide
load_int 0 iconst 0
load_int 10616877 iconst 10616877
widget_put_hidden_widget if_sethide
load_int 1 iconst 1
load_int 10616881 iconst 10616881
widget_put_hidden_widget if_sethide
load_int 10616885 iconst 10616885
widget_unset_children cc_deleteall
load_int 10616886 iconst 10616886
widget_unset_children cc_deleteall
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616872 iconst 10616872
widget_put_mouse_press_listener_widget if_setonclick
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616872 iconst 10616872
widget_put_render_listener_widget if_setontimer
load_int 10616872 iconst 10616872
widget_unset_children cc_deleteall
load_int 10616878 iconst 10616878
widget_unset_children cc_deleteall
load_int 10616879 iconst 10616879
widget_unset_children cc_deleteall
load_int 10616880 iconst 10616880
widget_unset_children cc_deleteall
load_int 1 iconst 1
load_int 10616878 iconst 10616878
widget_put_hidden_widget if_sethide
load_int 1 iconst 1
load_int 10616879 iconst 10616879
widget_put_hidden_widget if_sethide
load_int 1 iconst 1
load_int 10616880 iconst 10616880
widget_put_hidden_widget if_sethide
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616878 iconst 10616878
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616879 iconst 10616879
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616880 iconst 10616880
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616878 iconst 10616878
widget_put_mouse_exit_listener_widget if_setonmouseleave
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616879 iconst 10616879
widget_put_mouse_exit_listener_widget if_setonmouseleave
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616880 iconst 10616880
widget_put_mouse_exit_listener_widget if_setonmouseleave
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616878 iconst 10616878
widget_put_render_listener_widget if_setontimer
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616879 iconst 10616879
widget_put_render_listener_widget if_setontimer
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616880 iconst 10616880
widget_put_render_listener_widget if_setontimer
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616878 iconst 10616878
widget_put_mouse_press_listener_widget if_setonclick
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616879 iconst 10616879
widget_put_mouse_press_listener_widget if_setonclick
load_int -1 iconst -1
load_string "" sconst ""
load_int 10616880 iconst 10616880
widget_put_mouse_press_listener_widget if_setonclick
get_varc 41 get_varc_int 41
load_int -1 iconst -1
if_icmpeq LABEL154 if_icmpeq LABEL154
jump LABEL156 jump LABEL156
LABEL154: LABEL154:
@@ -171,7 +171,7 @@ LABEL154:
pop_int pop_int
LABEL156: LABEL156:
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL160 if_icmpeq LABEL160
jump LABEL161 jump LABEL161
LABEL160: LABEL160:
runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
+14 -14
View File
@@ -3,43 +3,43 @@
.string_stack_count 0 .string_stack_count 0
.int_var_count 4 .int_var_count 4
.string_var_count 0 .string_var_count 0
load_int 1 iconst 1
load_int 0 iconst 0
load_string "scrollWheelZoom" sconst "scrollWheelZoom"
runelite_callback runelite_callback
if_icmpeq LABEL18 if_icmpeq LABEL18
load_int 0 iconst 0
iload 0 iload 0
load_int 25 iconst 25
imul multiply
isub sub
istore 1 istore 1
load_int 512 iconst 512
istore 2 istore 2
load_int 512 iconst 512
istore 3 istore 3
get_varbit 6357 get_varbit 6357
load_int 0 iconst 0
if_icmpeq LABEL14 if_icmpeq LABEL14
jump LABEL33 jump LABEL33
LABEL14: LABEL14:
get_varbit 4606 get_varbit 4606
load_int 0 iconst 0
if_icmpne LABEL18 if_icmpne LABEL18
jump LABEL19 jump LABEL19
LABEL18: LABEL18:
return return
LABEL19: LABEL19:
6205 viewport_getfov
istore 2 istore 2
istore 3 istore 3
iload 3 iload 3
iload 1 iload 1
iadd add
istore 3 istore 3
iload 2 iload 2
iload 1 iload 1
iadd add
istore 2 istore 2
iload 3 iload 3
iload 2 iload 2
runelite-client/src/main/scripts/SendPrivateMessage.rs2asm
+2 -2
View File
@@ -30,5 +30,5 @@
; Send a private message ; Send a private message
sload 0 sload 0
sload 1 sload 1
privmsg chat_sendprivate
return return
runelite-client/src/main/scripts/SkillTabBuilder.rs2asm
+211 -211
View File
@@ -3,112 +3,112 @@
.string_stack_count 1 .string_stack_count 1
.int_var_count 11 .int_var_count 11
.string_var_count 4 .string_var_count 4
load_int 83 iconst 83
load_int 49 iconst 49
load_int 1497 iconst 1497
iload 0 iload 0
get_enum_value enum
istore 3 istore 3
iload 0 iload 0
get_boostedskilllevels stat
int_to_string tostring
widget_put_text cc_settext
iload 0 iload 0
get_realskilllevels stat_base
istore 4 istore 4
iload 0 ; load the skill id from arguments iload 0 ; load the skill id from arguments
iload 4 ; load the current real skill level iload 4 ; load the current real skill level
load_string "skillTabBaseLevel" ; push event name sconst "skillTabBaseLevel" ; push event name
runelite_callback ; invoke callback runelite_callback ; invoke callback
istore 4 ; store the (possibly) edited real skill level istore 4 ; store the (possibly) edited real skill level
iload 4 iload 4
int_to_string tostring
widget_put_text 1 cc_settext 1
iload 0 iload 0
get_skillexperiences stat_xp
istore 5 istore 5
load_string "," sconst ","
sstore 1 sstore 1
sload 0 sload 0
load_string " XP:" sconst " XP:"
string_append 2 join_string 2
sstore 2 sstore 2
iload 5 iload 5
sload 1 sload 1
invoke 46 invoke 46
sstore 3 sstore 3
load_int 0 iconst 0
istore 6 istore 6
get_varbit 4181 get_varbit 4181
load_int 0 iconst 0
if_icmpeq LABEL35 if_icmpeq LABEL35
jump LABEL66 jump LABEL66
LABEL35: LABEL35:
iload 4 iload 4
load_int 99 iconst 99
load_string "skillTabMaxLevel" ; push event name sconst "skillTabMaxLevel" ; push event name
runelite_callback ; invoke callback runelite_callback ; invoke callback
if_icmplt LABEL39 if_icmplt LABEL39
jump LABEL65 jump LABEL65
LABEL39: LABEL39:
load_int 105 iconst 105
load_int 105 iconst 105
load_int 256 iconst 256
iload 4 iload 4
load_int 1 iconst 1
iadd add
get_enum_value enum
istore 6 istore 6
sload 2 sload 2
load_string "|Next level at:|Remaining XP:" sconst "|Next level at:|Remaining XP:"
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
iload 6 iload 6
sload 1 sload 1
invoke 46 invoke 46
load_string "|" sconst "|"
iload 6 iload 6
iload 5 iload 5
isub sub
sload 1 sload 1
invoke 46 invoke 46
string_append 4 join_string 4
concat_string append
sstore 3 sstore 3
LABEL65: LABEL65:
jump LABEL84 jump LABEL84
LABEL66: LABEL66:
sload 2 sload 2
load_string "|Next level at:" sconst "|Next level at:"
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
load_int 105 iconst 105
load_int 105 iconst 105
load_int 256 iconst 256
iload 4 iload 4
load_int 1 iconst 1
iadd add
get_enum_value enum
sload 1 sload 1
invoke 46 invoke 46
string_append 2 join_string 2
concat_string append
sstore 3 sstore 3
LABEL84: LABEL84:
load_int 0 iconst 0
istore 7 istore 7
load_int 0 iconst 0
istore 8 istore 8
load_int 0 iconst 0
istore 9 istore 9
load_int 0 iconst 0
istore 10 istore 10
invoke 1138 invoke 1138
load_int 1 iconst 1
if_icmpeq LABEL96 if_icmpeq LABEL96
jump LABEL278 jump LABEL278
LABEL96: LABEL96:
@@ -116,13 +116,13 @@ LABEL96:
invoke 1936 invoke 1936
istore 7 istore 7
iload 7 iload 7
load_int -1 iconst -1
if_icmpne LABEL103 if_icmpne LABEL103
jump LABEL133 jump LABEL133
LABEL103: LABEL103:
iload 7 iload 7
load_int 10 iconst 10
idiv div
istore 7 istore 7
iload 7 iload 7
iload 5 iload 5
@@ -130,35 +130,35 @@ LABEL103:
jump LABEL133 jump LABEL133
LABEL111: LABEL111:
sload 2 sload 2
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "XP to regain:" sconst "XP to regain:"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
iload 7 iload 7
iload 5 iload 5
isub sub
sload 1 sload 1
invoke 46 invoke 46
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 3 sstore 3
load_int 1 iconst 1
istore 8 istore 8
LABEL133: LABEL133:
iload 8 iload 8
load_int 0 iconst 0
if_icmpeq LABEL137 if_icmpeq LABEL137
jump LABEL278 jump LABEL278
LABEL137: LABEL137:
get_varp 1588 get_varp 1588
load_int 0 iconst 0
if_icmpgt LABEL141 if_icmpgt LABEL141
jump LABEL278 jump LABEL278
LABEL141: LABEL141:
@@ -171,279 +171,279 @@ LABEL141:
6: LABEL144 6: LABEL144
jump LABEL278 jump LABEL278
LABEL144: LABEL144:
load_int 20 iconst 20
invoke 2031 invoke 2031
istore 10 istore 10
iload 10 iload 10
load_int 0 iconst 0
if_icmpgt LABEL151 if_icmpgt LABEL151
jump LABEL170 jump LABEL170
LABEL151: LABEL151:
sload 2 sload 2
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "XP permitted:" sconst "XP permitted:"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
iload 10 iload 10
sload 1 sload 1
invoke 46 invoke 46
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 3 sstore 3
jump LABEL188 jump LABEL188
LABEL170: LABEL170:
load_int 1 iconst 1
istore 9 istore 9
sload 2 sload 2
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "XP permitted:" sconst "XP permitted:"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "NONE" sconst "NONE"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 3 sstore 3
LABEL188: LABEL188:
jump LABEL278 jump LABEL278
LABEL189: LABEL189:
load_int 30 iconst 30
invoke 2031 invoke 2031
istore 10 istore 10
iload 10 iload 10
load_int 0 iconst 0
if_icmpgt LABEL196 if_icmpgt LABEL196
jump LABEL215 jump LABEL215
LABEL196: LABEL196:
sload 2 sload 2
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "XP permitted:" sconst "XP permitted:"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
iload 10 iload 10
sload 1 sload 1
invoke 46 invoke 46
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 3 sstore 3
jump LABEL233 jump LABEL233
LABEL215: LABEL215:
load_int 1 iconst 1
istore 9 istore 9
sload 2 sload 2
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "XP permitted:" sconst "XP permitted:"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "NONE" sconst "NONE"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 3 sstore 3
LABEL233: LABEL233:
jump LABEL278 jump LABEL278
LABEL234: LABEL234:
load_int 40 iconst 40
invoke 2031 invoke 2031
istore 10 istore 10
iload 10 iload 10
load_int 0 iconst 0
if_icmpgt LABEL241 if_icmpgt LABEL241
jump LABEL260 jump LABEL260
LABEL241: LABEL241:
sload 2 sload 2
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "XP permitted:" sconst "XP permitted:"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
iload 10 iload 10
sload 1 sload 1
invoke 46 invoke 46
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 3 sstore 3
jump LABEL278 jump LABEL278
LABEL260: LABEL260:
load_int 1 iconst 1
istore 9 istore 9
sload 2 sload 2
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "XP permitted:" sconst "XP permitted:"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 2 sstore 2
sload 3 sload 3
load_string "|" sconst "|"
load_string "<col=7c0808>" sconst "<col=7c0808>"
load_string "NONE" sconst "NONE"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
concat_string append
sstore 3 sstore 3
LABEL278: LABEL278:
iload 1 iload 1
load_int 5 iconst 5
widget_load_child 1 cc_find 1
load_int 1 iconst 1
if_icmpeq LABEL284 if_icmpeq LABEL284
jump LABEL294 jump LABEL294
LABEL284: LABEL284:
iload 9 iload 9
load_int 1 iconst 1
if_icmpeq LABEL288 if_icmpeq LABEL288
jump LABEL291 jump LABEL291
LABEL288: LABEL288:
load_int 0 iconst 0
widget_put_hidden 1 cc_sethide 1
jump LABEL293 jump LABEL293
LABEL291: LABEL291:
load_int 1 iconst 1
widget_put_hidden 1 cc_sethide 1
LABEL293: LABEL293:
jump LABEL321 jump LABEL321
LABEL294: LABEL294:
iload 1 iload 1
load_int 5 iconst 5
load_int 5 iconst 5
widget_create_child 1 cc_create 1
load_int 6 iconst 6
load_int 0 iconst 0
load_int 0 iconst 0
load_int 1 iconst 1
widget_put_position 1 cc_setposition 1
load_int 19 iconst 19
load_int 19 iconst 19
load_int 0 iconst 0
load_int 0 iconst 0
widget_put_size 1 cc_setsize 1
load_int 940 iconst 940
widget_put_spriteid 1 cc_setgraphic 1
load_int 65793 iconst 65793
widget_put_sprite2 1 cc_setgraphicshadow 1
iload 9 iload 9
load_int 1 iconst 1
if_icmpeq LABEL316 if_icmpeq LABEL316
jump LABEL319 jump LABEL319
LABEL316: LABEL316:
load_int 0 iconst 0
widget_put_hidden 1 cc_sethide 1
jump LABEL321 jump LABEL321
LABEL319: LABEL319:
load_int 1 iconst 1
widget_put_hidden 1 cc_sethide 1
LABEL321: LABEL321:
iload 3 iload 3
load_int 1 iconst 1
if_icmpeq LABEL325 if_icmpeq LABEL325
jump LABEL344 jump LABEL344
LABEL325: LABEL325:
get_ismembers map_members
load_int 0 iconst 0
if_icmpeq LABEL329 if_icmpeq LABEL329
jump LABEL344 jump LABEL344
LABEL329: LABEL329:
get_varc 103 get_varc_int 103
load_int 0 iconst 0
if_icmpeq LABEL333 if_icmpeq LABEL333
jump LABEL344 jump LABEL344
LABEL333: LABEL333:
load_string "<col=ff0000>" sconst "<col=ff0000>"
sload 0 sload 0
load_string ":" sconst ":"
load_string "</col>" sconst "</col>"
string_append 4 join_string 4
sstore 2 sstore 2
load_string "<col=ff0000>" sconst "<col=ff0000>"
load_string "Members Only" sconst "Members Only"
load_string "</col>" sconst "</col>"
string_append 3 join_string 3
sstore 3 sstore 3
LABEL344: LABEL344:
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL348 if_icmpeq LABEL348
jump LABEL375 jump LABEL375
LABEL348: LABEL348:
load_int 2367 iconst 2367
load_int -2147483644 iconst -2147483644
load_int -2147483645 iconst -2147483645
load_int -1 iconst -1
iload 2 iload 2
sload 2 sload 2
sload 3 sload 3
load_int 495 iconst 495
load_string "iIiIssf" sconst "iIiIssf"
iload 1 iload 1
widget_put_option_click_listener_widget if_setonop
get_varc 218 get_varc_int 218
iload 1 iload 1
if_icmpeq LABEL363 if_icmpeq LABEL363
jump LABEL374 jump LABEL374
LABEL363: LABEL363:
get_varc 217 get_varc_int 217
load_int -1 iconst -1
if_icmpeq LABEL367 if_icmpeq LABEL367
jump LABEL374 jump LABEL374
LABEL367: LABEL367:
iload 1 iload 1
load_int -1 iconst -1
iload 2 iload 2
sload 2 sload 2
sload 3 sload 3
load_int 495 iconst 495
invoke 2344 invoke 2344
LABEL374: LABEL374:
jump LABEL390 jump LABEL390
LABEL375: LABEL375:
load_int 992 iconst 992
load_int -2147483645 iconst -2147483645
load_int -1 iconst -1
iload 2 iload 2
sload 2 sload 2
sload 3 sload 3
load_int 495 iconst 495
load_int 25 iconst 25
load_int 5 iconst 5
idiv div
load_string "IiIssfi" sconst "IiIssfi"
iload 1 iload 1
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int 0 iconst 0
put_varc 2 set_varc_int 2
LABEL390: LABEL390:
return return
runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm
+48 -48
View File
@@ -5,105 +5,105 @@
.string_var_count 2 .string_var_count 2
invoke 1007 invoke 1007
istore 2 istore 2
load_string "Total level:" sconst "Total level:"
load_string "<br>" sconst "<br>"
iload 2 iload 2
int_to_string tostring
string_append 3 join_string 3
iload 0 iload 0
load_string "skillTabTotalLevel" ; push event name sconst "skillTabTotalLevel" ; push event name
runelite_callback ; invoke callback runelite_callback ; invoke callback
widget_put_text_widget if_settext
iload 0 iload 0
widget_put_actions_null_widget if_clearops
load_string "" sconst ""
sstore 0 sstore 0
load_string "" sconst ""
sstore 1 sstore 1
get_ismembers map_members
load_int 1 iconst 1
if_icmpeq LABEL22 if_icmpeq LABEL22
get_varc 103 get_varc_int 103
load_int 1 iconst 1
if_icmpeq LABEL22 if_icmpeq LABEL22
jump LABEL28 jump LABEL28
LABEL22: LABEL22:
load_string "Total XP:" sconst "Total XP:"
sstore 0 sstore 0
invoke 1008 invoke 1008
invoke 1009 invoke 1009
sstore 1 sstore 1
jump LABEL37 jump LABEL37
LABEL28: LABEL28:
load_string "Total XP:|Free Total Level:" sconst "Total XP:|Free Total Level:"
sstore 0 sstore 0
invoke 1008 invoke 1008
invoke 1009 invoke 1009
load_string "|" sconst "|"
invoke 1320 invoke 1320
int_to_string tostring
string_append 3 join_string 3
sstore 1 sstore 1
LABEL37: LABEL37:
invoke 1972 invoke 1972
load_int 1 iconst 1
if_icmpeq LABEL41 if_icmpeq LABEL41
jump LABEL72 jump LABEL72
LABEL41: LABEL41:
load_int 1 iconst 1
load_string "Toggle Total XP" sconst "Toggle Total XP"
iload 0 iload 0
widget_put_action_widget if_setop
load_int 2367 iconst 2367
load_int -2147483644 iconst -2147483644
load_int -2147483645 iconst -2147483645
load_int -1 iconst -1
iload 1 iload 1
sload 0 sload 0
sload 1 sload 1
load_int 495 iconst 495
load_string "iIiIssf" sconst "iIiIssf"
iload 0 iload 0
widget_put_option_click_listener_widget if_setonop
get_varc 218 get_varc_int 218
iload 0 iload 0
if_icmpeq LABEL60 if_icmpeq LABEL60
jump LABEL71 jump LABEL71
LABEL60: LABEL60:
get_varc 217 get_varc_int 217
load_int -1 iconst -1
if_icmpeq LABEL64 if_icmpeq LABEL64
jump LABEL71 jump LABEL71
LABEL64: LABEL64:
iload 0 iload 0
load_int -1 iconst -1
iload 1 iload 1
sload 0 sload 0
sload 1 sload 1
load_int 495 iconst 495
invoke 2344 invoke 2344
LABEL71: LABEL71:
jump LABEL92 jump LABEL92
LABEL72: LABEL72:
load_int 992 iconst 992
load_int -2147483645 iconst -2147483645
load_int -1 iconst -1
iload 1 iload 1
sload 0 sload 0
sload 1 sload 1
load_int 495 iconst 495
load_int 25 iconst 25
load_int 5 iconst 5
idiv div
load_string "IiIssfi" sconst "IiIssfi"
iload 0 iload 0
widget_put_mouse_hover_listener_widget if_setonmouserepeat
load_int 40 iconst 40
iload 1 iload 1
load_string "I" sconst "I"
iload 0 iload 0
widget_put_mouse_exit_listener_widget if_setonmouseleave
load_int 0 iconst 0
put_varc 2 set_varc_int 2
LABEL92: LABEL92:
return return
runelite-client/src/main/scripts/TriggerBankLayout.rs2asm
+10 -10
View File
@@ -5,24 +5,24 @@
.string_var_count 0 .string_var_count 0
; Check if we should allow server to relayout bank ; Check if we should allow server to relayout bank
load_int 1 ; true iconst 1 ; true
load_int 0 ; load active boolean iconst 0 ; load active boolean
load_string "getSearchingTagTab" ; push event name sconst "getSearchingTagTab" ; push event name
runelite_callback ; invoke callback runelite_callback ; invoke callback
if_icmpne LABEL2 if_icmpne LABEL2
; Let layout continue if current bank tab is 0 ; Let layout continue if current bank tab is 0
get_varbit 4150 get_varbit 4150
load_int 0 iconst 0
if_icmpeq LABEL2 if_icmpeq LABEL2
; Reset the current bank tab to 0 otherwise ; Reset the current bank tab to 0 otherwise
load_int 0 iconst 0
set_varbit 4150 set_varbit 4150
load_string "Server attempted to reset bank tab." sconst "Server attempted to reset bank tab."
load_string "debug" sconst "debug"
runelite_callback runelite_callback
LABEL2: LABEL2:
iload 0 iload 0
@@ -39,4 +39,4 @@ LABEL2:
iload 11 iload 11
iload 12 iload 12
invoke 277 invoke 277
return return
runelite-client/src/main/scripts/ZoomHandler.rs2asm
+35 -35
View File
@@ -4,88 +4,88 @@
.int_var_count 6 .int_var_count 6
.string_var_count 0 .string_var_count 0
get_varbit 4606 get_varbit 4606
load_int 0 iconst 0
if_icmpne LABEL4 if_icmpne LABEL4
jump LABEL5 jump LABEL5
LABEL4: LABEL4:
return return
LABEL5: LABEL5:
load_int 896 iconst 896
load_string "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
iload 0 iload 0
invoke 1046 invoke 1046
istore 0 istore 0
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
iload 0 iload 0
invoke 1045 invoke 1045
istore 0 istore 0
load_int 896 iconst 896
load_string "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
iload 1 iload 1
invoke 1046 invoke 1046
istore 1 istore 1
load_int 128 iconst 128
load_string "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
iload 1 iload 1
invoke 1045 invoke 1045
istore 1 istore 1
iload 0 iload 0
iload 1 iload 1
6200 viewport_setfov
load_int 0 iconst 0
istore 2 istore 2
load_int 0 iconst 0
istore 3 istore 3
get_viewport_size viewport_geteffectivesize
istore 3 istore 3
istore 2 istore 2
iload 3 iload 3
load_int 334 iconst 334
isub sub
istore 4 istore 4
iload 4 iload 4
load_int 0 iconst 0
if_icmplt LABEL39 if_icmplt LABEL39
jump LABEL42 jump LABEL42
LABEL39: LABEL39:
load_int 0 iconst 0
istore 4 istore 4
jump LABEL48 jump LABEL48
LABEL42: LABEL42:
iload 4 iload 4
load_int 100 iconst 100
if_icmpgt LABEL46 if_icmpgt LABEL46
jump LABEL48 jump LABEL48
LABEL46: LABEL46:
load_int 100 iconst 100
istore 4 istore 4
LABEL48: LABEL48:
iload 0 iload 0
iload 1 iload 1
iload 0 iload 0
isub sub
iload 4 iload 4
imul multiply
load_int 100 iconst 100
idiv div
iadd add
istore 5 istore 5
load_int 25 iconst 25
load_int 25 iconst 25
iload 5 iload 5
imul multiply
load_int 256 iconst 256
idiv div
iadd add
set_camera_focal_point_height cam_setfollowheight
iload 0 iload 0
iload 1 iload 1
put_varc 74 set_varc_int 74
put_varc 73 set_varc_int 73
invoke 1049 invoke 1049
return return
runelite-client/src/main/scripts/null.rs2asm
+1 -1
View File
@@ -34,4 +34,4 @@
.int_var_count 0 .int_var_count 0
.string_var_count 0 .string_var_count 0
return return
runelite-mixins/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<artifactId>mixins</artifactId> <artifactId>mixins</artifactId>
runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
+9 -1
View File
@@ -519,7 +519,15 @@ public abstract class RSWidgetMixin implements RSWidget
} }
else else
{ {
index = siblings.length; index = 0;
for (int i = siblings.length - 1; i >= 0; i--)
{
if (siblings[i] != null)
{
index = i + 1;
break;
}
}
} }
} }
runelite-script-assembler-plugin/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<artifactId>script-assembler-plugin</artifactId> <artifactId>script-assembler-plugin</artifactId>
runelite-script-assembler-plugin/src/main/java/net/runelite/script/RuneLiteInstructions.java
+1 -1
View File
@@ -33,6 +33,6 @@ public class RuneLiteInstructions extends Instructions
public void init() public void init()
{ {
super.init(); super.init();
add(RUNELITE_EXECUTE, "runelite_callback", 0, 0, 1, 0); add(RUNELITE_EXECUTE, "runelite_callback");
} }
} }
runescape-api/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.16-SNAPSHOT</version> <version>1.5.17-SNAPSHOT</version>
</parent> </parent>
<groupId>net.runelite.rs</groupId> <groupId>net.runelite.rs</groupId>