diff --git a/cache-client/pom.xml b/cache-client/pom.xml
index 94e5d7579f..637fd80c1f 100644
--- a/cache-client/pom.xml
+++ b/cache-client/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
cache-client
diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml
index 4cccfd84ad..0dfc42aee6 100644
--- a/cache-updater/pom.xml
+++ b/cache-updater/pom.xml
@@ -28,7 +28,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
Cache Updater
diff --git a/cache/pom.xml b/cache/pom.xml
index 308bdc1359..1d120e5a7b 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
cache
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java
index 6f8512695a..e77964a5ca 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.Map;
import net.runelite.cache.definitions.ScriptDefinition;
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_STRING;
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)
{
opcode = in.readUnsignedShort();
- if (opcode == LOAD_STRING)
+ if (opcode == SCONST)
{
stringOperands[i] = in.readString();
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java
index c1fae2e995..3b130c4c53 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Map.Entry;
import net.runelite.cache.definitions.ScriptDefinition;
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_STRING;
import static net.runelite.cache.script.Opcodes.RETURN;
@@ -48,7 +48,7 @@ public class ScriptSaver
{
int opcode = instructions[i];
out.writeShort(opcode);
- if (opcode == LOAD_STRING)
+ if (opcode == SCONST)
{
out.writeString(stringOperands[i]);
}
diff --git a/cache/src/main/java/net/runelite/cache/script/Instruction.java b/cache/src/main/java/net/runelite/cache/script/Instruction.java
index 8eb8a2bb3f..b369c97de5 100644
--- a/cache/src/main/java/net/runelite/cache/script/Instruction.java
+++ b/cache/src/main/java/net/runelite/cache/script/Instruction.java
@@ -28,10 +28,6 @@ public class Instruction
{
private final int opcode;
private String name;
- private int intStackPops;
- private int stringStackPops;
- private int intStackPushes;
- private int stringStackPushes;
public Instruction(int opcode)
{
@@ -52,44 +48,4 @@ public class Instruction
{
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;
- }
}
diff --git a/cache/src/main/java/net/runelite/cache/script/Instructions.java b/cache/src/main/java/net/runelite/cache/script/Instructions.java
index 94755ab986..17dfabfcd1 100644
--- a/cache/src/main/java/net/runelite/cache/script/Instructions.java
+++ b/cache/src/main/java/net/runelite/cache/script/Instructions.java
@@ -1,5 +1,7 @@
/*
* Copyright (c) 2017, Adam
+ * Copyright (c) 2018-2019, Hunter WB
+ * Copyright (c) 2019, Abex
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,516 +37,480 @@ public class Instructions
public void init()
{
- add(LOAD_INT, "load_int", 0, 1);
- add(GET_VARP, "get_varp", 0, 1);
- add(PUT_VARP, "put_varp", 0, 1);
- add(LOAD_STRING, "load_string", 0, 0, 0, 1);
- add(JUMP, "jump", 0, 0);
- add(IF_ICMPNE, "if_icmpne", 2, 0);
- add(IF_ICMPEQ, "if_icmpeq", 2, 0);
- add(IF_ICMPLT, "if_icmplt", 2, 0);
- add(IF_ICMPGT, "if_icmpgt", 2, 0);
- add(RETURN, "return", 0, 0);
- add(GET_VARBIT, "get_varbit", 0, 1);
- add(SET_VARBIT, "set_varbit", 1, 0);
- add(IF_ICMPLE, "if_icmple", 2, 0);
- add(IF_ICMPGE, "if_icmpge", 2, 0);
- add(ILOAD, "iload", 0, 1);
- add(ISTORE, "istore", 1, 0);
- add(SLOAD, "sload", 0, 0, 0, 1);
- add(SSTORE, "sstore", 0, 0, 1, 0);
- add(STRING_APPEND, "string_append", 0, 0, -1, 1);
- add(POP_INT, "pop_int", 1, 0);
- add(POP_STRING, "pop_string", 0, 0, 1, 0);
- add(INVOKE, "invoke", -1, -1, -1, -1);
- add(GET_VARC, "get_varc", 0, 1);
- add(PUT_VARC, "put_varc", 1, 0);
- add(ARRAY_INITIALIZE, "array_initialize", 1, 0);
- add(ARRAY_LOAD, "array_load", 1, 1);
- add(ARRAY_STORE, "array_store", 2, 0);
- add(GET_VARC_STRING, "get_varc_string", 0, 0, 0, 1);
- add(PUT_VARC_STRING, "put_varc_string", 0, 0, 1, 0);
- add(GET_VARC_STRING_2, "get_varc_string2", 0, 0, 0, 1);
- add(PUT_VARC_STRING_2, "put_varc_string2", 0, 0, 1, 0);
- add(SWITCH, "switch", 1, 0);
- add(WIDGET_CREATE_CHILD, "widget_create_child", 3, 0);
- add(WIDGET_DESTROY_CHILD, "widget_destroy_child", 0, 0);
- add(WIDGET_UNSET_CHILDREN, "widget_unset_children", 1, 0);
- add(WIDGET_LOAD_CHILD, "widget_load_child", 2, 1);
- add(WIDGET_LOAD, "widget_load", 1, 1);
- // 2000-2100 are the same as 1000-1100, but
- // pop an additional int which is used to get the current widget
- add(WIDGET_PUT_POSITION, "widget_put_position", 4, 0);
- add(WIDGET_PUT_SIZE, "widget_put_size", 4, 0);
- add(WIDGET_PUT_HIDDEN, "widget_put_hidden", 1, 0);
- add(WIDGET_PUT_NO_CLICK_THROUGH, "widget_put_no_click_through", 1, 0);
- add(1006, 1, 0);
- // 2100-2200 and 1100-1200 do the same thing
- add(WIDGET_PUT_SCROLL, "widget_put_scroll", 2, 0);
- add(WIDGET_PUT_TEXTCOLOR, "widget_put_textcolor", 1, 0);
- add(WIDGET_PUT_FILLED, "widget_put_filled", 1, 0);
- add(WIDGET_PUT_OPACITY, "widget_put_opacity", 1, 0);
- add(WIDGET_PUT_LINE_WIDTH, "widget_put_line_width", 1, 0);
- add(WIDGET_PUT_SPRITEID, "widget_put_spriteid", 1, 0);
- add(WIDGET_PUT_TEXTUREID, "widget_put_textureid", 1, 0);
- add(WIDGET_PUT_SPRITE_TILING, "widget_put_sprite_tiling", 1, 0);
- add(WIDGET_PUT_MODELID_1, "widget_put_modelid_1", 1, 0);
- add(WIDGET_PUT_3D_ROTATION, "widget_put_3d_rotation", 6, 0);
- add(WIDGET_PUT_ANIMATION, "widget_put_animation", 1, 0);
- add(1111, 1, 0);
- add(WIDGET_PUT_TEXT, "widget_put_text", 0, 0, 1, 0);
- add(WIDGET_PUT_FONTID, "widget_put_fontid", 1, 0);
- add(WIDGET_PUT_TEXT_ALIGNMENT, "widget_put_text_alignment", 3, 0);
- add(WIDGET_PUT_TEXT_SHADOWED, "widget_put_text_shadowed", 1, 0);
- add(WIDGET_PUT_BORDERTHICKNESS, "widget_put_borderthickness", 1, 0);
- add(WIDGET_PUT_SPRITE2, "widget_put_sprite2", 1, 0);
- add(WIDGET_PUT_FLIPPEDVERTICALLY, "widget_put_flippedvertically", 1, 0);
- add(WIDGET_PUT_FLIPPEDHORIZONALLY, "widget_put_flippedhorizonally", 1, 0);
- add(WIDGET_PUT_SCROLLWIDTHHEIGHT, "widget_put_scrollwidthheight", 2, 0);
- add(WIDGET_ADVANCE_DIALOGUE, "widget_advance_dialogue", 0, 0);
- add(1122, 1, 0);
- add(1123, 1, 0);
- add(1124, 1, 0);
- add(1125, 1, 0);
- // and 1200-1300 and 2200-2300
- add(WIDGET_PUT_MODELID_2, "widget_put_modelid_2", 1, 0);
- add(WIDGET_PUT_MODELID_3, "widget_put_modelid_3", 0, 0);
- add(1200, 2, 0);
- add(1205, 2, 0);
- add(1212, 2, 0);
- // and 1300-1400 and 2300-2400
- add(WIDGET_PUT_ACTION, "widget_put_action", 1, 0, 1, 0);
- add(WIDGET_PUT_DRAG_PARENT, "widget_put_drag_parent", 2, 0);
- add(1302, 1, 0);
- add(1303, 1, 0);
- add(1304, 1, 0);
- add(WIDGET_PUT_NAME, "widget_put_name", 0, 0, 1, 0);
- add(WIDGET_PUT_SELECTED_ACTION, "widget_put_selected_action", 0, 0, 1, 0);
- add(WIDGET_PUT_ACTIONS_NULL, "widget_put_actions_null", 0, 0);
- // and 1400-1500 and 2400-2500
- add(WIDGET_PUT_MOUSE_PRESS_LISTENER, "widget_put_mouse_press_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_DRAGGED_OVER_LISTENER, "widget_put_mouse_dragged_over_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_MOUSE_RELEASE_LISTENER, "widget_put_mouse_release_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_MOUSE_ENTER_LISTENER, "widget_put_mouse_enter_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_MOUSE_EXIT_LISTENER, "widget_put_mouse_exit_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_DRAG_START_LISTENER, "widget_put_drag_start_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_USE_WITH_LISTENER, "widget_put_use_with_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_CONFIG_LISTENER, "widget_put_config_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_RENDER_LISTENER, "widget_put_render_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_OPTION_CLICK_LISTENER, "widget_put_option_click_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_DRAG_RELEASE_LISTENER, "widget_put_drag_release_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_DRAG_LISTENER, "widget_put_drag_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_MOUSE_HOVER_LISTENER, "widget_put_mouse_hover_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_TABLE_LISTENER, "widget_put_table_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_SKILL_LISTENER, "widget_put_skill_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_USE_LISTENER, "widget_put_use_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_SCROLL_LISTENER, "widget_put_scroll_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_MSG_LISTENER, "widget_put_msg_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_KEY_LISTENER, "widget_put_key_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_FRIENDS_LISTENER, "widget_put_friends_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_CLAN_LISTENER, "widget_put_clan_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_DIALOG_ABORT_LISTENER, "widget_put_dialog_abort_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_OPENCLOSE_LISTENER, "widget_put_openclose_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_GE_LISTENER, "widget_put_ge_listener", -1, 0, -1, 0);
- add(WIDGET_PUT_RESIZE_LISTENER, "widget_put_resize_listener", -1, 0, -1, 0);
- // and 1500-1600 and 2500-2600
- add(WIDGET_GET_RELATIVEX, "widget_get_relativex", 0, 1);
- add(WIDGET_GET_RELATIVEY, "widget_get_relativey", 0, 1);
- add(WIDGET_GET_WIDTH, "widget_get_width", 0, 1);
- add(WIDGET_GET_HEIGHT, "widget_get_height", 0, 1);
- add(WIDGET_GET_HIDDEN, "widget_get_hidden", 0, 1);
- add(WIDGET_GET_PARENTID, "widget_get_parentid", 0, 1);
- // and 1600-1700 and 2600-2700
- add(WIDGET_GET_SCROLLX, "widget_get_scrollx", 0, 1);
- add(WIDGET_GET_SCROLLY, "widget_get_scrolly", 0, 1);
- add(WIDGET_GET_TEXT, "widget_get_text", 0, 0, 0, 1);
- add(WIDGET_GET_SCROLLWIDTH, "widget_get_scrollwidth", 0, 1);
- add(WIDGET_GET_SCROLLHEIGHT, "widget_get_scrollheight", 0, 1);
- add(WIDGET_GET_MODELZOOM, "widget_get_modelzoom", 0, 1);
- add(WIDGET_GET_ROTATIONX, "widget_get_rotationx", 0, 1);
- add(WIDGET_GET_ROTATIONY, "widget_get_rotationy", 0, 1);
- add(WIDGET_GET_ROTATIONZ, "widget_get_rotationz", 0, 1);
- add(WIDGET_GET_OPACITY, "widget_get_opacity", 0, 1);
- add(1610, 0, 1);
- add(WIDGET_GET_TEXTCOLOR, "widget_get_textcolor", 0, 1);
- add(1612, 0, 1);
- add(1613, 0, 1);
- // 1700
- add(WIDGET_GET_ITEMID, "widget_get_itemid", 0, 1);
- add(WIDGET_GET_STACKSIZE, "widget_get_stacksize", 0, 1);
- add(WIDGET_GET_INDEX, "widget_get_index", 0, 1);
- add(WIDGET_GET_CONFIG, "widget_get_config", 0, 1);
- add(WIDGET_GET_ACTION, "widget_get_action", 1, 0, 0, 1);
- add(WIDGET_GET_NAME, "widget_get_name", 0, 0, 0, 1);
- // and 1900-2000 and 2900-3000
- add(1927, 0, 0);
- // 2000-2100
- add(WIDGET_PUT_POSITION_WIDGET, "widget_put_position_widget", 5, 0);
- add(WIDGET_PUT_SIZE_WIDGET, "widget_put_size_widget", 5, 0);
- add(WIDGET_PUT_HIDDEN_WIDGET, "widget_put_hidden_widget", 2, 0);
- add(WIDGET_PUT_NO_CLICK_THROUGH_WIDGET, "widget_put_no_click_through_widget", 2, 0);
- add(2006, 2, 0);
- // 2100-2200
- add(WIDGET_PUT_SCROLL_WIDGET, "widget_put_scroll_widget", 3, 0);
- add(WIDGET_PUT_TEXTCOLOR_WIDGET, "widget_put_textcolor_widget", 2, 0);
- add(WIDGET_PUT_FILLED_WIDGET, "widget_put_filled_widget", 2, 0);
- add(WIDGET_PUT_OPACITY_WIDGET, "widget_put_opacity_widget", 2, 0);
- add(WIDGET_PUT_LINE_WIDTH_WIDGET, "widget_put_line_width_widget", 2, 0);
- add(WIDGET_PUT_SPRITEID_WIDGET, "widget_put_spriteid_widget", 2, 0);
- add(WIDGET_PUT_TEXTUREID_WIDGET, "widget_put_textureid_widget", 2, 0);
- add(WIDGET_PUT_SPRITE_TILING_WIDGET, "widget_put_sprite_tiling_widget", 2, 0);
- add(WIDGET_PUT_MODELID_1_WIDGET, "widget_put_modelid_1_widget", 2, 0);
- add(WIDGET_PUT_3D_ROTATION_WIDGET, "widget_put_3d_rotation_widget", 7, 0);
- add(WIDGET_PUT_ANIMATION_WIDGET, "widget_put_animation_widget", 2, 0);
- add(2111, 2, 0);
- add(WIDGET_PUT_TEXT_WIDGET, "widget_put_text_widget", 1, 0, 1, 0);
- add(WIDGET_PUT_FONTID_WIDGET, "widget_put_fontid_widget", 2, 0);
- add(WIDGET_PUT_TEXT_ALIGNMENT_WIDGET, "widget_put_text_alignment_widget", 4, 0);
- add(WIDGET_PUT_TEXT_SHADOWED_WIDGET, "widget_put_text_shadowed_widget", 2, 0);
- add(WIDGET_PUT_BORDERTHICKNESS_WIDGET, "widget_put_borderthickness_widget", 2, 0);
- add(WIDGET_PUT_SPRITE2_WIDGET, "widget_put_sprite2_widget", 2, 0);
- add(WIDGET_PUT_FLIPPEDVERTICALLY_WIDGET, "widget_put_flippedvertically_widget", 2, 0);
- add(WIDGET_PUT_FLIPPEDHORIZONALLY_WIDGET, "widget_put_flippedhorizonally_widget", 2, 0);
- add(WIDGET_PUT_SCROLLWIDTHHEIGHT_WIDGET, "widget_put_scrollwidthheight_widget", 3, 0);
- add(WIDGET_ADVANCE_DIALOGUE_WIDGET, "widget_advance_dialogue_window", 1, 0);
- add(2122, 2, 0);
- add(2123, 2, 0);
- add(2124, 2, 0);
- add(2125, 2, 0);
- // 2200-2300
- add(WIDGET_PUT_MODELID_2_WIDGET, "widget_put_modelid_2_widget", 2, 0);
- add(WIDGET_PUT_MODELID_3_WIDGET, "widget_put_modelid_3_widget", 1, 0);
- add(2200, 3, 0);
- add(2205, 3, 0);
- add(2212, 3, 0);
- // 2300-2400
- add(WIDGET_PUT_ACTION_WIDGET, "widget_put_action_widget", 2, 0, 1, 0);
- add(WIDGET_PUT_DRAG_PARENT_WIDGET, "widget_put_drag_parent_widget", 3, 0);
- add(2302, 2, 0);
- add(2303, 2, 0);
- add(2304, 2, 0);
- add(WIDGET_PUT_NAME_WIDGET, "widget_put_name_widget", 1, 0, 1, 0);
- add(WIDET_PUT_SELECTED_ACTION_WIDGET, "widget_put_selected_action_widget", 1, 0, 1, 0);
- add(WIDGET_PUT_ACTIONS_NULL_WIDGET, "widget_put_actions_null_widget", 1, 0);
- // 2400-2500
- add(WIDGET_PUT_MOUSE_PRESS_LISTENER_WIDGET, "widget_put_mouse_press_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_DRAGGED_OVER_LISTENER_WIDGET, "widget_put_dragged_over_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_MOUSE_RELEASE_LISTENER_WIDGET, "widget_put_mouse_release_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_MOUSE_ENTER_LISTENER_WIDGET, "widget_put_mouse_enter_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_MOUSE_EXIT_LISTENER_WIDGET, "widget_put_mouse_exit_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_DRAG_START_LISTENER_WIDGET, "widget_put_drag_start_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_USE_WITH_LISTENER_WIDGET, "widget_put_mouse_use_with_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_CONFIG_LISTENER_WIDGET, "widget_put_config_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_RENDER_LISTENER_WIDGET, "widget_put_render_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_OPTION_CLICK_LISTENER_WIDGET, "widget_put_option_click_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_DRAG_RELEASE_LISTENER_WIDGET, "widget_put_drag_release_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_DRAG_LISTENER_WIDGET, "widget_put_drag_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_MOUSE_HOVER_LISTENER_WIDGET, "widget_put_mouse_hover_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_TABLE_LISTENER_WIDGET, "widget_put_table_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_SKILL_LISTENER_WIDGET, "widget_put_skill_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_USE_LISTENER_WIDGET, "widget_put_use_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_SCROLL_LISTENER_WIDGET, "widget_put_scroll_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_MSG_LISTENER_WIDGET, "widget_put_msg_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_KEY_LISTENER_WIDGET, "widget_put_key_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_FRIENDS_LISTENER_WIDGET, "widget_put_friends_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_CLAN_LISTENER_WIDGET, "widget_put_clan_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_DIALOG_ABORT_LISTENER_WIDGET, "widget_put_dialog_abort_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_OPENCLOSE_LISTENER_WIDGET, "widget_put_openclose_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_GE_LISTENER_WIDGET, "widget_put_ge_listener_widget", -1, 0, -1, 0);
- add(WIDGET_PUT_RESIZE_LISTENER_WIDGET, "widget_put_resize_listener_widget", -1, 0, -1, 0);
- // 2500-2600
- add(WIDGET_GET_RELATIVEX_WIDGET, "widget_get_relativex_widget", 1, 1);
- add(WIDGET_GET_RELATIVEY_WIDGET, "widget_get_relativey_widget", 1, 1);
- add(WIDGET_GET_WIDTH_WIDGET, "widget_get_width_widget", 1, 1);
- add(WIDGET_GET_HEIGHT_WIDGET, "widget_get_height_widget", 1, 1);
- add(WIDGET_GET_HIDDEN_WIDGET, "widget_get_hidden_widget", 1, 1);
- add(WIDGET_GET_PARENTID_WIDGET, "widget_get_parentid_widget", 1, 1);
- // 2600-2700
- add(WIDGET_GET_SCROLLX_WIDGET, "widget_get_scrollx_widget", 1, 1);
- add(WIDGET_GET_SCROLLY_WIDGET, "widget_get_scrolly_widget", 1, 1);
- add(WIDGET_GET_TEXT_WIDGET, "widget_get_text_widget", 1, 0, 0, 1);
- add(WIDGET_GET_SCROLLWIDTH_WIDGET, "widget_get_scrollwidth_widget", 1, 1);
- add(WIDGET_GET_SCROLLHEIGHT_WIDGET, "widget_get_scrollheight_widget", 1, 1);
- add(WIDGET_GET_MODELZOOM_WIDGET, "widget_get_modelzoom_widget", 1, 1);
- add(WIDGET_GET_ROTATIONX_WIDGET, "widget_get_rotationx_widget", 1, 1);
- add(WIDGET_GET_ROTATIONY_WIDGET, "widget_get_rotationy_widget", 1, 1);
- add(WIDGET_GET_ROTATIONZ_WIDGET, "widget_get_rotationz_widget", 1, 1);
- add(WIDGET_GET_OPACITY_WIDGET, "widget_get_opacity_widget", 1, 1);
- add(2610, 1, 1);
- add(WIDGET_GET_TEXTCOLOR_WIDGET, "widget_get_textcolor_widget", 1, 1);
- add(2612, 1, 1);
- add(2613, 1, 1);
- // 2700-2800
- add(WIDGET_GET_ITEMID_WIDGET, "widget_get_itemid_widget", 1, 1);
- add(WIDGET_GET_STACKSIZE_WIDGET, "widget_get_stacksize_widget", 1, 1);
- add(WIGET_GET_INDEX_WIDGET, "widget_get_index_widget", 1, 1);
- add(GET_WIDGET_ROOT, "get_widget_root", 0, 1);
- // 2800-2900
- add(WIDGET_GET_CONFIG_WIGET, "widget_get_config_widget", 1, 1);
- add(WIDGET_GET_ACTION_WIDGET, "widget_get_action_widget", 2, 0, 0, 1);
- add(WIDGET_GET_NAME_WIDGET, "widget_get_name_widget", 1, 0, 0, 1);
- // 2900-3000
- add(2927, 1, 0);
- // 3000-3200
- add(SEND_GAME_MESSAGE, "send_game_message", 0, 0, 1, 0);
- add(PLAYER_ANIMATE, "player_animate", 2, 0);
- add(CLOSE_WINDOW, "close_window", 0, 0);
- add(NUMERIC_INPUT, "numeric_input", 0, 0, 1, 0);
- add(STRING_INPUT_1, "string_input_1", 0, 0, 1, 0);
- add(STRING_INPUT_2, "string_input_2", 0, 0, 1, 0);
- add(PLAYER_ACTION, "player_action", 1, 0, 1, 0);
- add(SET_TOP_CONTEXT_MENU_ROW, "set_top_context_menu_row", 3, 0);
- add(SET_TOP_CONTEXT_MENU_ROW_2, "set_top_context_menu_row_2", 2, 0);
- add(SET_MOUSE_BUTTON_CONTROLS_CAMERA, "set_mouse_button_controls_camera", 1, 0);
- add(GET_HIDEROOFS, "get_hideroofs", 0, 1);
- add(SET_HIDEROOFS, "set_hideroofs", 1, 0);
- add(OPEN_URL, "open_url", 1, 0, 1, 0);
- add(ITEM_PRICE, "item_price", 1, 0);
- add(SEND_BUG_REPORT, "send_bug_report", 1, 0, 2, 0);
- add(SET_SHIFT_DROP_ENABLED, "set_shift_drop_enabled", 1, 0);
- add(SET_CONNECTION_TEXT_ENABLED, "set_connection_text_enabled", 1, 0);
- // 3200-3300
- add(PLAY_SOUND_EFFECT, "play_sound_effect", 3, 0);
- add(3201, 1, 0);
- add(3202, 2, 0);
- // 3300-3400
- add(GET_GAMECYCLE, "get_gamecycle", 0, 1);
- add(GET_ITEMCONTAINER_ITEMID, "get_itemcontainer_itemid", 2, 0);
- add(GET_ITEMCONTAINER_STACKSIZE, "get_itemcontainer_stacksize", 2, 1);
- add(GET_ITEMCONTAINER_STACKSIZES_TOTAL, "get_itemcontainer_stacksizes_total", 2, 1);
- add(GET_INVENTORY_SIZE, "get_inventory_size", 1, 1);
- add(GET_BOOSTEDSKILLLEVELS, "get_boostedskilllevels", 1, 1);
- add(GET_REALSKILLLEVELS, "get_realskilllevels", 1, 1);
- add(GET_SKILLEXPERIENCES, "get_skillexperiences", 1, 1);
- add(GET_COORDINATES, "get_coordinates", 0, 1);
- add(DIVIDE_BY_16384, "divide_by_16384", 1, 1);
- add(RIGHT_SHIFT_28, "right_shift_28", 1, 1);
- add(AND_16384, "and_16384", 1, 1);
- add(GET_ISMEMBERS, "get_ismembers", 0, 1);
- add(GET_ITEMCONTAINER_ITEMID_2, "get_itemcontainer_itemid_2", 2, 1);
- add(GET_ITEMCONTAINER_STACKSIZE_2, "get_itemcontainer_stacksize_2", 2, 1);
- add(GET_ITEMCONTAINER_STACKSIZES_TOTAL_2, "get_itemcontainer_stacksizes_total_2", 2, 1);
- add(GET_RIGHTS, "get_rights", 0, 1);
- add(GET_SYSTEM_UPDATE_TIMER, "get_system_update_timer", 0, 1);
- add(GET_WORLDNUM, "get_worldnum", 0, 1);
- add(GET_ENERGY, "get_energy", 0, 1);
- add(GET_WEIGHT, "get_weight", 0, 1);
- add(GET_PLAYERMOD, "get_playermod", 0, 1);
- add(GET_FLAGS, "get_flags", 0, 1);
- add(PACK_LOCATION, "pack_location", 4, 1);
- // 3400-3500
- add(3400, 2, 0, 0, 1);
- add(GET_ENUM_VALUE, "get_enum_value", 4, -1, 0, -1); // this pushes an int or a string, depending on the argument
- // 3500-3700
- add(GET_FRIENDCOUNT, "get_friendcount", 0, 1);
- add(GET_FRIEND, "get_friend", 1, 0, 0, 2);
- add(GET_FRIEND_WORLD, "get_friend_world", 1, 1);
- add(GET_FRIEND_RANK, "get_friend_rank", 1, 1);
- add(3604, 1, 0, 1, 0);
- add(ADD_FRIEND, "add_friend", 0, 0, 1, 0);
- add(REMOVE_FRIEND, "remove_friend", 0, 0, 1, 0);
- add(ADD_IGNORE, "add_ignore", 0, 0, 1, 0);
- add(REMOVE_IGNORE, "remove_ignore", 0, 0, 1, 0);
- add(IS_FRIEND, "is_friend", 0, 1, 1, 0);
- add(GET_CLANCHAT_OWNER, "get_clanchat_owner", 0, 0, 0, 1);
- add(GET_CLANCHATCOUNT, "get_clanchatcount", 0, 1);
- add(GET_CLAN_MEMBER_NAME, "get_clan_member_name", 1, 0, 0, 1);
- add(GET_CLAN_MEMBER_WORLD, "get_clan_member_world", 1, 1);
- add(GET_CLAN_MEMBER_RANK, "get_clan_member_rank", 1, 1);
- add(CLANCHAT_KICK_RANK, "clanchat_kick_rank", 0, 1);
- add(CLANCHAT_KICK_CLANMEMBER, "clanchat_kick_clanmember", 0, 0, 1, 0);
- add(GET_CLANCHAT_RANK, "get_clanchat_rank", 0, 1);
- add(JOIN_CLANCHAT, "join_clanchat", 0, 0, 1, 0);
- add(PART_CLANCHAT, "part_clanchat", 0, 0);
- add(GET_IGNORECOUNT, "get_ignorecount", 0, 1);
- add(GET_IGNORE, "get_ignore", 1, 0, 0, 2);
- add(IS_IGNORE, "is_ignore", 0, 1, 1, 0);
- add(CLANMEMBER_ISME, "clanmember_isme", 1, 1);
- add(GET_CLANCHATOWNER, "get_clanchatowner", 0, 0, 0, 1);
- // 3700-4000
- add(GET_GRANDEXCHANGE_OFFER_IS_SELLING, "get_grandexchange_offer_is_selling", 1, 1);
- add(GET_GRANDEXCHANGE_OFFER_ITEMID, "get_grandexchange_offer_itemid", 1, 1);
- add(GET_GRANDEXCHANGE_OFFER_PRICE, "get_grandexchange_offer_price", 1, 1);
- add(GET_GRANDEXCHANGE_OFFER_TOTALQUANTITY, "get_grandexchange_offer_totalquantity", 1, 1);
- add(GET_GRANDEXCHANGE_OFFER_QUANTITYSOLD, "get_grandexchange_offer_quantitysold", 1, 1);
- add(GET_GRANDEXCHANGE_OFFER_SPENT, "get_grandexchange_offer_spent", 1, 1);
- add(GET_GRANDEXCHANGE_OFFER_NOT_STARTED, "get_grandexchange_offer_not_started", 1, 1);
- add(GET_GRANDEXCHANGE_OFFER_STATUS_2, "get_grandexchange_offer_status_2", 1, 1);
- add(GET_GRANDEXCHANGE_OFFER_DONE, "get_grandexchange_offer_done", 1, 1);
- add(3913, 1, 1);
- add(3914, 1, 0);
- add(3915, 1, 0);
- add(3916, 2, 0);
- add(3917, 1, 0);
- add(3918, 1, 0);
- add(3919, 0, 1);
- add(3920, 1, 1);
- add(3921, 1, 0, 0, 1);
- add(3922, 1, 0, 0, 1);
- add(3923, 1, 0, 0, 1);
- add(3924, 1, 1);
- add(3925, 1, 1);
- add(3926, 1, 1);
- // 4000-4100
- add(IADD, "iadd", 2, 1);
- add(ISUB, "isub", 2, 1);
- add(IMUL, "imul", 2, 1);
- add(IDIV, "idiv", 2, 1);
- add(RAND_EXCL, "rand_excl", 1, 1);
- add(RAND_INCL, "rand_incl", 1, 1);
- add(INTERPOLATE, "interpolate", 5, 1);
- add(ADD_PERCENT, "add_percent", 2, 1);
- add(SET_BIT, "set_bit", 2, 1);
- add(CLEAR_BIT, "clear_bit", 2, 1);
- add(TEST_BIT, "test_bit", 2, 1);
- add(MODULO, "modulo", 2, 1);
- add(POW, "pow", 2, 1);
- add(INVPOW, "invpow", 2, 1);
- add(AND, "and", 2, 1);
- add(OR, "or", 2, 1);
- add(SCALE, "scale", 3, 1);
- // 4100-4200
- add(CONCAT_INT, "concat_int", 1, 0, 1, 1);
- add(CONCAT_STRING, "concat_string", 0, 0, 2, 1);
- add(4102, 1, 0, 1, 1);
- add(TOLOWERCASE, "tolowercase", 0, 0, 1, 1);
- add(FORMAT_DATE, "format_date", 1, 0, 0, 1);
- add(SWITCH_MALE_OR_FEMALE, "switch_male_or_female", 0, 0, 2, 1);
- add(INT_TO_STRING, "int_to_string", 1, 0, 0, 1);
- add(STRING_COMPARE, "string_compare", 0, 1, 2, 0);
- add(GET_LINE_COUNT, "get_line_count", 2, 1, 1, 0);
- add(GET_MAX_LINE_WIDTH, "get_max_line_width", 2, 1, 1, 0);
- add(SWITCH_STRING, "switch_string", 1, 0, 2, 1);
- add(APPENDTAGS, "appendtags", 0, 0, 1, 1);
- add(CONCAT_CHAR, "concat_char", 1, 0, 1, 1);
- add(CHAR_IS_PRINTABLE, "char_is_printable", 1, 1);
- add(ISALNUM, "isalnum", 1, 1);
- add(ISALPHA, "isalpha", 1, 1);
- add(ISDIGIT, "isdigit", 1, 1);
- add(STRING_LENGTH, "string_length", 0, 1, 1, 0);
- add(STRING_SUBSTRING, "string_substring", 2, 0, 1, 1);
- add(STRING_REMOVE_HTML, "string_remove_html", 0, 0, 1, 1);
- add(STRING_INDEXOF, "string_indexof", 1, 1, 1, 0);
- add(STRING_INDEXOF_FROM, "string_indexof_from", 1, 1, 2, 0);
- // 4200-4300
- add(GET_ITEM_NAME, "get_item_name", 1, 0, 0, 1);
- add(GET_ITEM_GROUND_ACTION, "get_item_ground_action", 2, 0, 0, 1);
- add(GET_ITEM_INVENTORY_ACTION, "get_item_inventory_action", 2, 0, 0, 1);
- add(GET_ITEM_PRICE, "get_item_price", 1, 1);
- add(GET_ITEM_STACKABLE, "get_item_stackable", 1, 1);
- add(GET_ITEM_NOTE_1, "get_item_note_1", 1, 1);
- add(GET_ITEM_NOTE_2, "get_item_note_2", 1, 1);
- add(GET_ITEM_ISMEMBERS, "get_item_ismembers", 1, 1);
- add(4208, 1, 1);
- add(4209, 1, 1);
- add(SEARCH_ITEM, "search_item", 1, 1, 1, 0);
- add(NEXT_SEARCH_RESULT, "next_search_result", 0, 1);
- add(4212, 0, 0);
- // 4300-5100
- add(5000, 0, 1);
- add(CHATFILTER_UPDATE, "chatfilter_update", 3, 0);
- add(REPORT_PLAYER, "report_player", 2, 0, 1, 0);
- add(GET_CHAT_MESSAGE_TYPE, "get_chat_message_type", 2, 2, 0, 3);
- add(GET_CHAT_MESSAGE, "get_chat_message", 1, 2, 0, 3);
- add(5005, 0, 1);
- add(CHATBOX_INPUT, "chatbox_input", 1, 0, 1, 0);
- add(PRIVMSG, "privmsg", 0, 0, 2, 0);
- add(GET_LOCALPLAYER_NAME, "get_localplayer_name", 0, 0, 0, 1);
- add(5016, 0, 1);
- add(GET_CHATLINEBUFFER_LENGTH, "get_chatlinebuffer_length", 1, 1);
- add(GET_MESSAGENODE_PREV_ID, "get_messagenode_prev_id", 1, 1);
- add(GET_MESSAGENODE_NEXT_ID, "get_messagenode_next_id", 1, 1);
- add(RUN_COMMAND, "run_command", 0, 0, 1, 0);
- add(5021, 0, 0, 1, 0);
- add(5022, 0, 0, 0, 1);
- // 5100-5400
- add(GET_ISRESIZED, "get_isresized", 0, 1);
- add(SET_ISRESIZED, "set_isresized", 1, 0);
- add(GET_SCREENTYPE, "get_screentype", 0, 1);
- add(SET_SCREENTYPE, "set_screentype", 1, 0);
- // 5400-5600
- add(5504, 2, 0);
- add(5505, 0, 1);
- add(GET_MAPANGLE, "get_mapangle", 0, 1);
- add(SET_CAMERA_FOCAL_POINT_HEIGHT, "set_camera_focal_point_height", 1, 0);
- add(GET_CAMERA_FOCAL_POINT_HEIGHT, "get_camera_focal_point_height", 0, 1);
- // 5600-5700
- add(CANCEL_LOGIN, "cancel_login", 0, 0);
- // 5700-6300
- add(6200, 2, 0);
- add(SET_ZOOM_DISTANCE, "set_zoom_distance", 2, 0);
- add(6202, 4, 0);
- add(GET_VIEWPORT_SIZE, "get_viewport_size", 0, 2);
- add(GET_ZOOM_DISTANCE, "get_zoom_distance", 0, 2);
- add(6205, 0, 2);
- // 6300-6600
- add(LOAD_WORLDS, "load_worlds", 0, 1);
- add(GET_FIRST_WORLD, "get_first_world", 0, 4, 0, 2);
- add(GET_NEXT_WORLD, "get_next_world", 0, 4, 0, 2);
- add(GET_WORLD_BY_ID, "get_world_by_id", 1, 4, 0, 2);
- add(6507, 4, 0);
- add(GET_WORLD_BY_INDEX, "get_world_by_index", 1, 4, 0, 2);
- add(6512, 1, 0);
- add(GET_IS_MOBILE, "get_is_mobile", 0, 1);
- // 6600-6700
- add(6600, 0, 0);
- add(GET_MAP_SURFACE_NAME_BY_ID, "get_map_surface_name_by_id", 1, 0, 0, 1);
- add(SET_CURRENT_MAP_SURFACE, "set_current_map_surface", 1, 0);
- add(GET_CURRENT_MAP_ZOOM, "get_current_map_zoom", 0, 1);
- add(SET_CURRENT_MAP_ZOOM, "set_current_map_zoom", 1, 0);
- add(6605, 0, 1);
- add(SET_MAP_POSITION, "set_map_position", 1, 0);
- add(SET_MAP_POSITION_IMMEDIATE, "set_map_position_immediate", 1, 0);
- add(SET_MAP_POSITION_2, "set_map_position_2", 1, 0);
- add(SET_MAP_POSITION_IMMEDIATE_2, "set_map_position_immediate_2", 1, 0);
- add(GET_MAP_POSITION, "get_map_position", 0, 2);
- add(GET_MAP_DEFAULT_POSITION_BY_ID, "get_map_default_position_by_id", 1, 1);
- add(GET_MAP_DIMENSIONS_BY_ID, "get_map_dimensions_by_id", 1, 2);
- add(GET_MAP_BOUNDS_BY_ID, "get_map_bounds_by_id", 1, 4);
- add(GET_MAP_INITAL_ZOOM_BY_ID, "get_map_inital_zoom_by_id", 1, 1);
- add(6615, 2, 2);
- add(GET_CURRENT_MAP_ID, "get_current_map_id", 0, 1);
- add(6617, 1, 2);
- // 6618 variable
- add(6619, 2, 1);
- add(6620, 2, 1);
- add(MAP_ID_CONTAINS_COORD, "map_id_contains_coord", 2, 1);
- add(GET_MAP_DISPLAY_DIMENSIONS, "get_map_display_dimensions", 0, 2);
- add(GET_MAP_ID_CONTAINING_COORD, "get_map_id_containing_coord", 1, 1);
- add(SET_MAP_ICON_FLASH_COUNT, "set_map_icon_flash_count", 1, 0);
- add(RESET_MAP_ICON_FLASH_COUNT, "reset_map_icon_flash_count", 0, 0);
- add(SET_MAP_ICON_FLASH_PERIOD, "set_map_icon_flash_period", 1, 0);
- add(RESET_MAP_ICON_FLASH_PERIOD, "reset_map_icon_flash_period", 0, 0);
- add(SET_MAP_ICON_FLASH_FOREVER, "set_map_icon_flash_forever", 1, 0);
- add(FLASH_MAP_ICONS_BY_ID, "flash_map_icons_by_id", 1, 0);
- add(FLASH_MAP_ICONS_BY_GROUP, "flash_map_icons_by_group", 1, 0);
- add(CLEAR_FLASHING_ICONS, "clear_flashing_icons", 0, 0);
- add(SET_MAP_ICONS_DISABLED, "set_map_icons_disabled", 1, 0);
- add(SET_MAP_ICONS_ENABLED_BY_ID, "set_map_icons_enabled_by_id", 2, 0);
- add(SET_MAP_ICONS_ENABLED_BY_GROUP, "set_map_icons_enabled_by_group", 2, 0);
- add(GET_MAP_ICONS_DISABLED, "get_map_icons_disabled", 0, 1);
- add(GET_MAP_ICONS_ENABLED_BY_ID, "get_map_icons_enabled_by_id", 1, 1);
- add(GET_MAP_ICONS_ENABLED_BY_GROUP, "get_map_icons_enabled_by_group", 1, 1);
- add(6638, 2, 1);
- add(GET_FIRST_MAP_ICON, "get_first_map_icon", 0, 2);
- add(GET_NEXT_MAP_ICON, "get_next_map_icon", 0, 2);
- add(GET_MAPICON_NAME_BY_ID, "get_mapicon_name_by_id", 1, 0, 0, 1);
- add(GET_MAPICON_FONT_SIZE, "get_mapicon_font_size", 1, 1);
- add(GET_MAPICON_GROUP_BY_ID, "get_mapicon_group_by_id", 1, 1);
- add(GET_MAPICON_SPRITE_BY_ID, "get_mapicon_sprite_by_id", 1, 1);
- add(GET_CURRENT_MAPICON_ID, "get_current_mapicon_id", 0, 1);
- add(GET_CURRENT_MAPICON_COORD, "get_current_mapicon_coord", 0, 1);
- add(GET_CURRENT_MAPICON_OTHER_COORD, "get_current_mapicon_other_coord", 0, 1);
+ add(ICONST, "iconst");
+ add(GET_VARP, "get_varp");
+ add(SET_VARP, "set_varp");
+ add(SCONST, "sconst");
+ add(JUMP, "jump");
+ add(IF_ICMPNE, "if_icmpne");
+ add(IF_ICMPEQ, "if_icmpeq");
+ add(IF_ICMPLT, "if_icmplt");
+ add(IF_ICMPGT, "if_icmpgt");
+ add(RETURN, "return");
+ add(GET_VARBIT, "get_varbit");
+ add(SET_VARBIT, "set_varbit");
+ add(IF_ICMPLE, "if_icmple");
+ add(IF_ICMPGE, "if_icmpge");
+ add(ILOAD, "iload");
+ add(ISTORE, "istore");
+ add(SLOAD, "sload");
+ add(SSTORE, "sstore");
+ add(JOIN_STRING, "join_string");
+ add(POP_INT, "pop_int");
+ add(POP_STRING, "pop_string");
+ add(INVOKE, "invoke");
+ add(GET_VARC_INT, "get_varc_int");
+ add(SET_VARC_INT, "set_varc_int");
+ add(DEFINE_ARRAY, "define_array");
+ add(GET_ARRAY_INT, "get_array_int");
+ add(SET_ARRAY_INT, "set_array_int");
+ add(GET_VARC_STRING_OLD, "get_varc_string_old");
+ add(SET_VARC_STRING_OLD, "set_varc_string_old");
+ add(GET_VARC_STRING, "get_varc_string");
+ add(SET_VARC_STRING, "set_varc_string");
+ add(SWITCH, "switch");
+ add(CC_CREATE, "cc_create");
+ add(CC_DELETE, "cc_delete");
+ add(CC_DELETEALL, "cc_deleteall");
+ add(CC_FIND, "cc_find");
+ add(IF_FIND, "if_find");
+ add(CC_SETPOSITION, "cc_setposition");
+ add(CC_SETSIZE, "cc_setsize");
+ add(CC_SETHIDE, "cc_sethide");
+ add(CC_SETNOCLICKTHROUGH, "cc_setnoclickthrough");
+ add(CC_SETSCROLLPOS, "cc_setscrollpos");
+ add(CC_SETCOLOUR, "cc_setcolour");
+ add(CC_SETFILL, "cc_setfill");
+ add(CC_SETTRANS, "cc_settrans");
+ add(CC_SETLINEWID, "cc_setlinewid");
+ add(CC_SETGRAPHIC, "cc_setgraphic");
+ add(CC_SET2DANGLE, "cc_set2dangle");
+ add(CC_SETTILING, "cc_settiling");
+ add(CC_SETMODEL, "cc_setmodel");
+ add(CC_SETMODELANGLE, "cc_setmodelangle");
+ add(CC_SETMODELANIM, "cc_setmodelanim");
+ add(CC_SETMODELORTHOG, "cc_setmodelorthog");
+ add(CC_SETTEXT, "cc_settext");
+ add(CC_SETTEXTFONT, "cc_settextfont");
+ add(CC_SETTEXTALIGN, "cc_settextalign");
+ add(CC_SETTEXTSHADOW, "cc_settextshadow");
+ add(CC_SETOUTLINE, "cc_setoutline");
+ add(CC_SETGRAPHICSHADOW, "cc_setgraphicshadow");
+ add(CC_SETVFLIP, "cc_setvflip");
+ add(CC_SETHFLIP, "cc_sethflip");
+ add(CC_SETSCROLLSIZE, "cc_setscrollsize");
+ add(CC_RESUME_PAUSEBUTTON, "cc_resume_pausebutton");
+ add(CC_SETFILLCOLOUR, "cc_setfillcolour");
+ add(CC_SETLINEDIRECTION, "cc_setlinedirection");
+ add(CC_SETOBJECT, "cc_setobject");
+ add(CC_SETNPCHEAD, "cc_setnpchead");
+ add(CC_SETPLAYERHEAD_SELF, "cc_setplayerhead_self");
+ add(CC_SETOBJECT_NONUM, "cc_setobject_nonum");
+ add(CC_SETOBJECT_ALWAYS_NUM, "cc_setobject_always_num");
+ add(CC_SETOP, "cc_setop");
+ add(CC_SETDRAGGABLE, "cc_setdraggable");
+ add(CC_SETDRAGGABLEBEHAVIOR, "cc_setdraggablebehavior");
+ add(CC_SETDRAGDEADZONE, "cc_setdragdeadzone");
+ add(CC_SETDRAGDEADTIME, "cc_setdragdeadtime");
+ add(CC_SETOPBASE, "cc_setopbase");
+ add(CC_SETTARGETVERB, "cc_settargetverb");
+ add(CC_CLEAROPS, "cc_clearops");
+ add(CC_SETONCLICK, "cc_setonclick");
+ add(CC_SETONHOLD, "cc_setonhold");
+ add(CC_SETONRELEASE, "cc_setonrelease");
+ add(CC_SETONMOUSEOVER, "cc_setonmouseover");
+ add(CC_SETONMOUSELEAVE, "cc_setonmouseleave");
+ add(CC_SETONDRAG, "cc_setondrag");
+ add(CC_SETONTARGETLEAVE, "cc_setontargetleave");
+ add(CC_SETONVARTRANSMIT, "cc_setonvartransmit");
+ add(CC_SETONTIMER, "cc_setontimer");
+ add(CC_SETONOP, "cc_setonop");
+ add(CC_SETONDRAGCOMPLETE, "cc_setondragcomplete");
+ add(CC_SETONCLICKREPEAT, "cc_setonclickrepeat");
+ add(CC_SETONMOUSEREPEAT, "cc_setonmouserepeat");
+ add(CC_SETONINVTRANSMIT, "cc_setoninvtransmit");
+ add(CC_SETONSTATTRANSMIT, "cc_setonstattransmit");
+ add(CC_SETONTARGETENTER, "cc_setontargetenter");
+ add(CC_SETONSCROLLWHEEL, "cc_setonscrollwheel");
+ add(CC_SETONCHATTRANSMIT, "cc_setonchattransmit");
+ add(CC_SETONKEY, "cc_setonkey");
+ add(CC_SETONFRIENDTRANSMIT, "cc_setonfriendtransmit");
+ add(CC_SETONCLANTRANSMIT, "cc_setonclantransmit");
+ add(CC_SETONMISCTRANSMIT, "cc_setonmisctransmit");
+ add(CC_SETONDIALOGABORT, "cc_setondialogabort");
+ add(CC_SETONSUBCHANGE, "cc_setonsubchange");
+ add(CC_SETONSTOCKTRANSMIT, "cc_setonstocktransmit");
+ add(CC_SETONRESIZE, "cc_setonresize");
+ add(CC_GETX, "cc_getx");
+ add(CC_GETY, "cc_gety");
+ add(CC_GETWIDTH, "cc_getwidth");
+ add(CC_GETHEIGHT, "cc_getheight");
+ add(CC_GETHIDE, "cc_gethide");
+ add(CC_GETLAYER, "cc_getlayer");
+ add(CC_GETSCROLLX, "cc_getscrollx");
+ add(CC_GETSCROLLY, "cc_getscrolly");
+ add(CC_GETTEXT, "cc_gettext");
+ add(CC_GETSCROLLWIDTH, "cc_getscrollwidth");
+ add(CC_GETSCROLLHEIGHT, "cc_getscrollheight");
+ add(CC_GETMODELZOOM, "cc_getmodelzoom");
+ add(CC_GETMODELANGLE_X, "cc_getmodelangle_x");
+ add(CC_GETMODELANGLE_Z, "cc_getmodelangle_z");
+ add(CC_GETMODELANGLE_Y, "cc_getmodelangle_y");
+ add(CC_GETTRANS, "cc_gettrans");
+ add(CC_GETCOLOUR, "cc_getcolour");
+ add(CC_GETFILLCOLOUR, "cc_getfillcolour");
+ add(CC_GETINVOBJECT, "cc_getinvobject");
+ add(CC_GETINVCOUNT, "cc_getinvcount");
+ add(CC_GETID, "cc_getid");
+ add(CC_GETTARGETMASK, "cc_gettargetmask");
+ add(CC_GETOP, "cc_getop");
+ add(CC_GETOPBASE, "cc_getopbase");
+ add(CC_CALLONRESIZE, "cc_callonresize");
+ add(IF_SETPOSITION, "if_setposition");
+ add(IF_SETSIZE, "if_setsize");
+ add(IF_SETHIDE, "if_sethide");
+ add(IF_SETNOCLICKTHROUGH, "if_setnoclickthrough");
+ add(IF_SETSCROLLPOS, "if_setscrollpos");
+ add(IF_SETCOLOUR, "if_setcolour");
+ add(IF_SETFILL, "if_setfill");
+ add(IF_SETTRANS, "if_settrans");
+ add(IF_SETLINEWID, "if_setlinewid");
+ add(IF_SETGRAPHIC, "if_setgraphic");
+ add(IF_SET2DANGLE, "if_set2dangle");
+ add(IF_SETTILING, "if_settiling");
+ add(IF_SETMODEL, "if_setmodel");
+ add(IF_SETMODELANGLE, "if_setmodelangle");
+ add(IF_SETMODELANIM, "if_setmodelanim");
+ add(IF_SETMODELORTHOG, "if_setmodelorthog");
+ add(IF_SETTEXT, "if_settext");
+ add(IF_SETTEXTFONT, "if_settextfont");
+ add(IF_SETTEXTALIGN, "if_settextalign");
+ add(IF_SETTEXTSHADOW, "if_settextshadow");
+ add(IF_SETOUTLINE, "if_setoutline");
+ add(IF_SETGRAPHICSHADOW, "if_setgraphicshadow");
+ add(IF_SETVFLIP, "if_setvflip");
+ add(IF_SETHFLIP, "if_sethflip");
+ add(IF_SETSCROLLSIZE, "if_setscrollsize");
+ add(IF_RESUME_PAUSEBUTTON, "if_resume_pausebutton");
+ add(IF_SETFILLCOLOUR, "if_setfillcolour");
+ add(IF_SETLINEDIRECTION, "if_setlinedirection");
+ add(IF_SETOBJECT, "if_setobject");
+ add(IF_SETNPCHEAD, "if_setnpchead");
+ add(IF_SETPLAYERHEAD_SELF, "if_setplayerhead_self");
+ add(IF_SETOBJECT_NONUM, "if_setobject_nonum");
+ add(IF_SETOBJECT_ALWAYS_NUM, "if_setobject_always_num");
+ add(IF_SETOP, "if_setop");
+ add(IF_SETDRAGGABLE, "if_setdraggable");
+ add(IF_SETDRAGGABLEBEHAVIOR, "if_setdraggablebehavior");
+ add(IF_SETDRAGDEADZONE, "if_setdragdeadzone");
+ add(IF_SETDRAGDEADTIME, "if_setdragdeadtime");
+ add(IF_SETOPBASE, "if_setopbase");
+ add(IF_SETTARGETVERB, "if_settargetverb");
+ add(IF_CLEAROPS, "if_clearops");
+ add(IF_SETOPKEY, "if_setopkey");
+ add(IF_SETOPTKEY, "if_setoptkey");
+ add(IF_SETOPKEYRATE, "if_setopkeyrate");
+ add(IF_SETOPTKEYRATE, "if_setoptkeyrate");
+ add(IF_SETOPKEYIGNOREHELD, "if_setopkeyignoreheld");
+ add(IF_SETOPTKEYIGNOREHELD, "if_setoptkeyignoreheld");
+ add(IF_SETONCLICK, "if_setonclick");
+ add(IF_SETONHOLD, "if_setonhold");
+ add(IF_SETONRELEASE, "if_setonrelease");
+ add(IF_SETONMOUSEOVER, "if_setonmouseover");
+ add(IF_SETONMOUSELEAVE, "if_setonmouseleave");
+ add(IF_SETONDRAG, "if_setondrag");
+ add(IF_SETONTARGETLEAVE, "if_setontargetleave");
+ add(IF_SETONVARTRANSMIT, "if_setonvartransmit");
+ add(IF_SETONTIMER, "if_setontimer");
+ add(IF_SETONOP, "if_setonop");
+ add(IF_SETONDRAGCOMPLETE, "if_setondragcomplete");
+ add(IF_SETONCLICKREPEAT, "if_setonclickrepeat");
+ add(IF_SETONMOUSEREPEAT, "if_setonmouserepeat");
+ add(IF_SETONINVTRANSMIT, "if_setoninvtransmit");
+ add(IF_SETONSTATTRANSMIT, "if_setonstattransmit");
+ add(IF_SETONTARGETENTER, "if_setontargetenter");
+ add(IF_SETONSCROLLWHEEL, "if_setonscrollwheel");
+ add(IF_SETONCHATTRANSMIT, "if_setonchattransmit");
+ add(IF_SETONKEY, "if_setonkey");
+ add(IF_SETONFRIENDTRANSMIT, "if_setonfriendtransmit");
+ add(IF_SETONCLANTRANSMIT, "if_setonclantransmit");
+ add(IF_SETONMISCTRANSMIT, "if_setonmisctransmit");
+ add(IF_SETONDIALOGABORT, "if_setondialogabort");
+ add(IF_SETONSUBCHANGE, "if_setonsubchange");
+ add(IF_SETONSTOCKTRANSMIT, "if_setonstocktransmit");
+ add(IF_SETONRESIZE, "if_setonresize");
+ add(IF_GETX, "if_getx");
+ add(IF_GETY, "if_gety");
+ add(IF_GETWIDTH, "if_getwidth");
+ add(IF_GETHEIGHT, "if_getheight");
+ add(IF_GETHIDE, "if_gethide");
+ add(IF_GETLAYER, "if_getlayer");
+ add(IF_GETSCROLLX, "if_getscrollx");
+ add(IF_GETSCROLLY, "if_getscrolly");
+ add(IF_GETTEXT, "if_gettext");
+ add(IF_GETSCROLLWIDTH, "if_getscrollwidth");
+ add(IF_GETSCROLLHEIGHT, "if_getscrollheight");
+ add(IF_GETMODELZOOM, "if_getmodelzoom");
+ add(IF_GETMODELANGLE_X, "if_getmodelangle_x");
+ add(IF_GETMODELANGLE_Z, "if_getmodelangle_z");
+ add(IF_GETMODELANGLE_Y, "if_getmodelangle_y");
+ add(IF_GETTRANS, "if_gettrans");
+ add(IF_GETCOLOUR, "if_getcolour");
+ add(IF_GETFILLCOLOUR, "if_getfillcolour");
+ add(IF_GETINVOBJECT, "if_getinvobject");
+ add(IF_GETINVCOUNT, "if_getinvcount");
+ add(IF_HASSUB, "if_hassub");
+ add(IF_GETTOP, "if_gettop");
+ add(IF_GETTARGETMASK, "if_gettargetmask");
+ add(IF_GETOP, "if_getop");
+ add(IF_GETOPBASE, "if_getopbase");
+ add(IF_CALLONRESIZE, "if_callonresize");
+ add(MES, "mes");
+ add(ANIM, "anim");
+ add(IF_CLOSE, "if_close");
+ add(RESUME_COUNTDIALOG, "resume_countdialog");
+ add(RESUME_NAMEDIALOG, "resume_namedialog");
+ add(RESUME_STRINGDIALOG, "resume_stringdialog");
+ add(OPPLAYER, "opplayer");
+ add(IF_DRAGPICKUP, "if_dragpickup");
+ add(CC_DRAGPICKUP, "cc_dragpickup");
+ add(MOUSECAM, "mousecam");
+ add(GETREMOVEROOFS, "getremoveroofs");
+ add(SETREMOVEROOFS, "setremoveroofs");
+ add(OPENURL, "openurl");
+ add(RESUME_OBJDIALOG, "resume_objdialog");
+ add(BUG_REPORT, "bug_report");
+ add(SETSHIFTCLICKDROP, "setshiftclickdrop");
+ add(SETSHOWMOUSEOVERTEXT, "setshowmouseovertext");
+ add(RENDERSELF, "renderself");
+ add(SETSHOWMOUSECROSS, "setshowmousecross");
+ add(SETSHOWLOADINGMESSAGES, "setshowloadingmessages");
+ add(SETTAPTODROP, "settaptodrop");
+ add(GETTAPTODROP, "gettaptodrop");
+ add(GETCANVASSIZE, "getcanvassize");
+ add(SETHIDEUSERNAME, "sethideusername");
+ add(GETHIDEUSERNAME, "gethideusername");
+ add(SETREMEMBERUSERNAME, "setrememberusername");
+ add(GETREMEMBERUSERNAME, "getrememberusername");
+ add(SOUND_SYNTH, "sound_synth");
+ add(SOUND_SONG, "sound_song");
+ add(SOUND_JINGLE, "sound_jingle");
+ add(CLIENTCLOCK, "clientclock");
+ add(INV_GETOBJ, "inv_getobj");
+ add(INV_GETNUM, "inv_getnum");
+ add(INV_TOTAL, "inv_total");
+ add(INV_SIZE, "inv_size");
+ add(STAT, "stat");
+ add(STAT_BASE, "stat_base");
+ add(STAT_XP, "stat_xp");
+ add(COORD, "coord");
+ add(COORDX, "coordx");
+ add(COORDZ, "coordz");
+ add(COORDY, "coordy");
+ add(MAP_MEMBERS, "map_members");
+ add(INVOTHER_GETOBJ, "invother_getobj");
+ add(INVOTHER_GETNUM, "invother_getnum");
+ add(INVOTHER_TOTAL, "invother_total");
+ add(STAFFMODLEVEL, "staffmodlevel");
+ add(REBOOTTIMER, "reboottimer");
+ add(MAP_WORLD, "map_world");
+ add(RUNENERGY_VISIBLE, "runenergy_visible");
+ add(RUNWEIGHT_VISIBLE, "runweight_visible");
+ add(PLAYERMOD, "playermod");
+ add(WORLDFLAGS, "worldflags");
+ add(MOVECOORD, "movecoord");
+ add(ENUM_STRING, "enum_string");
+ add(ENUM, "enum");
+ add(ENUM_GETOUTPUTCOUNT, "enum_getoutputcount");
+ add(FRIEND_COUNT, "friend_count");
+ add(FRIEND_GETNAME, "friend_getname");
+ add(FRIEND_GETWORLD, "friend_getworld");
+ add(FRIEND_GETRANK, "friend_getrank");
+ add(FRIEND_SETRANK, "friend_setrank");
+ add(FRIEND_ADD, "friend_add");
+ add(FRIEND_DEL, "friend_del");
+ add(IGNORE_ADD, "ignore_add");
+ add(IGNORE_DEL, "ignore_del");
+ add(FRIEND_TEST, "friend_test");
+ add(CLAN_GETCHATDISPLAYNAME, "clan_getchatdisplayname");
+ add(CLAN_GETCHATCOUNT, "clan_getchatcount");
+ add(CLAN_GETCHATUSERNAME, "clan_getchatusername");
+ add(CLAN_GETCHATUSERWORLD, "clan_getchatuserworld");
+ add(CLAN_GETCHATUSERRANK, "clan_getchatuserrank");
+ add(CLAN_GETCHATMINKICK, "clan_getchatminkick");
+ add(CLAN_KICKUSER, "clan_kickuser");
+ add(CLAN_GETCHATRANK, "clan_getchatrank");
+ add(CLAN_JOINCHAT, "clan_joinchat");
+ add(CLAN_LEAVECHAT, "clan_leavechat");
+ add(IGNORE_COUNT, "ignore_count");
+ add(IGNORE_GETNAME, "ignore_getname");
+ add(IGNORE_TEST, "ignore_test");
+ add(CLAN_ISSELF, "clan_isself");
+ add(CLAN_GETCHATOWNERNAME, "clan_getchatownername");
+ add(CLAN_ISFRIEND, "clan_isfriend");
+ add(CLAN_ISIGNORE, "clan_isignore");
+ add(STOCKMARKET_GETOFFERTYPE, "stockmarket_getoffertype");
+ add(STOCKMARKET_GETOFFERITEM, "stockmarket_getofferitem");
+ add(STOCKMARKET_GETOFFERPRICE, "stockmarket_getofferprice");
+ add(STOCKMARKET_GETOFFERCOUNT, "stockmarket_getoffercount");
+ add(STOCKMARKET_GETOFFERCOMPLETEDCOUNT, "stockmarket_getoffercompletedcount");
+ add(STOCKMARKET_GETOFFERCOMPLETEDGOLD, "stockmarket_getoffercompletedgold");
+ add(STOCKMARKET_ISOFFEREMPTY, "stockmarket_isofferempty");
+ add(STOCKMARKET_ISOFFERSTABLE, "stockmarket_isofferstable");
+ add(STOCKMARKET_ISOFFERFINISHED, "stockmarket_isofferfinished");
+ add(STOCKMARKET_ISOFFERADDING, "stockmarket_isofferadding");
+ add(TRADINGPOST_SORTBY_NAME, "tradingpost_sortby_name");
+ add(TRADINGPOST_SORTBY_PRICE, "tradingpost_sortby_price");
+ add(TRADINGPOST_SORTFILTERBY_WORLD, "tradingpost_sortfilterby_world");
+ add(TRADINGPOST_SORTBY_AGE, "tradingpost_sortby_age");
+ add(TRADINGPOST_SORTBY_COUNT, "tradingpost_sortby_count");
+ add(TRADINGPOST_GETTOTALOFFERS, "tradingpost_gettotaloffers");
+ add(TRADINGPOST_GETOFFERWORLD, "tradingpost_getofferworld");
+ add(TRADINGPOST_GETOFFERNAME, "tradingpost_getoffername");
+ add(TRADINGPOST_GETOFFERPREVIOUSNAME, "tradingpost_getofferpreviousname");
+ add(TRADINGPOST_GETOFFERAGE, "tradingpost_getofferage");
+ add(TRADINGPOST_GETOFFERCOUNT, "tradingpost_getoffercount");
+ add(TRADINGPOST_GETOFFERPRICE, "tradingpost_getofferprice");
+ add(TRADINGPOST_GETOFFERITEM, "tradingpost_getofferitem");
+ add(ADD, "add");
+ add(SUB, "sub");
+ add(MULTIPLY, "multiply");
+ add(DIV, "div");
+ add(RANDOM, "random");
+ add(RANDOMINC, "randominc");
+ add(INTERPOLATE, "interpolate");
+ add(ADDPERCENT, "addpercent");
+ add(SETBIT, "setbit");
+ add(CLEARBIT, "clearbit");
+ add(TESTBIT, "testbit");
+ add(MOD, "mod");
+ add(POW, "pow");
+ add(INVPOW, "invpow");
+ add(AND, "and");
+ add(OR, "or");
+ add(SCALE, "scale");
+ add(APPEND_NUM, "append_num");
+ add(APPEND, "append");
+ add(APPEND_SIGNNUM, "append_signnum");
+ add(LOWERCASE, "lowercase");
+ add(FROMDATE, "fromdate");
+ add(TEXT_GENDER, "text_gender");
+ add(TOSTRING, "tostring");
+ add(COMPARE, "compare");
+ add(PARAHEIGHT, "paraheight");
+ add(PARAWIDTH, "parawidth");
+ add(TEXT_SWITCH, "text_switch");
+ add(ESCAPE, "escape");
+ add(APPEND_CHAR, "append_char");
+ add(CHAR_ISPRINTABLE, "char_isprintable");
+ add(CHAR_ISALPHANUMERIC, "char_isalphanumeric");
+ add(CHAR_ISALPHA, "char_isalpha");
+ add(CHAR_ISNUMERIC, "char_isnumeric");
+ add(STRING_LENGTH, "string_length");
+ add(SUBSTRING, "substring");
+ add(REMOVETAGS, "removetags");
+ add(STRING_INDEXOF_CHAR, "string_indexof_char");
+ add(STRING_INDEXOF_STRING, "string_indexof_string");
+ add(OC_NAME, "oc_name");
+ add(OC_OP, "oc_op");
+ add(OC_IOP, "oc_iop");
+ add(OC_COST, "oc_cost");
+ add(OC_STACKABLE, "oc_stackable");
+ add(OC_CERT, "oc_cert");
+ add(OC_UNCERT, "oc_uncert");
+ add(OC_MEMBERS, "oc_members");
+ add(OC_PLACEHOLDER, "oc_placeholder");
+ add(OC_UNPLACEHOLDER, "oc_unplaceholder");
+ add(OC_FIND, "oc_find");
+ add(OC_FINDNEXT, "oc_findnext");
+ add(OC_FINDRESET, "oc_findreset");
+ add(CHAT_GETFILTER_PUBLIC, "chat_getfilter_public");
+ add(CHAT_SETFILTER, "chat_setfilter");
+ add(CHAT_SENDABUSEREPORT, "chat_sendabusereport");
+ add(CHAT_GETHISTORY_BYTYPEANDLINE, "chat_gethistory_bytypeandline");
+ add(CHAT_GETHISTORY_BYUID, "chat_gethistory_byuid");
+ add(CHAT_GETFILTER_PRIVATE, "chat_getfilter_private");
+ add(CHAT_SENDPUBLIC, "chat_sendpublic");
+ add(CHAT_SENDPRIVATE, "chat_sendprivate");
+ add(CHAT_PLAYERNAME, "chat_playername");
+ add(CHAT_GETFILTER_TRADE, "chat_getfilter_trade");
+ add(CHAT_GETHISTORYLENGTH, "chat_gethistorylength");
+ add(CHAT_GETNEXTUID, "chat_getnextuid");
+ add(CHAT_GETPREVUID, "chat_getprevuid");
+ add(DOCHEAT, "docheat");
+ add(CHAT_SETMESSAGEFILTER, "chat_setmessagefilter");
+ add(CHAT_GETMESSAGEFILTER, "chat_getmessagefilter");
+ add(GETWINDOWMODE, "getwindowmode");
+ add(SETWINDOWMODE, "setwindowmode");
+ add(GETDEFAULTWINDOWMODE, "getdefaultwindowmode");
+ add(SETDEFAULTWINDOWMODE, "setdefaultwindowmode");
+ add(CAM_FORCEANGLE, "cam_forceangle");
+ add(CAM_GETANGLE_XA, "cam_getangle_xa");
+ add(CAM_GETANGLE_YA, "cam_getangle_ya");
+ add(CAM_SETFOLLOWHEIGHT, "cam_setfollowheight");
+ add(CAM_GETFOLLOWHEIGHT, "cam_getfollowheight");
+ add(LOGOUT, "logout");
+ add(VIEWPORT_SETFOV, "viewport_setfov");
+ add(VIEWPORT_SETZOOM, "viewport_setzoom");
+ add(VIEWPORT_CLAMPFOV, "viewport_clampfov");
+ add(VIEWPORT_GETEFFECTIVESIZE, "viewport_geteffectivesize");
+ add(VIEWPORT_GETZOOM, "viewport_getzoom");
+ add(VIEWPORT_GETFOV, "viewport_getfov");
+ add(WORLDLIST_FETCH, "worldlist_fetch");
+ add(WORLDLIST_START, "worldlist_start");
+ add(WORLDLIST_NEXT, "worldlist_next");
+ add(WORLDLIST_SPECIFIC, "worldlist_specific");
+ add(WORLDLIST_SORT, "worldlist_sort");
+ add(SETFOLLOWEROPSLOWPRIORITY, "setfolloweropslowpriority");
+ add(NC_PARAM, "nc_param");
+ add(LC_PARAM, "lc_param");
+ add(OC_PARAM, "oc_param");
+ add(STRUCT_PARAM, "struct_param");
+ add(ON_MOBILE, "on_mobile");
+ add(CLIENTTYPE, "clienttype");
+ add(BATTERYLEVEL, "batterylevel");
+ add(BATTERYCHARGING, "batterycharging");
+ add(WIFIAVAILABLE, "wifiavailable");
+ add(WORLDMAP_GETMAPNAME, "worldmap_getmapname");
+ add(WORLDMAP_SETMAP, "worldmap_setmap");
+ add(WORLDMAP_GETZOOM, "worldmap_getzoom");
+ add(WORLDMAP_SETZOOM, "worldmap_setzoom");
+ add(WORLDMAP_ISLOADED, "worldmap_isloaded");
+ add(WORLDMAP_JUMPTODISPLAYCOORD, "worldmap_jumptodisplaycoord");
+ add(WORLDMAP_JUMPTODISPLAYCOORD_INSTANT, "worldmap_jumptodisplaycoord_instant");
+ add(WORLDMAP_JUMPTOSOURCECOORD, "worldmap_jumptosourcecoord");
+ add(WORLDMAP_JUMPTOSOURCECOORD_INSTANT, "worldmap_jumptosourcecoord_instant");
+ add(WORLDMAP_GETDISPLAYPOSITION, "worldmap_getdisplayposition");
+ add(WORLDMAP_GETCONFIGORIGIN, "worldmap_getconfigorigin");
+ add(WORLDMAP_GETCONFIGSIZE, "worldmap_getconfigsize");
+ add(WORLDMAP_GETCONFIGBOUNDS, "worldmap_getconfigbounds");
+ add(WORLDMAP_GETCONFIGZOOM, "worldmap_getconfigzoom");
+ add(WORLDMAP_GETCURRENTMAP, "worldmap_getcurrentmap");
+ add(WORLDMAP_GETDISPLAYCOORD, "worldmap_getdisplaycoord");
+ add(WORLDMAP_COORDINMAP, "worldmap_coordinmap");
+ add(WORLDMAP_GETSIZE, "worldmap_getsize");
+ add(WORLDMAP_PERPETUALFLASH, "worldmap_perpetualflash");
+ add(WORLDMAP_FLASHELEMENT, "worldmap_flashelement");
+ add(WORLDMAP_FLASHELEMENTCATEGORY, "worldmap_flashelementcategory");
+ add(WORLDMAP_STOPCURRENTFLASHES, "worldmap_stopcurrentflashes");
+ add(WORLDMAP_DISABLEELEMENTS, "worldmap_disableelements");
+ add(WORLDMAP_DISABLEELEMENT, "worldmap_disableelement");
+ add(WORLDMAP_DISABLEELEMENTCATEGORY, "worldmap_disableelementcategory");
+ add(WORLDMAP_GETDISABLEELEMENTS, "worldmap_getdisableelements");
+ add(WORLDMAP_GETDISABLEELEMENT, "worldmap_getdisableelement");
+ add(WORLDMAP_GETDISABLEELEMENTCATEGORY, "worldmap_getdisableelementcategory");
+ add(WORLDMAP_LISTELEMENT_START, "worldmap_listelement_start");
+ add(WORLDMAP_LISTELEMENT_NEXT, "worldmap_listelement_next");
+ add(MEC_TEXT, "mec_text");
+ add(MEC_TEXTSIZE, "mec_textsize");
+ add(MEC_CATEGORY, "mec_category");
+ add(MEC_SPRITE, "mec_sprite");
}
- protected void add(int opcode, String name, int ipops, int ipushes, int spops, int spushes)
+ protected void add(int opcode, String name)
{
Instruction i = new Instruction(opcode);
i.setName(name);
- i.setIntStackPops(ipops);
- i.setIntStackPushes(ipushes);
- i.setStringStackPops(spops);
- i.setStringStackPushes(spushes);
assert instructions.containsKey(opcode) == false;
instructions.put(opcode, i);
@@ -556,21 +522,6 @@ public class Instructions
}
}
- protected void add(int opcode, int ipops, int ipushes)
- {
- add(opcode, null, ipops, ipushes, 0, 0);
- }
-
- protected void add(int opcode, int ipops, int ipushes, int spops, int spushes)
- {
- add(opcode, null, ipops, ipushes, spops, spushes);
- }
-
- protected void add(int opcode, String name, int ipops, int ipushes)
- {
- add(opcode, name, ipops, ipushes, 0, 0);
- }
-
public Instruction find(int opcode)
{
return instructions.get(opcode);
diff --git a/cache/src/main/java/net/runelite/cache/script/Opcodes.java b/cache/src/main/java/net/runelite/cache/script/Opcodes.java
index ce4c713a7a..e69a1ef5ef 100644
--- a/cache/src/main/java/net/runelite/cache/script/Opcodes.java
+++ b/cache/src/main/java/net/runelite/cache/script/Opcodes.java
@@ -1,5 +1,7 @@
/*
* Copyright (c) 2017, Adam
+ * Copyright (c) 2018-2019, Hunter WB
+ * Copyright (c) 2019, Abex
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,10 +28,10 @@ package net.runelite.cache.script;
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 PUT_VARP = 2;
- public static final int LOAD_STRING = 3;
+ public static final int SET_VARP = 2;
+ public static final int SCONST = 3;
public static final int JUMP = 6;
public static final int IF_ICMPNE = 7;
public static final int IF_ICMPEQ = 8;
@@ -44,376 +46,454 @@ public class Opcodes
public static final int ISTORE = 34;
public static final int SLOAD = 35;
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_STRING = 39;
public static final int INVOKE = 40;
- public static final int GET_VARC = 42;
- public static final int PUT_VARC = 43;
- public static final int ARRAY_INITIALIZE = 44;
- public static final int ARRAY_LOAD = 45;
- public static final int ARRAY_STORE = 46;
- public static final int GET_VARC_STRING = 47;
- public static final int PUT_VARC_STRING = 48;
- public static final int GET_VARC_STRING_2 = 49;
- public static final int PUT_VARC_STRING_2 = 50;
+ public static final int GET_VARC_INT = 42;
+ public static final int SET_VARC_INT = 43;
+ public static final int DEFINE_ARRAY = 44;
+ public static final int GET_ARRAY_INT = 45;
+ public static final int SET_ARRAY_INT = 46;
+ public static final int GET_VARC_STRING_OLD = 47;
+ public static final int SET_VARC_STRING_OLD = 48;
+ public static final int GET_VARC_STRING = 49;
+ public static final int SET_VARC_STRING = 50;
public static final int SWITCH = 60;
- public static final int WIDGET_CREATE_CHILD = 100;
- public static final int WIDGET_DESTROY_CHILD = 101;
- public static final int WIDGET_UNSET_CHILDREN = 102;
- public static final int WIDGET_LOAD_CHILD = 200;
- public static final int WIDGET_LOAD = 201;
- public static final int WIDGET_PUT_POSITION = 1000;
- public static final int WIDGET_PUT_SIZE = 1001;
- public static final int WIDGET_PUT_HIDDEN = 1003;
- public static final int WIDGET_PUT_NO_CLICK_THROUGH = 1005;
- public static final int WIDGET_PUT_SCROLL = 1100;
- public static final int WIDGET_PUT_TEXTCOLOR = 1101;
- public static final int WIDGET_PUT_FILLED = 1102;
- public static final int WIDGET_PUT_OPACITY = 1103;
- public static final int WIDGET_PUT_LINE_WIDTH = 1104;
- public static final int WIDGET_PUT_SPRITEID = 1105;
- public static final int WIDGET_PUT_TEXTUREID = 1106;
- public static final int WIDGET_PUT_SPRITE_TILING = 1107;
- public static final int WIDGET_PUT_MODELID_1 = 1108;
- public static final int WIDGET_PUT_3D_ROTATION = 1109;
- public static final int WIDGET_PUT_ANIMATION = 1110;
- public static final int WIDGET_PUT_TEXT = 1112;
- public static final int WIDGET_PUT_FONTID = 1113;
- public static final int WIDGET_PUT_TEXT_ALIGNMENT = 1114;
- public static final int WIDGET_PUT_TEXT_SHADOWED = 1115;
- public static final int WIDGET_PUT_BORDERTHICKNESS = 1116;
- public static final int WIDGET_PUT_SPRITE2 = 1117;
- public static final int WIDGET_PUT_FLIPPEDVERTICALLY = 1118;
- public static final int WIDGET_PUT_FLIPPEDHORIZONALLY = 1119;
- public static final int WIDGET_PUT_SCROLLWIDTHHEIGHT = 1120;
- public static final int WIDGET_ADVANCE_DIALOGUE = 1121;
- public static final int WIDGET_PUT_MODELID_2 = 1201;
- public static final int WIDGET_PUT_MODELID_3 = 1202;
- public static final int WIDGET_PUT_ACTION = 1300;
- public static final int WIDGET_PUT_DRAG_PARENT = 1301;
- public static final int WIDGET_PUT_NAME = 1305;
- public static final int WIDGET_PUT_SELECTED_ACTION = 1306;
- public static final int WIDGET_PUT_ACTIONS_NULL = 1307;
- public static final int WIDGET_PUT_MOUSE_PRESS_LISTENER = 1400;
- public static final int WIDGET_PUT_DRAGGED_OVER_LISTENER = 1401;
- public static final int WIDGET_PUT_MOUSE_RELEASE_LISTENER = 1402;
- public static final int WIDGET_PUT_MOUSE_ENTER_LISTENER = 1403;
- public static final int WIDGET_PUT_MOUSE_EXIT_LISTENER = 1404;
- public static final int WIDGET_PUT_DRAG_START_LISTENER = 1405;
- public static final int WIDGET_PUT_USE_WITH_LISTENER = 1406;
- public static final int WIDGET_PUT_CONFIG_LISTENER = 1407;
- public static final int WIDGET_PUT_RENDER_LISTENER = 1408;
- public static final int WIDGET_PUT_OPTION_CLICK_LISTENER = 1409;
- public static final int WIDGET_PUT_DRAG_RELEASE_LISTENER = 1410;
- public static final int WIDGET_PUT_DRAG_LISTENER = 1411;
- public static final int WIDGET_PUT_MOUSE_HOVER_LISTENER = 1412;
- public static final int WIDGET_PUT_TABLE_LISTENER = 1414;
- public static final int WIDGET_PUT_SKILL_LISTENER = 1415;
- public static final int WIDGET_PUT_USE_LISTENER = 1416;
- public static final int WIDGET_PUT_SCROLL_LISTENER = 1417;
- public static final int WIDGET_PUT_MSG_LISTENER = 1418;
- public static final int WIDGET_PUT_KEY_LISTENER = 1419;
- public static final int WIDGET_PUT_FRIENDS_LISTENER = 1420;
- public static final int WIDGET_PUT_CLAN_LISTENER = 1421;
- public static final int WIDGET_PUT_DIALOG_ABORT_LISTENER = 1423;
- public static final int WIDGET_PUT_OPENCLOSE_LISTENER = 1424;
- public static final int WIDGET_PUT_GE_LISTENER = 1425;
- public static final int WIDGET_PUT_RESIZE_LISTENER = 1427;
- public static final int WIDGET_GET_RELATIVEX = 1500;
- public static final int WIDGET_GET_RELATIVEY = 1501;
- public static final int WIDGET_GET_WIDTH = 1502;
- public static final int WIDGET_GET_HEIGHT = 1503;
- public static final int WIDGET_GET_HIDDEN = 1504;
- public static final int WIDGET_GET_PARENTID = 1505;
- public static final int WIDGET_GET_SCROLLX = 1600;
- public static final int WIDGET_GET_SCROLLY = 1601;
- public static final int WIDGET_GET_TEXT = 1602;
- public static final int WIDGET_GET_SCROLLWIDTH = 1603;
- public static final int WIDGET_GET_SCROLLHEIGHT = 1604;
- public static final int WIDGET_GET_MODELZOOM = 1605;
- public static final int WIDGET_GET_ROTATIONX = 1606;
- public static final int WIDGET_GET_ROTATIONY = 1607;
- public static final int WIDGET_GET_ROTATIONZ = 1608;
- public static final int WIDGET_GET_OPACITY = 1609;
- public static final int WIDGET_GET_TEXTCOLOR = 1611;
- public static final int WIDGET_GET_ITEMID = 1700;
- public static final int WIDGET_GET_STACKSIZE = 1701;
- public static final int WIDGET_GET_INDEX = 1702;
- public static final int WIDGET_GET_CONFIG = 1800;
- public static final int WIDGET_GET_ACTION = 1801;
- public static final int WIDGET_GET_NAME = 1802;
- public static final int WIDGET_PUT_POSITION_WIDGET = WIDGET_PUT_POSITION + 1000;
- public static final int WIDGET_PUT_SIZE_WIDGET = WIDGET_PUT_SIZE + 1000;
- public static final int WIDGET_PUT_HIDDEN_WIDGET = WIDGET_PUT_HIDDEN + 1000;
- public static final int WIDGET_PUT_NO_CLICK_THROUGH_WIDGET = WIDGET_PUT_NO_CLICK_THROUGH + 1000;
- public static final int WIDGET_PUT_SCROLL_WIDGET = WIDGET_PUT_SCROLL + 1000;
- public static final int WIDGET_PUT_TEXTCOLOR_WIDGET = WIDGET_PUT_TEXTCOLOR + 1000;
- public static final int WIDGET_PUT_FILLED_WIDGET = WIDGET_PUT_FILLED + 1000;
- public static final int WIDGET_PUT_OPACITY_WIDGET = WIDGET_PUT_OPACITY + 1000;
- public static final int WIDGET_PUT_LINE_WIDTH_WIDGET = WIDGET_PUT_LINE_WIDTH + 1000;
- public static final int WIDGET_PUT_SPRITEID_WIDGET = WIDGET_PUT_SPRITEID + 1000;
- public static final int WIDGET_PUT_TEXTUREID_WIDGET = WIDGET_PUT_TEXTUREID + 1000;
- public static final int WIDGET_PUT_SPRITE_TILING_WIDGET = WIDGET_PUT_SPRITE_TILING + 1000;
- public static final int WIDGET_PUT_MODELID_1_WIDGET = WIDGET_PUT_MODELID_1 + 1000;
- public static final int WIDGET_PUT_3D_ROTATION_WIDGET = WIDGET_PUT_3D_ROTATION + 1000;
- public static final int WIDGET_PUT_ANIMATION_WIDGET = WIDGET_PUT_ANIMATION + 1000;
- public static final int WIDGET_PUT_TEXT_WIDGET = WIDGET_PUT_TEXT + 1000;
- public static final int WIDGET_PUT_FONTID_WIDGET = WIDGET_PUT_FONTID + 1000;
- public static final int WIDGET_PUT_TEXT_ALIGNMENT_WIDGET = WIDGET_PUT_TEXT_ALIGNMENT + 1000;
- public static final int WIDGET_PUT_TEXT_SHADOWED_WIDGET = WIDGET_PUT_TEXT_SHADOWED + 1000;
- public static final int WIDGET_PUT_BORDERTHICKNESS_WIDGET = WIDGET_PUT_BORDERTHICKNESS + 1000;
- public static final int WIDGET_PUT_SPRITE2_WIDGET = WIDGET_PUT_SPRITE2 + 1000;
- public static final int WIDGET_PUT_FLIPPEDVERTICALLY_WIDGET = WIDGET_PUT_FLIPPEDVERTICALLY + 1000;
- public static final int WIDGET_PUT_FLIPPEDHORIZONALLY_WIDGET = WIDGET_PUT_FLIPPEDHORIZONALLY + 1000;
- public static final int WIDGET_PUT_SCROLLWIDTHHEIGHT_WIDGET = WIDGET_PUT_SCROLLWIDTHHEIGHT + 1000;
- public static final int WIDGET_ADVANCE_DIALOGUE_WIDGET = WIDGET_ADVANCE_DIALOGUE + 1000;
- public static final int WIDGET_PUT_MODELID_2_WIDGET = WIDGET_PUT_MODELID_2 + 1000;
- public static final int WIDGET_PUT_MODELID_3_WIDGET = WIDGET_PUT_MODELID_3 + 1000;
- public static final int WIDGET_PUT_ACTION_WIDGET = WIDGET_PUT_ACTION + 1000;
- public static final int WIDGET_PUT_DRAG_PARENT_WIDGET = WIDGET_PUT_DRAG_PARENT + 1000;
- public static final int WIDGET_PUT_NAME_WIDGET = WIDGET_PUT_NAME + 1000;
- public static final int WIDET_PUT_SELECTED_ACTION_WIDGET = WIDGET_PUT_SELECTED_ACTION + 1000;
- public static final int WIDGET_PUT_ACTIONS_NULL_WIDGET = WIDGET_PUT_ACTIONS_NULL + 1000;
- public static final int WIDGET_PUT_MOUSE_PRESS_LISTENER_WIDGET = WIDGET_PUT_MOUSE_PRESS_LISTENER + 1000;
- public static final int WIDGET_PUT_DRAGGED_OVER_LISTENER_WIDGET = WIDGET_PUT_DRAGGED_OVER_LISTENER + 1000;
- public static final int WIDGET_PUT_MOUSE_RELEASE_LISTENER_WIDGET = WIDGET_PUT_MOUSE_RELEASE_LISTENER + 1000;
- public static final int WIDGET_PUT_MOUSE_ENTER_LISTENER_WIDGET = WIDGET_PUT_MOUSE_ENTER_LISTENER + 1000;
- public static final int WIDGET_PUT_MOUSE_EXIT_LISTENER_WIDGET = WIDGET_PUT_MOUSE_EXIT_LISTENER + 1000;
- public static final int WIDGET_PUT_DRAG_START_LISTENER_WIDGET = WIDGET_PUT_DRAG_START_LISTENER + 1000;
- public static final int WIDGET_PUT_USE_WITH_LISTENER_WIDGET = WIDGET_PUT_USE_WITH_LISTENER + 1000;
- public static final int WIDGET_PUT_CONFIG_LISTENER_WIDGET = WIDGET_PUT_CONFIG_LISTENER + 1000;
- public static final int WIDGET_PUT_RENDER_LISTENER_WIDGET = WIDGET_PUT_RENDER_LISTENER + 1000;
- public static final int WIDGET_PUT_OPTION_CLICK_LISTENER_WIDGET = WIDGET_PUT_OPTION_CLICK_LISTENER + 1000;
- public static final int WIDGET_PUT_DRAG_RELEASE_LISTENER_WIDGET = WIDGET_PUT_DRAG_RELEASE_LISTENER + 1000;
- public static final int WIDGET_PUT_DRAG_LISTENER_WIDGET = WIDGET_PUT_DRAG_LISTENER + 1000;
- public static final int WIDGET_PUT_MOUSE_HOVER_LISTENER_WIDGET = WIDGET_PUT_MOUSE_HOVER_LISTENER + 1000;
- public static final int WIDGET_PUT_TABLE_LISTENER_WIDGET = WIDGET_PUT_TABLE_LISTENER + 1000;
- public static final int WIDGET_PUT_SKILL_LISTENER_WIDGET = WIDGET_PUT_SKILL_LISTENER + 1000;
- public static final int WIDGET_PUT_USE_LISTENER_WIDGET = WIDGET_PUT_USE_LISTENER + 1000;
- public static final int WIDGET_PUT_SCROLL_LISTENER_WIDGET = WIDGET_PUT_SCROLL_LISTENER + 1000;
- public static final int WIDGET_PUT_MSG_LISTENER_WIDGET = WIDGET_PUT_MSG_LISTENER + 1000;
- public static final int WIDGET_PUT_KEY_LISTENER_WIDGET = WIDGET_PUT_KEY_LISTENER + 1000;
- public static final int WIDGET_PUT_FRIENDS_LISTENER_WIDGET = WIDGET_PUT_FRIENDS_LISTENER + 1000;
- public static final int WIDGET_PUT_CLAN_LISTENER_WIDGET = WIDGET_PUT_CLAN_LISTENER + 1000;
- public static final int WIDGET_PUT_DIALOG_ABORT_LISTENER_WIDGET = WIDGET_PUT_DIALOG_ABORT_LISTENER + 1000;
- public static final int WIDGET_PUT_OPENCLOSE_LISTENER_WIDGET = WIDGET_PUT_OPENCLOSE_LISTENER + 1000;
- public static final int WIDGET_PUT_GE_LISTENER_WIDGET = WIDGET_PUT_GE_LISTENER + 1000;
- public static final int WIDGET_PUT_RESIZE_LISTENER_WIDGET = WIDGET_PUT_RESIZE_LISTENER + 1000;
- public static final int WIDGET_GET_RELATIVEX_WIDGET = WIDGET_GET_RELATIVEX + 1000;
- public static final int WIDGET_GET_RELATIVEY_WIDGET = WIDGET_GET_RELATIVEY + 1000;
- public static final int WIDGET_GET_WIDTH_WIDGET = WIDGET_GET_WIDTH + 1000;
- public static final int WIDGET_GET_HEIGHT_WIDGET = WIDGET_GET_HEIGHT + 1000;
- public static final int WIDGET_GET_HIDDEN_WIDGET = WIDGET_GET_HIDDEN + 1000;
- public static final int WIDGET_GET_PARENTID_WIDGET = WIDGET_GET_PARENTID + 1000;
- public static final int WIDGET_GET_SCROLLX_WIDGET = WIDGET_GET_SCROLLX + 1000;
- public static final int WIDGET_GET_SCROLLY_WIDGET = WIDGET_GET_SCROLLY + 1000;
- public static final int WIDGET_GET_TEXT_WIDGET = WIDGET_GET_TEXT + 1000;
- public static final int WIDGET_GET_SCROLLWIDTH_WIDGET = WIDGET_GET_SCROLLWIDTH + 1000;
- public static final int WIDGET_GET_SCROLLHEIGHT_WIDGET = WIDGET_GET_SCROLLHEIGHT + 1000;
- public static final int WIDGET_GET_MODELZOOM_WIDGET = WIDGET_GET_MODELZOOM + 1000;
- public static final int WIDGET_GET_ROTATIONX_WIDGET = WIDGET_GET_ROTATIONX + 1000;
- public static final int WIDGET_GET_ROTATIONY_WIDGET = WIDGET_GET_ROTATIONY + 1000;
- public static final int WIDGET_GET_ROTATIONZ_WIDGET = WIDGET_GET_ROTATIONZ + 1000;
- public static final int WIDGET_GET_OPACITY_WIDGET = WIDGET_GET_OPACITY + 1000;
- public static final int WIDGET_GET_TEXTCOLOR_WIDGET = WIDGET_GET_TEXTCOLOR + 1000;
- public static final int WIDGET_GET_ITEMID_WIDGET = WIDGET_GET_ITEMID + 1000;
- public static final int WIDGET_GET_STACKSIZE_WIDGET = WIDGET_GET_STACKSIZE + 1000;
- public static final int WIGET_GET_INDEX_WIDGET = WIDGET_GET_INDEX + 1000;
- public static final int GET_WIDGET_ROOT = 2706;
- public static final int WIDGET_GET_CONFIG_WIGET = WIDGET_GET_CONFIG + 1000;
- public static final int WIDGET_GET_ACTION_WIDGET = WIDGET_GET_ACTION + 1000;
- public static final int WIDGET_GET_NAME_WIDGET = WIDGET_GET_NAME + 1000;
- public static final int SEND_GAME_MESSAGE = 3100;
- public static final int PLAYER_ANIMATE = 3101;
- public static final int CLOSE_WINDOW = 3103;
- public static final int NUMERIC_INPUT = 3104;
- public static final int STRING_INPUT_1 = 3105;
- public static final int STRING_INPUT_2 = 3106;
- public static final int PLAYER_ACTION = 3107;
- public static final int SET_TOP_CONTEXT_MENU_ROW = 3108;
- public static final int SET_TOP_CONTEXT_MENU_ROW_2 = 3109;
- public static final int SET_MOUSE_BUTTON_CONTROLS_CAMERA = 3110;
- public static final int GET_HIDEROOFS = 3111;
- public static final int SET_HIDEROOFS = 3112;
- public static final int OPEN_URL = 3113;
- public static final int ITEM_PRICE = 3115;
- public static final int SEND_BUG_REPORT = 3116;
- public static final int SET_SHIFT_DROP_ENABLED = 3117;
- public static final int SET_CONNECTION_TEXT_ENABLED = 3126;
- public static final int PLAY_SOUND_EFFECT = 3200;
- public static final int GET_GAMECYCLE = 3300;
- public static final int GET_ITEMCONTAINER_ITEMID = 3301;
- public static final int GET_ITEMCONTAINER_STACKSIZE = 3302;
- public static final int GET_ITEMCONTAINER_STACKSIZES_TOTAL = 3303;
- public static final int GET_INVENTORY_SIZE = 3304;
- public static final int GET_BOOSTEDSKILLLEVELS = 3305;
- public static final int GET_REALSKILLLEVELS = 3306;
- public static final int GET_SKILLEXPERIENCES = 3307;
- public static final int GET_COORDINATES = 3308;
- public static final int DIVIDE_BY_16384 = 3309;
- public static final int RIGHT_SHIFT_28 = 3310;
- public static final int AND_16384 = 3311;
- public static final int GET_ISMEMBERS = 3312;
- public static final int GET_ITEMCONTAINER_ITEMID_2 = 3313;
- public static final int GET_ITEMCONTAINER_STACKSIZE_2 = 3314;
- public static final int GET_ITEMCONTAINER_STACKSIZES_TOTAL_2 = 3315;
- public static final int GET_RIGHTS = 3316;
- public static final int GET_SYSTEM_UPDATE_TIMER = 3317;
- public static final int GET_WORLDNUM = 3318;
- public static final int GET_ENERGY = 3321;
- public static final int GET_WEIGHT = 3322;
- public static final int GET_PLAYERMOD = 3323;
- public static final int GET_FLAGS = 3324;
- public static final int PACK_LOCATION = 3325;
- public static final int GET_ENUM_VALUE = 3408;
- public static final int GET_FRIENDCOUNT = 3600;
- public static final int GET_FRIEND = 3601;
- public static final int GET_FRIEND_WORLD = 3602;
- public static final int GET_FRIEND_RANK = 3603;
- public static final int ADD_FRIEND = 3605;
- public static final int REMOVE_FRIEND = 3606;
- public static final int ADD_IGNORE = 3607;
- public static final int REMOVE_IGNORE = 3608;
- public static final int IS_FRIEND = 3609;
- public static final int GET_CLANCHAT_OWNER = 3611;
- public static final int GET_CLANCHATCOUNT = 3612;
- public static final int GET_CLAN_MEMBER_NAME = 3613;
- public static final int GET_CLAN_MEMBER_WORLD = 3614;
- public static final int GET_CLAN_MEMBER_RANK = 3615;
- public static final int CLANCHAT_KICK_RANK = 3616;
- public static final int CLANCHAT_KICK_CLANMEMBER = 3617;
- public static final int GET_CLANCHAT_RANK = 3618;
- public static final int JOIN_CLANCHAT = 3619;
- public static final int PART_CLANCHAT = 3620;
- public static final int GET_IGNORECOUNT = 3621;
- public static final int GET_IGNORE = 3622;
- public static final int IS_IGNORE = 3623;
- public static final int CLANMEMBER_ISME = 3624;
- public static final int GET_CLANCHATOWNER = 3625;
- public static final int GET_GRANDEXCHANGE_OFFER_IS_SELLING = 3903;
- public static final int GET_GRANDEXCHANGE_OFFER_ITEMID = 3904;
- public static final int GET_GRANDEXCHANGE_OFFER_PRICE = 3905;
- public static final int GET_GRANDEXCHANGE_OFFER_TOTALQUANTITY = 3906;
- public static final int GET_GRANDEXCHANGE_OFFER_QUANTITYSOLD = 3907;
- public static final int GET_GRANDEXCHANGE_OFFER_SPENT = 3908;
- public static final int GET_GRANDEXCHANGE_OFFER_NOT_STARTED = 3910;
- public static final int GET_GRANDEXCHANGE_OFFER_STATUS_2 = 3911;
- public static final int GET_GRANDEXCHANGE_OFFER_DONE = 3912;
- public static final int IADD = 4000;
- public static final int ISUB = 4001;
- public static final int IMUL = 4002;
- public static final int IDIV = 4003;
- public static final int RAND_EXCL = 4004;
- public static final int RAND_INCL = 4005;
+ public static final int CC_CREATE = 100;
+ public static final int CC_DELETE = 101;
+ public static final int CC_DELETEALL = 102;
+ public static final int CC_FIND = 200;
+ public static final int IF_FIND = 201;
+ public static final int CC_SETPOSITION = 1000;
+ public static final int CC_SETSIZE = 1001;
+ public static final int CC_SETHIDE = 1003;
+ public static final int CC_SETNOCLICKTHROUGH = 1005;
+ public static final int CC_SETSCROLLPOS = 1100;
+ public static final int CC_SETCOLOUR = 1101;
+ public static final int CC_SETFILL = 1102;
+ public static final int CC_SETTRANS = 1103;
+ public static final int CC_SETLINEWID = 1104;
+ public static final int CC_SETGRAPHIC = 1105;
+ public static final int CC_SET2DANGLE = 1106;
+ public static final int CC_SETTILING = 1107;
+ public static final int CC_SETMODEL = 1108;
+ public static final int CC_SETMODELANGLE = 1109;
+ public static final int CC_SETMODELANIM = 1110;
+ public static final int CC_SETMODELORTHOG = 1111;
+ public static final int CC_SETTEXT = 1112;
+ public static final int CC_SETTEXTFONT = 1113;
+ public static final int CC_SETTEXTALIGN = 1114;
+ public static final int CC_SETTEXTSHADOW = 1115;
+ public static final int CC_SETOUTLINE = 1116;
+ public static final int CC_SETGRAPHICSHADOW = 1117;
+ public static final int CC_SETVFLIP = 1118;
+ public static final int CC_SETHFLIP = 1119;
+ public static final int CC_SETSCROLLSIZE = 1120;
+ public static final int CC_RESUME_PAUSEBUTTON = 1121;
+ public static final int CC_SETFILLCOLOUR = 1123;
+ public static final int CC_SETLINEDIRECTION = 1126;
+ public static final int CC_SETOBJECT = 1200;
+ public static final int CC_SETNPCHEAD = 1201;
+ public static final int CC_SETPLAYERHEAD_SELF = 1202;
+ public static final int CC_SETOBJECT_NONUM = 1205;
+ public static final int CC_SETOBJECT_ALWAYS_NUM = 1212;
+ public static final int CC_SETOP = 1300;
+ public static final int CC_SETDRAGGABLE = 1301;
+ public static final int CC_SETDRAGGABLEBEHAVIOR = 1302;
+ public static final int CC_SETDRAGDEADZONE = 1303;
+ public static final int CC_SETDRAGDEADTIME = 1304;
+ public static final int CC_SETOPBASE = 1305;
+ public static final int CC_SETTARGETVERB = 1306;
+ public static final int CC_CLEAROPS = 1307;
+ public static final int CC_SETONCLICK = 1400;
+ public static final int CC_SETONHOLD = 1401;
+ public static final int CC_SETONRELEASE = 1402;
+ public static final int CC_SETONMOUSEOVER = 1403;
+ public static final int CC_SETONMOUSELEAVE = 1404;
+ public static final int CC_SETONDRAG = 1405;
+ public static final int CC_SETONTARGETLEAVE = 1406;
+ public static final int CC_SETONVARTRANSMIT = 1407;
+ public static final int CC_SETONTIMER = 1408;
+ public static final int CC_SETONOP = 1409;
+ public static final int CC_SETONDRAGCOMPLETE = 1410;
+ public static final int CC_SETONCLICKREPEAT = 1411;
+ public static final int CC_SETONMOUSEREPEAT = 1412;
+ public static final int CC_SETONINVTRANSMIT = 1414;
+ public static final int CC_SETONSTATTRANSMIT = 1415;
+ public static final int CC_SETONTARGETENTER = 1416;
+ public static final int CC_SETONSCROLLWHEEL = 1417;
+ public static final int CC_SETONCHATTRANSMIT = 1418;
+ public static final int CC_SETONKEY = 1419;
+ public static final int CC_SETONFRIENDTRANSMIT = 1420;
+ public static final int CC_SETONCLANTRANSMIT = 1421;
+ public static final int CC_SETONMISCTRANSMIT = 1422;
+ public static final int CC_SETONDIALOGABORT = 1423;
+ public static final int CC_SETONSUBCHANGE = 1424;
+ public static final int CC_SETONSTOCKTRANSMIT = 1425;
+ public static final int CC_SETONRESIZE = 1427;
+ public static final int CC_GETX = 1500;
+ public static final int CC_GETY = 1501;
+ public static final int CC_GETWIDTH = 1502;
+ public static final int CC_GETHEIGHT = 1503;
+ public static final int CC_GETHIDE = 1504;
+ public static final int CC_GETLAYER = 1505;
+ public static final int CC_GETSCROLLX = 1600;
+ public static final int CC_GETSCROLLY = 1601;
+ public static final int CC_GETTEXT = 1602;
+ public static final int CC_GETSCROLLWIDTH = 1603;
+ public static final int CC_GETSCROLLHEIGHT = 1604;
+ public static final int CC_GETMODELZOOM = 1605;
+ public static final int CC_GETMODELANGLE_X = 1606;
+ public static final int CC_GETMODELANGLE_Z = 1607;
+ public static final int CC_GETMODELANGLE_Y = 1608;
+ public static final int CC_GETTRANS = 1609;
+ public static final int CC_GETCOLOUR = 1611;
+ public static final int CC_GETFILLCOLOUR = 1612;
+ public static final int CC_GETINVOBJECT = 1700;
+ public static final int CC_GETINVCOUNT = 1701;
+ public static final int CC_GETID = 1702;
+ public static final int CC_GETTARGETMASK = 1800;
+ public static final int CC_GETOP = 1801;
+ public static final int CC_GETOPBASE = 1802;
+ public static final int CC_CALLONRESIZE = 1927;
+ public static final int IF_SETPOSITION = 2000;
+ public static final int IF_SETSIZE = 2001;
+ public static final int IF_SETHIDE = 2003;
+ public static final int IF_SETNOCLICKTHROUGH = 2005;
+ public static final int IF_SETSCROLLPOS = 2100;
+ public static final int IF_SETCOLOUR = 2101;
+ public static final int IF_SETFILL = 2102;
+ public static final int IF_SETTRANS = 2103;
+ public static final int IF_SETLINEWID = 2104;
+ public static final int IF_SETGRAPHIC = 2105;
+ public static final int IF_SET2DANGLE = 2106;
+ public static final int IF_SETTILING = 2107;
+ public static final int IF_SETMODEL = 2108;
+ public static final int IF_SETMODELANGLE = 2109;
+ public static final int IF_SETMODELANIM = 2110;
+ public static final int IF_SETMODELORTHOG = 2111;
+ public static final int IF_SETTEXT = 2112;
+ public static final int IF_SETTEXTFONT = 2113;
+ public static final int IF_SETTEXTALIGN = 2114;
+ public static final int IF_SETTEXTSHADOW = 2115;
+ public static final int IF_SETOUTLINE = 2116;
+ public static final int IF_SETGRAPHICSHADOW = 2117;
+ public static final int IF_SETVFLIP = 2118;
+ public static final int IF_SETHFLIP = 2119;
+ public static final int IF_SETSCROLLSIZE = 2120;
+ public static final int IF_RESUME_PAUSEBUTTON = 2121;
+ public static final int IF_SETFILLCOLOUR = 2123;
+ public static final int IF_SETLINEDIRECTION = 2126;
+ public static final int IF_SETOBJECT = 2200;
+ public static final int IF_SETNPCHEAD = 2201;
+ public static final int IF_SETPLAYERHEAD_SELF = 2202;
+ public static final int IF_SETOBJECT_NONUM = 2205;
+ public static final int IF_SETOBJECT_ALWAYS_NUM = 2212;
+ public static final int IF_SETOP = 2300;
+ public static final int IF_SETDRAGGABLE = 2301;
+ public static final int IF_SETDRAGGABLEBEHAVIOR = 2302;
+ public static final int IF_SETDRAGDEADZONE = 2303;
+ public static final int IF_SETDRAGDEADTIME = 2304;
+ public static final int IF_SETOPBASE = 2305;
+ public static final int IF_SETTARGETVERB = 2306;
+ public static final int IF_CLEAROPS = 2307;
+ public static final int IF_SETOPKEY = 2350;
+ public static final int IF_SETOPTKEY = 2351;
+ public static final int IF_SETOPKEYRATE = 2352;
+ public static final int IF_SETOPTKEYRATE = 2353;
+ public static final int IF_SETOPKEYIGNOREHELD = 2354;
+ public static final int IF_SETOPTKEYIGNOREHELD = 2355;
+ public static final int IF_SETONCLICK = 2400;
+ public static final int IF_SETONHOLD = 2401;
+ public static final int IF_SETONRELEASE = 2402;
+ public static final int IF_SETONMOUSEOVER = 2403;
+ public static final int IF_SETONMOUSELEAVE = 2404;
+ public static final int IF_SETONDRAG = 2405;
+ public static final int IF_SETONTARGETLEAVE = 2406;
+ public static final int IF_SETONVARTRANSMIT = 2407;
+ public static final int IF_SETONTIMER = 2408;
+ public static final int IF_SETONOP = 2409;
+ public static final int IF_SETONDRAGCOMPLETE = 2410;
+ public static final int IF_SETONCLICKREPEAT = 2411;
+ public static final int IF_SETONMOUSEREPEAT = 2412;
+ public static final int IF_SETONINVTRANSMIT = 2414;
+ public static final int IF_SETONSTATTRANSMIT = 2415;
+ public static final int IF_SETONTARGETENTER = 2416;
+ public static final int IF_SETONSCROLLWHEEL = 2417;
+ public static final int IF_SETONCHATTRANSMIT = 2418;
+ public static final int IF_SETONKEY = 2419;
+ public static final int IF_SETONFRIENDTRANSMIT = 2420;
+ public static final int IF_SETONCLANTRANSMIT = 2421;
+ public static final int IF_SETONMISCTRANSMIT = 2422;
+ public static final int IF_SETONDIALOGABORT = 2423;
+ public static final int IF_SETONSUBCHANGE = 2424;
+ public static final int IF_SETONSTOCKTRANSMIT = 2425;
+ public static final int IF_SETONRESIZE = 2427;
+ public static final int IF_GETX = 2500;
+ public static final int IF_GETY = 2501;
+ public static final int IF_GETWIDTH = 2502;
+ public static final int IF_GETHEIGHT = 2503;
+ public static final int IF_GETHIDE = 2504;
+ public static final int IF_GETLAYER = 2505;
+ public static final int IF_GETSCROLLX = 2600;
+ public static final int IF_GETSCROLLY = 2601;
+ public static final int IF_GETTEXT = 2602;
+ public static final int IF_GETSCROLLWIDTH = 2603;
+ public static final int IF_GETSCROLLHEIGHT = 2604;
+ public static final int IF_GETMODELZOOM = 2605;
+ public static final int IF_GETMODELANGLE_X = 2606;
+ public static final int IF_GETMODELANGLE_Z = 2607;
+ public static final int IF_GETMODELANGLE_Y = 2608;
+ public static final int IF_GETTRANS = 2609;
+ public static final int IF_GETCOLOUR = 2611;
+ public static final int IF_GETFILLCOLOUR = 2612;
+ public static final int IF_GETINVOBJECT = 2700;
+ public static final int IF_GETINVCOUNT = 2701;
+ public static final int IF_HASSUB = 2702;
+ public static final int IF_GETTOP = 2706;
+ public static final int IF_GETTARGETMASK = 2800;
+ public static final int IF_GETOP = 2801;
+ public static final int IF_GETOPBASE = 2802;
+ public static final int IF_CALLONRESIZE = 2927;
+ public static final int MES = 3100;
+ public static final int ANIM = 3101;
+ public static final int IF_CLOSE = 3103;
+ public static final int RESUME_COUNTDIALOG = 3104;
+ public static final int RESUME_NAMEDIALOG = 3105;
+ public static final int RESUME_STRINGDIALOG = 3106;
+ public static final int OPPLAYER = 3107;
+ public static final int IF_DRAGPICKUP = 3108;
+ public static final int CC_DRAGPICKUP = 3109;
+ public static final int MOUSECAM = 3110;
+ public static final int GETREMOVEROOFS = 3111;
+ public static final int SETREMOVEROOFS = 3112;
+ public static final int OPENURL = 3113;
+ public static final int RESUME_OBJDIALOG = 3115;
+ public static final int BUG_REPORT = 3116;
+ public static final int SETSHIFTCLICKDROP = 3117;
+ public static final int SETSHOWMOUSEOVERTEXT = 3118;
+ public static final int RENDERSELF = 3119;
+ public static final int SETSHOWMOUSECROSS = 3125;
+ public static final int SETSHOWLOADINGMESSAGES = 3126;
+ public static final int SETTAPTODROP = 3127;
+ public static final int GETTAPTODROP = 3128;
+ public static final int GETCANVASSIZE = 3132;
+ public static final int SETHIDEUSERNAME = 3141;
+ public static final int GETHIDEUSERNAME = 3142;
+ public static final int SETREMEMBERUSERNAME = 3143;
+ public static final int GETREMEMBERUSERNAME = 3144;
+ public static final int SOUND_SYNTH = 3200;
+ public static final int SOUND_SONG = 3201;
+ public static final int SOUND_JINGLE = 3202;
+ public static final int CLIENTCLOCK = 3300;
+ public static final int INV_GETOBJ = 3301;
+ public static final int INV_GETNUM = 3302;
+ public static final int INV_TOTAL = 3303;
+ public static final int INV_SIZE = 3304;
+ public static final int STAT = 3305;
+ public static final int STAT_BASE = 3306;
+ public static final int STAT_XP = 3307;
+ public static final int COORD = 3308;
+ public static final int COORDX = 3309;
+ public static final int COORDZ = 3310;
+ public static final int COORDY = 3311;
+ public static final int MAP_MEMBERS = 3312;
+ public static final int INVOTHER_GETOBJ = 3313;
+ public static final int INVOTHER_GETNUM = 3314;
+ public static final int INVOTHER_TOTAL = 3315;
+ public static final int STAFFMODLEVEL = 3316;
+ public static final int REBOOTTIMER = 3317;
+ public static final int MAP_WORLD = 3318;
+ public static final int RUNENERGY_VISIBLE = 3321;
+ public static final int RUNWEIGHT_VISIBLE = 3322;
+ 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 ADD_PERCENT = 4007;
- public static final int SET_BIT = 4008;
- public static final int CLEAR_BIT = 4009;
- public static final int TEST_BIT = 4010;
- public static final int MODULO = 4011;
+ public static final int ADDPERCENT = 4007;
+ public static final int SETBIT = 4008;
+ public static final int CLEARBIT = 4009;
+ public static final int TESTBIT = 4010;
+ public static final int MOD = 4011;
public static final int POW = 4012;
public static final int INVPOW = 4013;
public static final int AND = 4014;
public static final int OR = 4015;
public static final int SCALE = 4018;
- public static final int CONCAT_INT = 4100;
- public static final int CONCAT_STRING = 4101;
- public static final int TOLOWERCASE = 4103;
- public static final int FORMAT_DATE = 4104;
- public static final int SWITCH_MALE_OR_FEMALE = 4105;
- public static final int INT_TO_STRING = 4106;
- public static final int STRING_COMPARE = 4107;
- public static final int GET_LINE_COUNT = 4108;
- public static final int GET_MAX_LINE_WIDTH = 4109;
- public static final int SWITCH_STRING = 4110;
- public static final int APPENDTAGS = 4111;
- public static final int CONCAT_CHAR = 4112;
- public static final int CHAR_IS_PRINTABLE = 4113;
- public static final int ISALNUM = 4114;
- public static final int ISALPHA = 4115;
- public static final int ISDIGIT = 4116;
+ public static final int APPEND_NUM = 4100;
+ public static final int APPEND = 4101;
+ public static final int APPEND_SIGNNUM = 4102;
+ public static final int LOWERCASE = 4103;
+ public static final int FROMDATE = 4104;
+ public static final int TEXT_GENDER = 4105;
+ public static final int TOSTRING = 4106;
+ public static final int COMPARE = 4107;
+ public static final int PARAHEIGHT = 4108;
+ public static final int PARAWIDTH = 4109;
+ public static final int TEXT_SWITCH = 4110;
+ public static final int ESCAPE = 4111;
+ public static final int APPEND_CHAR = 4112;
+ public static final int CHAR_ISPRINTABLE = 4113;
+ public static final int CHAR_ISALPHANUMERIC = 4114;
+ 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_SUBSTRING = 4118;
- public static final int STRING_REMOVE_HTML = 4119;
- public static final int STRING_INDEXOF = 4120;
- public static final int STRING_INDEXOF_FROM = 4121;
- public static final int GET_ITEM_NAME = 4200;
- public static final int GET_ITEM_GROUND_ACTION = 4201;
- public static final int GET_ITEM_INVENTORY_ACTION = 4202;
- public static final int GET_ITEM_PRICE = 4203;
- public static final int GET_ITEM_STACKABLE = 4204;
- public static final int GET_ITEM_NOTE_1 = 4205;
- public static final int GET_ITEM_NOTE_2 = 4206;
- public static final int GET_ITEM_ISMEMBERS = 4207;
- public static final int SEARCH_ITEM = 4210;
- public static final int NEXT_SEARCH_RESULT = 4211;
- public static final int CHATFILTER_UPDATE = 5001;
- public static final int REPORT_PLAYER = 5002;
- public static final int GET_CHAT_MESSAGE_TYPE = 5003;
- public static final int GET_CHAT_MESSAGE = 5004;
- public static final int CHATBOX_INPUT = 5008;
- public static final int PRIVMSG = 5009;
- public static final int GET_LOCALPLAYER_NAME = 5015;
- public static final int GET_CHATLINEBUFFER_LENGTH = 5017;
- public static final int GET_MESSAGENODE_PREV_ID = 5018;
- public static final int GET_MESSAGENODE_NEXT_ID = 5019;
- public static final int RUN_COMMAND = 5020;
- public static final int GET_ISRESIZED = 5306;
- public static final int SET_ISRESIZED = 5307;
- public static final int GET_SCREENTYPE = 5308;
- public static final int SET_SCREENTYPE = 5309;
- public static final int GET_MAPANGLE = 5506;
- public static final int SET_CAMERA_FOCAL_POINT_HEIGHT = 5530;
- public static final int GET_CAMERA_FOCAL_POINT_HEIGHT = 5531;
- public static final int CANCEL_LOGIN = 5630;
- public static final int SET_ZOOM_DISTANCE = 6201;
- public static final int GET_VIEWPORT_SIZE = 6203;
- public static final int GET_ZOOM_DISTANCE = 6204;
- public static final int LOAD_WORLDS = 6500;
- public static final int GET_FIRST_WORLD = 6501;
- public static final int GET_NEXT_WORLD = 6502;
- public static final int GET_WORLD_BY_ID = 6506;
- public static final int GET_WORLD_BY_INDEX = 6511;
- public static final int GET_IS_MOBILE = 6518;
- public static final int GET_MAP_SURFACE_NAME_BY_ID = 6601;
- public static final int SET_CURRENT_MAP_SURFACE = 6602;
- public static final int GET_CURRENT_MAP_ZOOM = 6603;
- public static final int SET_CURRENT_MAP_ZOOM = 6604;
- public static final int SET_MAP_POSITION = 6606;
- public static final int SET_MAP_POSITION_IMMEDIATE = 6607;
- public static final int SET_MAP_POSITION_2 = 6608;
- public static final int SET_MAP_POSITION_IMMEDIATE_2 = 6609;
- public static final int GET_MAP_POSITION = 6610;
- public static final int GET_MAP_DEFAULT_POSITION_BY_ID = 6611;
- public static final int GET_MAP_DIMENSIONS_BY_ID = 6612;
- public static final int GET_MAP_BOUNDS_BY_ID = 6613;
- public static final int GET_MAP_INITAL_ZOOM_BY_ID = 6614;
- public static final int GET_CURRENT_MAP_ID = 6616;
- public static final int MAP_ID_CONTAINS_COORD = 6621;
- public static final int GET_MAP_DISPLAY_DIMENSIONS = 6622;
- public static final int GET_MAP_ID_CONTAINING_COORD = 6623;
- public static final int SET_MAP_ICON_FLASH_COUNT = 6624;
- public static final int RESET_MAP_ICON_FLASH_COUNT = 6625;
- public static final int SET_MAP_ICON_FLASH_PERIOD = 6626;
- public static final int RESET_MAP_ICON_FLASH_PERIOD = 6627;
- public static final int SET_MAP_ICON_FLASH_FOREVER = 6628;
- public static final int FLASH_MAP_ICONS_BY_ID = 6629;
- public static final int FLASH_MAP_ICONS_BY_GROUP = 6630;
- public static final int CLEAR_FLASHING_ICONS = 6631;
- public static final int SET_MAP_ICONS_DISABLED = 6632;
- public static final int SET_MAP_ICONS_ENABLED_BY_ID = 6633;
- public static final int SET_MAP_ICONS_ENABLED_BY_GROUP = 6634;
- public static final int GET_MAP_ICONS_DISABLED = 6635;
- public static final int GET_MAP_ICONS_ENABLED_BY_ID = 6636;
- public static final int GET_MAP_ICONS_ENABLED_BY_GROUP = 6637;
- public static final int GET_FIRST_MAP_ICON = 6639;
- public static final int GET_NEXT_MAP_ICON = 6640;
- public static final int GET_MAPICON_NAME_BY_ID = 6693;
- public static final int GET_MAPICON_FONT_SIZE = 6694;
- public static final int GET_MAPICON_GROUP_BY_ID = 6695;
- public static final int GET_MAPICON_SPRITE_BY_ID = 6696;
- public static final int GET_CURRENT_MAPICON_ID = 6697;
- public static final int GET_CURRENT_MAPICON_COORD = 6698;
- public static final int GET_CURRENT_MAPICON_OTHER_COORD = 6699;
+ public static final int SUBSTRING = 4118;
+ public static final int REMOVETAGS = 4119;
+ public static final int STRING_INDEXOF_CHAR = 4120;
+ public static final int STRING_INDEXOF_STRING = 4121;
+ public static final int OC_NAME = 4200;
+ public static final int OC_OP = 4201;
+ public static final int OC_IOP = 4202;
+ public static final int OC_COST = 4203;
+ public static final int OC_STACKABLE = 4204;
+ public static final int OC_CERT = 4205;
+ public static final int OC_UNCERT = 4206;
+ public static final int OC_MEMBERS = 4207;
+ public static final int OC_PLACEHOLDER = 4208;
+ public static final int OC_UNPLACEHOLDER = 4209;
+ public static final int OC_FIND = 4210;
+ public static final int OC_FINDNEXT = 4211;
+ public static final int OC_FINDRESET = 4212;
+ public static final int CHAT_GETFILTER_PUBLIC = 5000;
+ public static final int CHAT_SETFILTER = 5001;
+ public static final int CHAT_SENDABUSEREPORT = 5002;
+ public static final int CHAT_GETHISTORY_BYTYPEANDLINE = 5003;
+ public static final int CHAT_GETHISTORY_BYUID = 5004;
+ public static final int CHAT_GETFILTER_PRIVATE = 5005;
+ public static final int CHAT_SENDPUBLIC = 5008;
+ public static final int CHAT_SENDPRIVATE = 5009;
+ public static final int CHAT_PLAYERNAME = 5015;
+ public static final int CHAT_GETFILTER_TRADE = 5016;
+ public static final int CHAT_GETHISTORYLENGTH = 5017;
+ public static final int CHAT_GETNEXTUID = 5018;
+ public static final int CHAT_GETPREVUID = 5019;
+ public static final int DOCHEAT = 5020;
+ public static final int CHAT_SETMESSAGEFILTER = 5021;
+ public static final int CHAT_GETMESSAGEFILTER = 5022;
+ public static final int GETWINDOWMODE = 5306;
+ public static final int SETWINDOWMODE = 5307;
+ public static final int GETDEFAULTWINDOWMODE = 5308;
+ public static final int SETDEFAULTWINDOWMODE = 5309;
+ public static final int CAM_FORCEANGLE = 5504;
+ public static final int CAM_GETANGLE_XA = 5505;
+ public static final int CAM_GETANGLE_YA = 5506;
+ public static final int CAM_SETFOLLOWHEIGHT = 5530;
+ public static final int CAM_GETFOLLOWHEIGHT = 5531;
+ public static final int LOGOUT = 5630;
+ public static final int VIEWPORT_SETFOV = 6200;
+ public static final int VIEWPORT_SETZOOM = 6201;
+ public static final int VIEWPORT_CLAMPFOV = 6202;
+ public static final int VIEWPORT_GETEFFECTIVESIZE = 6203;
+ public static final int VIEWPORT_GETZOOM = 6204;
+ public static final int VIEWPORT_GETFOV = 6205;
+ public static final int WORLDLIST_FETCH = 6500;
+ public static final int WORLDLIST_START = 6501;
+ public static final int WORLDLIST_NEXT = 6502;
+ public static final int WORLDLIST_SPECIFIC = 6506;
+ public static final int WORLDLIST_SORT = 6507;
+ public static final int SETFOLLOWEROPSLOWPRIORITY = 6512;
+ public static final int NC_PARAM = 6513;
+ public static final int LC_PARAM = 6514;
+ public static final int OC_PARAM = 6515;
+ public static final int STRUCT_PARAM = 6516;
+ public static final int ON_MOBILE = 6518;
+ public static final int CLIENTTYPE = 6519;
+ public static final int BATTERYLEVEL = 6524;
+ public static final int BATTERYCHARGING = 6525;
+ public static final int WIFIAVAILABLE = 6526;
+ public static final int WORLDMAP_GETMAPNAME = 6601;
+ public static final int WORLDMAP_SETMAP = 6602;
+ public static final int WORLDMAP_GETZOOM = 6603;
+ public static final int WORLDMAP_SETZOOM = 6604;
+ public static final int WORLDMAP_ISLOADED = 6605;
+ public static final int WORLDMAP_JUMPTODISPLAYCOORD = 6606;
+ public static final int WORLDMAP_JUMPTODISPLAYCOORD_INSTANT = 6607;
+ public static final int WORLDMAP_JUMPTOSOURCECOORD = 6608;
+ public static final int WORLDMAP_JUMPTOSOURCECOORD_INSTANT = 6609;
+ public static final int WORLDMAP_GETDISPLAYPOSITION = 6610;
+ public static final int WORLDMAP_GETCONFIGORIGIN = 6611;
+ public static final int WORLDMAP_GETCONFIGSIZE = 6612;
+ public static final int WORLDMAP_GETCONFIGBOUNDS = 6613;
+ public static final int WORLDMAP_GETCONFIGZOOM = 6614;
+ public static final int WORLDMAP_GETCURRENTMAP = 6616;
+ public static final int WORLDMAP_GETDISPLAYCOORD = 6617;
+ public static final int WORLDMAP_COORDINMAP = 6621;
+ 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;
}
diff --git a/cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java b/cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java
index a672d3b965..0a6382fec8 100644
--- a/cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java
+++ b/cache/src/main/java/net/runelite/cache/script/disassembler/Disassembler.java
@@ -204,7 +204,7 @@ public class Disassembler
switch (opcode)
{
- case Opcodes.LOAD_INT:
+ case Opcodes.ICONST:
case Opcodes.ILOAD:
case Opcodes.SLOAD:
case Opcodes.ISTORE:
diff --git a/cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm b/cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm
index b70b4c7eee..a5f4222fdb 100644
--- a/cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm
+++ b/cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm
@@ -3,28 +3,28 @@
.string_stack_count 0
.int_var_count 2
.string_var_count 1
- get_varc 5
- load_int 14
+ get_varc_int 5
+ iconst 14
if_icmpeq LABEL4
jump LABEL7
LABEL4:
- load_int 1
- put_varc 66
+ iconst 1
+ set_varc_int 66
return
LABEL7:
- load_int -1
+ iconst -1
istore 0
- load_string ""
+ sconst ""
sstore 0
- get_varc_string 22
+ get_varc_string_old 22
string_length
istore 1
iload 1
- load_int 0
+ iconst 0
if_icmpgt LABEL18
jump LABEL193
LABEL18:
- get_varc 5
+ get_varc_int 5
switch
1: LABEL21
2: LABEL44
@@ -46,90 +46,90 @@ LABEL21:
return
jump LABEL192
LABEL23:
- get_ignorecount
- load_int 0
+ ignore_count
+ iconst 0
if_icmplt LABEL27
jump LABEL30
LABEL27:
- load_string "Unable to update ignore list - system busy."
- send_game_message
+ sconst "Unable to update ignore list - system busy."
+ mes
jump LABEL43
LABEL30:
- get_varc 5
- load_int 4
+ get_varc_int 5
+ iconst 4
if_icmpeq LABEL34
jump LABEL37
LABEL34:
- get_varc_string 22
- add_ignore
+ get_varc_string_old 22
+ ignore_add
jump LABEL43
LABEL37:
- get_varc 5
- load_int 5
+ get_varc_int 5
+ iconst 5
if_icmpeq LABEL41
jump LABEL43
LABEL41:
- get_varc_string 22
- remove_ignore
+ get_varc_string_old 22
+ ignore_del
LABEL43:
jump LABEL192
LABEL44:
- get_friendcount
- load_int 0
+ friend_count
+ iconst 0
if_icmplt LABEL48
jump LABEL51
LABEL48:
- load_string "Unable to complete action - system busy."
- send_game_message
+ sconst "Unable to complete action - system busy."
+ mes
jump LABEL109
LABEL51:
- get_varc 5
- load_int 2
+ get_varc_int 5
+ iconst 2
if_icmpeq LABEL55
jump LABEL58
LABEL55:
- get_varc_string 22
- add_friend
+ get_varc_string_old 22
+ friend_add
jump LABEL109
LABEL58:
- get_varc 5
- load_int 3
+ get_varc_int 5
+ iconst 3
if_icmpeq LABEL62
jump LABEL65
LABEL62:
- get_varc_string 22
- remove_friend
+ get_varc_string_old 22
+ friend_del
jump LABEL109
LABEL65:
- get_varc 5
- load_int 6
+ get_varc_int 5
+ iconst 6
if_icmpeq LABEL69
jump LABEL109
LABEL69:
- get_varc 203
- load_int 0
+ get_varc_int 203
+ iconst 0
if_icmpeq LABEL76
- get_varc 203
- load_int -1
+ get_varc_int 203
+ iconst -1
if_icmpeq LABEL76
jump LABEL82
LABEL76:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
- load_string "You must set a name before you can chat."
- send_game_message
+ sconst "You must set a name before you can chat."
+ mes
return
LABEL82:
- 5005
- load_int 2
+ chat_getfilter_private
+ iconst 2
if_icmpeq LABEL86
jump LABEL97
LABEL86:
- 5000
- load_int 1
- 5016
- chatfilter_update
+ chat_getfilter_public
+ iconst 1
+ chat_getfilter_trade
+ chat_setfilter
invoke 178
invoke 553
istore 0
@@ -139,123 +139,123 @@ LABEL86:
invoke 89
LABEL97:
get_varbit 4394
- load_int 1
+ iconst 1
if_icmpeq LABEL101
jump LABEL104
LABEL101:
- get_varc_string 23
- remove_friend
+ get_varc_string_old 23
+ friend_del
jump LABEL107
LABEL104:
- get_varc_string 23
- get_varc_string 22
- privmsg
+ get_varc_string_old 23
+ get_varc_string_old 22
+ chat_sendprivate
LABEL107:
- get_gamecycle
- put_varc 61
+ clientclock
+ set_varc_int 61
LABEL109:
jump LABEL192
LABEL110:
- get_varc_string 22
+ get_varc_string_old 22
invoke 212
- numeric_input
+ resume_countdialog
jump LABEL192
LABEL114:
- get_varc_string 22
- string_remove_html
- put_varc_string 128
- get_varc_string 22
- string_input_1
+ get_varc_string_old 22
+ removetags
+ set_varc_string_old 128
+ get_varc_string_old 22
+ resume_namedialog
jump LABEL192
LABEL120:
- get_varc_string 22
- string_input_2
+ get_varc_string_old 22
+ resume_stringdialog
jump LABEL192
LABEL123:
- get_varc 203
- load_int 0
+ get_varc_int 203
+ iconst 0
if_icmpeq LABEL130
- get_varc 203
- load_int -1
+ get_varc_int 203
+ iconst -1
if_icmpeq LABEL130
jump LABEL136
LABEL130:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
- load_string "You must set a name before you can chat."
- send_game_message
+ sconst "You must set a name before you can chat."
+ mes
return
LABEL136:
- get_varc_string 22
- string_remove_html
- put_varc_string 129
- get_varc_string 22
- join_clanchat
+ get_varc_string_old 22
+ removetags
+ set_varc_string_old 129
+ get_varc_string_old 22
+ clan_joinchat
jump LABEL192
LABEL142:
iload 1
- load_int 10
+ iconst 10
if_icmpgt LABEL146
jump LABEL152
LABEL146:
- get_varc_string 22
- load_int 0
- load_int 9
- string_substring
+ get_varc_string_old 22
+ iconst 0
+ iconst 9
+ substring
sstore 0
jump LABEL154
LABEL152:
- get_varc_string 22
+ get_varc_string_old 22
sstore 0
LABEL154:
sload 0
- tolowercase
- 5021
+ lowercase
+ chat_setmessagefilter
invoke 553
invoke 84
jump LABEL192
LABEL160:
- get_varc 203
- load_int 0
+ get_varc_int 203
+ iconst 0
if_icmpeq LABEL167
- get_varc 203
- load_int -1
+ get_varc_int 203
+ iconst -1
if_icmpeq LABEL167
jump LABEL173
LABEL167:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
- load_string "You must set a name before you can chat."
- send_game_message
+ sconst "You must set a name before you can chat."
+ mes
return
LABEL173:
- get_varc_string 22
- load_int 0
- put_varc 62
- put_varc_string 28
+ get_varc_string_old 22
+ iconst 0
+ set_varc_int 62
+ set_varc_string_old 28
invoke 95
- load_int 552
- load_int -2147483645
- load_int 1
- load_string "I1"
- load_int 10616843
- widget_put_render_listener_widget
+ iconst 552
+ iconst -2147483645
+ iconst 1
+ sconst "I1"
+ iconst 10616843
+ if_setontimer
jump LABEL192
LABEL185:
- load_int 0
- load_int 1
+ iconst 0
+ iconst 1
invoke 299
return
jump LABEL192
LABEL190:
- get_varc_string 22
+ get_varc_string_old 22
invoke 2061
LABEL192:
jump LABEL199
LABEL193:
- get_varc 5
+ get_varc_int 5
switch
16: LABEL198
7: LABEL196
@@ -269,7 +269,7 @@ LABEL196:
LABEL198:
return
LABEL199:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
return
diff --git a/cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm b/cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm
index 901c7169ad..25a749a77b 100644
--- a/cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm
+++ b/cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm
@@ -12,111 +12,111 @@
jump LABEL84
LABEL3:
iload 1
- get_varc 175
+ get_varc_int 175
if_icmplt LABEL7
jump LABEL9
LABEL7:
- load_int 0
+ iconst 0
return
LABEL9:
sload 0
- string_remove_html
- is_ignore
- load_int 1
+ removetags
+ ignore_test
+ iconst 1
if_icmpeq LABEL15
jump LABEL17
LABEL15:
- load_int 0
+ iconst 0
return
LABEL17:
- load_int 1
+ iconst 1
return
jump LABEL84
LABEL20:
iload 1
- get_varc 175
+ get_varc_int 175
if_icmplt LABEL24
jump LABEL26
LABEL24:
- load_int 0
+ iconst 0
return
LABEL26:
sload 0
- string_remove_html
- is_ignore
- load_int 1
+ removetags
+ ignore_test
+ iconst 1
if_icmpeq LABEL32
jump LABEL34
LABEL32:
- load_int 0
+ iconst 0
return
LABEL34:
- 5005
- load_int 0
+ chat_getfilter_private
+ iconst 0
if_icmpeq LABEL38
jump LABEL40
LABEL38:
- load_int 1
+ iconst 1
return
LABEL40:
- 5005
- load_int 1
+ chat_getfilter_private
+ iconst 1
if_icmpeq LABEL44
jump LABEL51
LABEL44:
sload 0
- is_friend
- load_int 1
+ friend_test
+ iconst 1
if_icmpeq LABEL49
jump LABEL51
LABEL49:
- load_int 1
+ iconst 1
return
LABEL51:
- load_int 0
+ iconst 0
return
jump LABEL84
LABEL54:
iload 1
- get_varc 175
+ get_varc_int 175
if_icmplt LABEL58
jump LABEL60
LABEL58:
- load_int 0
+ iconst 0
return
LABEL60:
iload 0
- load_int 5
+ iconst 5
if_icmpeq LABEL64
jump LABEL76
LABEL64:
get_varbit 1627
- load_int 0
+ iconst 0
if_icmpeq LABEL68
jump LABEL76
LABEL68:
- get_gamecycle
+ clientclock
iload 1
- isub
- load_int 500
+ sub
+ iconst 500
if_icmpge LABEL74
jump LABEL76
LABEL74:
- load_int 0
+ iconst 0
return
LABEL76:
- 5005
- load_int 2
+ chat_getfilter_private
+ iconst 2
if_icmpne LABEL80
jump LABEL82
LABEL80:
- load_int 1
+ iconst 1
return
LABEL82:
- load_int 0
+ iconst 0
return
LABEL84:
- load_int 0
+ iconst 0
return
- load_int -1
+ iconst -1
return
diff --git a/cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm b/cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm
index 7ca51cc723..a1fc0a62e1 100644
--- a/cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm
+++ b/cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm
@@ -3,5 +3,5 @@
.string_stack_count 0
.int_var_count 0
.string_var_count 0
- load_string ":Â "
+ sconst ":Â "
return
diff --git a/http-api/pom.xml b/http-api/pom.xml
index 9a8bb7805c..1faffff7e3 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -28,7 +28,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
Web API
diff --git a/http-service/pom.xml b/http-service/pom.xml
index 5301855666..b63c8f77e4 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -28,7 +28,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
Web Service
diff --git a/pom.xml b/pom.xml
index b0e9cf092f..c77d7701e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
pom
RuneLite
diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml
index 52f2914ae8..45f5cb501d 100644
--- a/protocol-api/pom.xml
+++ b/protocol-api/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
protocol-api
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 7981a5ad43..b5e0f7184a 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
protocol
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index 0456b0fdcd..6337af0c02 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
runelite-api
diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java
index f4d4362053..2e5b5b790c 100644
--- a/runelite-api/src/main/java/net/runelite/api/ItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java
@@ -6494,7 +6494,7 @@ public final class ItemID
public static final int ZAMORAK_CHAPS = 10372;
public static final int ZAMORAK_COIF = 10374;
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_COIF = 10382;
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 ZAMORAK_DHIDE_10790 = 10790;
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 RUNE_PLATEBODY_G_10798 = 10798;
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_HELM = 23101;
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. */
}
diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java
index 0b6f19815a..a483290e88 100644
--- a/runelite-api/src/main/java/net/runelite/api/NpcID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java
@@ -6207,6 +6207,7 @@ public final class NpcID
public static final int SPAWN_6768 = 6768;
public static final int OSTEN = 6769;
public static final int ARCIS = 6770;
+ public static final int DREW = 6771;
public static final int LOVADA = 6772;
public static final int DOOMSAYER = 6773;
public static final int DOOMSAYER_6774 = 6774;
diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java
index b2d75645a9..6aa1699c1b 100644
--- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java
@@ -12279,5 +12279,13 @@ public final class NullItemID
public static final int NULL_23106 = 23106;
public static final int NULL_23107 = 23107;
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. */
}
diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
index 9c09d4df61..c8234df8b1 100644
--- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
@@ -11440,7 +11440,6 @@ public final class NullObjectID
public static final int NULL_24552 = 24552;
public static final int NULL_24553 = 24553;
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_24604 = 24604;
public static final int NULL_24623 = 24623;
diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java
index dcc21803c3..2b5a2d9633 100644
--- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java
@@ -13120,8 +13120,9 @@ public final class ObjectID
public static final int DISPLAY_CASE_24551 = 24551;
public static final int SPECIMEN_TABLE_24555 = 24555;
public static final int SPECIMEN_TABLE_24556 = 24556;
- public static final int ROCKS_24557 = 24557;
- public static final int DIG_SITE_SPECIMEN_ROCKS = 24559;
+ public static final int DIG_SITE_SPECIMEN_ROCKS = 24557;
+ 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_24561 = 24561;
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 LEVER_26194 = 26194;
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_26202 = 26202;
public static final int TABLE_26203 = 26203;
diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java
index 6ac6aa42bb..68abc5e0f7 100644
--- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java
@@ -116,15 +116,6 @@ public final class ScriptID
*/
public static final int DIARY_QUEST_UPDATE_LINECOUNT = 2523;
- /**
- * Initializes the chatbox input to use RuneLite callbacks
- *
- * - String Prompt text
- * - String Default value
- *
- */
- public static final int RUNELITE_CHATBOX_INPUT_INIT = 10001;
-
/**
* Does nothing
*
diff --git a/runelite-api/src/main/java/net/runelite/api/VarPlayer.java b/runelite-api/src/main/java/net/runelite/api/VarPlayer.java
index ed2f25e74e..62489df3f0 100644
--- a/runelite-api/src/main/java/net/runelite/api/VarPlayer.java
+++ b/runelite-api/src/main/java/net/runelite/api/VarPlayer.java
@@ -68,6 +68,11 @@ public enum VarPlayer
*/
THRONE_OF_MISCELLANIA(359),
+ /**
+ * Item currently active in the creation of a buy or sell offer
+ */
+ CURRENT_GE_ITEM(1151),
+
/**
* Experience tracker goal start.
*/
diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java
index f3ce1e6e12..ca053bd207 100644
--- a/runelite-api/src/main/java/net/runelite/api/Varbits.java
+++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java
@@ -468,7 +468,14 @@ public enum Varbits
BANK_TAB_SIX_COUNT(4176),
BANK_TAB_SEVEN_COUNT(4177),
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.
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
index a8a1ec668e..2d6551e5f1 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
@@ -350,6 +350,7 @@ public class WidgetID
static final int ROOT_INTERFACE_CONTAINER = 62;
static final int BANK_CONTAINER = 64;
static final int INTERFACE_CONTAINER = 65;
+ static final int INVENTORY_CONTAINER = 69;
}
static class ResizableViewport
@@ -383,6 +384,7 @@ public class WidgetID
static final int PRAYER_ICON = 63;
static final int MAGIC_ICON = 64;
static final int INTERFACE_CONTAINER = 65;
+ static final int INVENTORY_CONTAINER = 71;
}
static class ResizableViewportBottomLine
@@ -415,6 +417,7 @@ public class WidgetID
static final int MUSIC_TAB = 40;
static final int MUSIC_ICON = 46;
static final int MAGIC_ICON = 63;
+ static final int INVENTORY_CONTAINER = 71;
}
static class Chatbox
@@ -689,7 +692,7 @@ public class WidgetID
static class Minigames
{
- static final int TELEPORT_BUTTON = 31;
+ static final int TELEPORT_BUTTON = 26;
}
static class StandardSpellBook
@@ -753,8 +756,8 @@ public class WidgetID
static class QuestList
{
- static final int FREE_CONTAINER = 9;
- static final int MEMBERS_CONTAINER = 10;
- static final int MINIQUEST_CONTAINER = 11;
+ static final int FREE_CONTAINER = 6;
+ static final int MEMBERS_CONTAINER = 7;
+ static final int MINIQUEST_CONTAINER = 8;
}
}
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
index 7808e06cba..43e03dde4a 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
@@ -76,8 +76,6 @@ public enum WidgetInfo
EMOTE_WINDOW(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_WINDOW),
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_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_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_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_STATS_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.STATS_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_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_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_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),
PRAYER_THICK_SKIN(WidgetID.PRAYER_GROUP_ID, WidgetID.Prayer.THICK_SKIN),
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index 9e118b44f0..528774f347 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
client
diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
index 54318b887a..dc3fc07e41 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
@@ -99,6 +99,9 @@ public class ConfigManager
public final void switchSession(AccountSession session)
{
+ // Ensure existing config is saved
+ sendConfig();
+
if (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();
@@ -392,19 +395,6 @@ public class ConfigManager
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.setGroup(groupName);
configChanged.setKey(key);
@@ -435,19 +425,6 @@ public class ConfigManager
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.setGroup(groupName);
configChanged.setKey(key);
@@ -653,6 +630,7 @@ public class ConfigManager
public void sendConfig()
{
+ boolean changed;
synchronized (pendingChanges)
{
if (client != null)
@@ -672,7 +650,20 @@ public class ConfigManager
}
}
}
+ changed = !pendingChanges.isEmpty();
pendingChanges.clear();
}
+
+ if (changed)
+ {
+ try
+ {
+ saveToFile(propertiesFile);
+ }
+ catch (IOException ex)
+ {
+ log.warn("unable to save configuration file", ex);
+ }
+ }
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java b/runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java
deleted file mode 100644
index ec8905e380..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java
+++ /dev/null
@@ -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 done;
- private Consumer 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 done)
- {
- openInputWindow(text, defaul, NO_LIMIT, done);
- }
-
- public void openInputWindow(String text, String defaul, int characterLimit, Consumer done)
- {
- openInputWindow(text, defaul, characterLimit, null, done);
- }
-
- public void openInputWindow(String text, String defaul, int characterLimit, Consumer changed, Consumer 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);
- }
- }
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
index 5eda167c17..f866d199ce 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
@@ -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_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,
- 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
ITEM_PHARAOHS_SCEPTRE_1(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_1),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
index 7295577e34..e7e22cdae3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
@@ -366,6 +366,11 @@ public class ChatCommandsPlugin extends Plugin
return;
}
+ if (message.length() <= KILLCOUNT_COMMAND_STRING.length())
+ {
+ return;
+ }
+
ChatMessageType type = chatMessage.getType();
String search = message.substring(KILLCOUNT_COMMAND_STRING.length() + 1);
@@ -483,6 +488,11 @@ public class ChatCommandsPlugin extends Plugin
return;
}
+ if (message.length() <= PB_COMMAND.length())
+ {
+ return;
+ }
+
ChatMessageType type = chatMessage.getType();
String search = message.substring(PB_COMMAND.length() + 1);
@@ -574,6 +584,11 @@ public class ChatCommandsPlugin extends Plugin
return;
}
+ if (message.length() <= PRICE_COMMAND_STRING.length())
+ {
+ return;
+ }
+
MessageNode messageNode = chatMessage.getMessageNode();
String search = message.substring(PRICE_COMMAND_STRING.length() + 1);
@@ -637,6 +652,11 @@ public class ChatCommandsPlugin extends Plugin
}
else
{
+ if (message.length() <= LEVEL_COMMAND_STRING.length())
+ {
+ return;
+ }
+
search = message.substring(LEVEL_COMMAND_STRING.length() + 1);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
index beb56a171f..75cc26163c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
@@ -167,7 +167,7 @@ public class FriendNotesPlugin extends Plugin
if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() && event.getOption().equals("Message"))
{
// Friends have color tags
- setHoveredFriend(Text.removeTags(event.getTarget()));
+ setHoveredFriend(Text.toJagexName(Text.removeTags(event.getTarget())));
// Build "Add Note" or "Edit Note" menu entry
final MenuEntry addNote = new MenuEntry();
@@ -197,13 +197,13 @@ public class FriendNotesPlugin extends Plugin
return;
}
- //Friends have color tags
- final String sanitizedTarget = Text.removeTags(event.getMenuTarget());
-
// Handle clicks on "Add Note" or "Edit Note"
if (event.getMenuOption().equals(ADD_NOTE) || event.getMenuOption().equals(EDIT_NOTE))
{
event.consume();
+
+ //Friends have color tags
+ final String sanitizedTarget = Text.toJagexName(Text.removeTags(event.getMenuTarget()));
final String note = getFriendNote(sanitizedTarget);
// 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
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)
{
// 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);
setFriendNote(displayName, null);
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatConfig.java
index c9fa8af82b..3c7d586a86 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatConfig.java
@@ -52,6 +52,16 @@ public interface ItemStatConfig extends Config
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(
keyName = "relative",
name = "Show Relative",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
index 250a6410cd..3a599cfa6e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
@@ -24,13 +24,46 @@
*/
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.Inject;
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.eventbus.Subscribe;
+import net.runelite.client.game.ItemManager;
import net.runelite.client.plugins.Plugin;
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.util.StackFormatter;
+import net.runelite.http.api.item.ItemEquipmentStats;
+import net.runelite.http.api.item.ItemStats;
@PluginDescriptor(
name = "Item Stats",
@@ -39,12 +72,30 @@ import net.runelite.client.ui.overlay.OverlayManager;
)
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
private OverlayManager overlayManager;
@Inject
private ItemStatOverlay overlay;
+ @Inject
+ private Client client;
+
+ @Inject
+ private ItemManager itemManager;
+
+ @Inject
+ private ItemStatConfig config;
+
+ @Inject
+ private ClientThread clientThread;
+
+ private Widget itemInformationTitle;
+
@Provides
ItemStatConfig getConfig(ConfigManager configManager)
{
@@ -67,5 +118,319 @@ public class ItemStatPlugin extends Plugin
protected void shutDown() throws Exception
{
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 stats = ImmutableSet.of(
+ "Stab",
+ "Slash",
+ "Crush",
+ "Magic",
+ "Ranged"
+ );
+
+ final List attackStats = ImmutableList.of(
+ equipmentStats.getAstab(),
+ equipmentStats.getAslash(),
+ equipmentStats.getAcrush(),
+ equipmentStats.getAmagic(),
+ equipmentStats.getArange()
+ );
+
+ final List 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 miscStats = ImmutableMap.of(
+ "Strength", equipmentStats.getStr(),
+ "Ranged Strength", equipmentStats.getRstr(),
+ "Magic Damage", equipmentStats.getMdmg(),
+ "Prayer Bonus", equipmentStats.getPrayer()
+ );
+
+ for (final Map.Entry 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);
+ }
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java
index dbc5fb031b..24ffbc5a56 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java
@@ -148,8 +148,8 @@ enum PrayerItems
ANCIENT_DHIDE(ItemID.ANCIENT_DHIDE, 1),
ARMADYL_DHIDE(ItemID.ARMADYL_DHIDE, 1),
BANDOS_DHIDE(ItemID.BANDOS_DHIDE, 1),
- GUTHIX_DRAGONHIDE(ItemID.GUTHIX_DRAGONHIDE, 1),
- GUTHIX_DRAGONHIDE_10794(ItemID.GUTHIX_DRAGONHIDE_10794, 1),
+ GUTHIX_DRAGONHIDE(ItemID.GUTHIX_DHIDE, 1),
+ GUTHIX_DRAGONHIDE_10794(ItemID.GUTHIX_DRAGONHIDE, 1),
SARADOMIN_DHIDE(ItemID.SARADOMIN_DHIDE, 1),
SARADOMIN_DHIDE_10792(ItemID.SARADOMIN_DHIDE_10792, 1),
ZAMORAK_DHIDE(ItemID.ZAMORAK_DHIDE, 1),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
index 594038aa27..5f2c7d3c2d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
@@ -65,7 +65,7 @@ enum Task
CAVE_SLIMES("Cave slimes", ItemID.SWAMP_CAVE_SLIME),
CERBERUS("Cerberus", ItemID.HELLPUPPY),
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"),
COWS("Cows", ItemID.COW_MASK),
CRAWLING_HANDS("Crawling hands", ItemID.CRAWLING_HAND, "Crushing hand"),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
index aaf6a084e9..afbc30b766 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
@@ -131,6 +131,9 @@ public class WikiPlugin extends Plugin
return;
}
children[0] = null;
+
+ onDeselect();
+ client.setSpellSelected(false);
});
}
@@ -186,7 +189,10 @@ public class WikiPlugin extends Plugin
private void onDeselect()
{
wikiSelected = false;
- icon.setSpriteId(WikiSprite.WIKI_ICON.getSpriteId());
+ if (icon != null)
+ {
+ icon.setSpriteId(WikiSprite.WIKI_ICON.getSpriteId());
+ }
}
@Subscribe
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java
index d6a10df1b8..16602b0cb4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpState.java
@@ -79,7 +79,7 @@ class XpState
if (state.getStartXp() == -1)
{
- if (currentXp > 0)
+ if (currentXp >= 0)
{
initializeSkill(skill, currentXp);
return XpUpdateResult.INITIALIZED;
@@ -198,7 +198,8 @@ class XpState
boolean isInitialized(Skill skill)
{
- return xpSkills.containsKey(skill);
+ XpStateSingle xpStateSingle = xpSkills.get(skill);
+ return xpStateSingle != null && xpStateSingle.getStartXp() != -1;
}
@NonNull
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
index c66c409a16..f72bcd12f2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
@@ -305,7 +305,9 @@ public class XpTrackerPlugin extends Plugin
if (skill == Skill.CONSTRUCTION && updateResult == XpUpdateResult.INITIALIZED)
{
// 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))
{
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/JagexColors.java b/runelite-client/src/main/java/net/runelite/client/ui/JagexColors.java
index ac5fbeed6f..38b1ea657f 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/JagexColors.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/JagexColors.java
@@ -62,4 +62,10 @@ public class JagexColors
public static final Color TOOLTIP_BACKGROUND = new Color(255, 255, 160);
public static final Color TOOLTIP_BORDER = 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;
}
diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json
index 194ea684f2..d196c9e9d2 100644
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -6705,10 +6705,6 @@
10370,
10790
],
- "guthix dragonhide": [
- 10378,
- 10794
- ],
"saradomin dhide": [
10386,
10792
@@ -8908,5 +8904,11 @@
23067,
23068,
23070
+ ],
+ "mystic set": [
+ 23110,
+ 23113,
+ 23116,
+ 23119
]
}
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/BankSearchFilter.rs2asm b/runelite-client/src/main/scripts/BankSearchFilter.rs2asm
index 741c551317..fd3f415b5d 100644
--- a/runelite-client/src/main/scripts/BankSearchFilter.rs2asm
+++ b/runelite-client/src/main/scripts/BankSearchFilter.rs2asm
@@ -3,68 +3,68 @@
.string_stack_count 0
.int_var_count 1
.string_var_count 2
- load_string ""
+ sconst ""
sstore 0
- load_string ""
+ sconst ""
sstore 1
invoke 514
- load_int 1
+ iconst 1
if_icmpeq LABEL8
jump LABEL34
LABEL8:
- 049 359 ; Skip truncating of varcstr 22 by not calling 280
- tolowercase ; instead get the var directly and lowercase it
+ get_varc_string 359 ; Skip truncating of varcstr 22 by not calling 280
+ lowercase ; instead get the var directly and lowercase it
sstore 1
sload 1
- string_length
- load_int 0
+ string_length
+ iconst 0
if_icmpgt LABEL15
jump LABEL34
LABEL15:
iload 0
- load_int -1
+ iconst -1
if_icmpne LABEL19
jump LABEL23
LABEL19:
iload 0
- get_item_name
- tolowercase
+ oc_name
+ lowercase
sstore 0
-LABEL1337: ; check if the bank tags plugin is active
- load_int 1 ; true
- load_int 0 ; load active boolean
- load_string "bankTagsActive" ; push event name
- runelite_callback ; invoke callback
+LABEL1337:; check if the bank tags plugin is active
+ iconst 1 ; true
+ iconst 0 ; load active boolean
+ sconst "bankTagsActive" ; push event name
+ runelite_callback ; invoke callback
if_icmpeq LABEL1338 ; if the plugin is active then jump to the label that decides if the
; item should be shown
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
- load_int 0 ; load return value
+LABEL1338:; let the bank tag plugin decide if the item should be shown
+ iconst 0 ; load return value
iload 0 ; load item id
sload 0 ; load item name
sload 1 ; load search string
- load_string "bankSearchFilter" ; push event name
- runelite_callback ; invoke callback
- pop_int ; pop item id
- pop_string ; pop search string
- pop_string ; pop item name
- return ; return value
+ sconst "bankSearchFilter" ; push event name
+ runelite_callback ; invoke callback
+ pop_int ; pop item id
+ pop_string ; pop search string
+ pop_string ; pop item name
+ return ; return value
LABEL23:
sload 0
sload 1
- load_int 0
- string_indexof_from
- load_int -1
+ iconst 0
+ string_indexof_string
+ iconst -1
if_icmpne LABEL30
jump LABEL32
LABEL30:
- load_int 1
- return
+ iconst 1
+ return
LABEL32:
- load_int 0
- return
+ iconst 0
+ return
LABEL34:
- load_int 1
- return
- load_int -1
- return
+ iconst 1
+ return
+ iconst -1
+ return
diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm
index bf50394dad..47dad19197 100644
--- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm
+++ b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm
@@ -4,165 +4,165 @@
.int_var_count 31
.string_var_count 1
get_varbit 5102
- load_int 1
+ iconst 1
if_icmpeq LABEL4
jump LABEL8
LABEL4:
- load_int 0
+ iconst 0
iload 10
- widget_put_hidden_widget
+ if_sethide
jump LABEL13
LABEL8:
- load_int 1
+ iconst 1
iload 10
- widget_put_hidden_widget
+ if_sethide
iload 12
invoke 41
LABEL13:
get_varbit 5364
- load_int 1
+ iconst 1
if_icmpeq LABEL17
jump LABEL24
LABEL17:
- load_int 37
- load_int 37
- load_int 1
- load_int 0
+ iconst 37
+ iconst 37
+ iconst 1
+ iconst 0
iload 5
- widget_put_size_widget
+ if_setsize
jump LABEL30
LABEL24:
- load_int 0
- load_int 37
- load_int 1
- load_int 0
+ iconst 0
+ iconst 37
+ iconst 1
+ iconst 0
iload 5
- widget_put_size_widget
+ if_setsize
LABEL30:
- load_int 1
+ iconst 1
iload 11
- widget_put_hidden_widget
+ if_sethide
iload 11
- widget_unset_children
- load_int 0
+ cc_deleteall
+ iconst 0
istore 13
get_varbit 4170
- load_int 3
+ iconst 3
if_icmpeq LABEL41
jump LABEL74
LABEL41:
get_varbit 4171
- load_int 0
+ iconst 0
if_icmpgt LABEL69
get_varbit 4172
- load_int 0
+ iconst 0
if_icmpgt LABEL69
get_varbit 4173
- load_int 0
+ iconst 0
if_icmpgt LABEL69
get_varbit 4174
- load_int 0
+ iconst 0
if_icmpgt LABEL69
get_varbit 4175
- load_int 0
+ iconst 0
if_icmpgt LABEL69
get_varbit 4176
- load_int 0
+ iconst 0
if_icmpgt LABEL69
get_varbit 4177
- load_int 0
+ iconst 0
if_icmpgt LABEL69
get_varbit 4178
- load_int 0
+ iconst 0
if_icmpgt LABEL69
get_varbit 4179
- load_int 0
+ iconst 0
if_icmpgt LABEL69
jump LABEL72
LABEL69:
- load_int 0
+ iconst 0
istore 13
jump LABEL74
LABEL72:
- load_int 1
+ iconst 1
istore 13
LABEL74:
- load_int 0
+ iconst 0
istore 14
iload 13
- load_int 1
+ iconst 1
if_icmpeq LABEL80
jump LABEL110
LABEL80:
- load_int 1
+ iconst 1
iload 9
- widget_put_hidden_widget
- load_int 11
+ if_sethide
+ iconst 11
istore 14
- load_int 0
- load_int 26
- load_int 1
- load_int 1
+ iconst 0
+ iconst 26
+ iconst 1
+ iconst 1
iload 1
- widget_put_size_widget
- load_int 460
- load_int 39
- load_int 0
- load_int 1
+ if_setsize
+ iconst 460
+ iconst 39
+ iconst 0
+ iconst 1
iload 3
- widget_put_size_widget
- load_int 16
- load_int 39
- load_int 0
- load_int 1
+ if_setsize
+ iconst 16
+ iconst 39
+ iconst 0
+ iconst 1
iload 4
- widget_put_size_widget
- load_int 30
- load_int 48
- load_int 2
- load_int 0
+ if_setsize
+ iconst 30
+ iconst 48
+ iconst 2
+ iconst 0
iload 2
- widget_put_position_widget
+ if_setposition
jump LABEL137
LABEL110:
- load_int 0
+ iconst 0
iload 9
- widget_put_hidden_widget
- load_int 0
- load_int 0
- load_int 1
- load_int 1
+ if_sethide
+ iconst 0
+ iconst 0
+ iconst 1
+ iconst 1
iload 1
- widget_put_size_widget
- load_int 460
- load_int 81
- load_int 0
- load_int 1
+ if_setsize
+ iconst 460
+ iconst 81
+ iconst 0
+ iconst 1
iload 3
- widget_put_size_widget
- load_int 16
- load_int 81
- load_int 0
- load_int 1
+ if_setsize
+ iconst 16
+ iconst 81
+ iconst 0
+ iconst 1
iload 4
- widget_put_size_widget
- load_int 12
- load_int 42
- load_int 2
- load_int 0
+ if_setsize
+ iconst 12
+ iconst 42
+ iconst 2
+ iconst 0
iload 2
- widget_put_position_widget
+ if_setposition
LABEL137:
iload 4
iload 3
invoke 231
- load_int 816
+ iconst 816
istore 15
- load_int 816
- load_int 9
- load_int 3
- imul
- iadd
+ iconst 816
+ iconst 9
+ iconst 3
+ multiply
+ add
istore 16
LABEL148:
iload 15
@@ -172,133 +172,133 @@ LABEL148:
LABEL152:
iload 3
iload 15
- widget_load_child
- load_int 1
+ cc_find
+ iconst 1
if_icmpeq LABEL158
jump LABEL160
LABEL158:
- load_int 1
- widget_put_hidden
+ iconst 1
+ cc_sethide
LABEL160:
iload 15
- load_int 1
- iadd
+ iconst 1
+ add
istore 15
jump LABEL148
LABEL165:
- load_int 0
+ iconst 0
istore 15
- load_int 8
- load_int 1
- isub
+ iconst 8
+ iconst 1
+ sub
istore 17
iload 3
- widget_get_width_widget
- load_int 51
- isub
- load_int 35
- isub
+ if_getwidth
+ iconst 51
+ sub
+ iconst 35
+ sub
istore 18
iload 18
- load_int 8
- load_int 36
- imul
- isub
+ iconst 8
+ iconst 36
+ multiply
+ sub
iload 17
- idiv
+ div
istore 19
- load_int -1
+ iconst -1
istore 20
- load_int 0
+ iconst 0
istore 21
- load_int 0
+ iconst 0
istore 22
- load_int 0
+ iconst 0
istore 23
- load_int 0
+ iconst 0
istore 24
- load_int -1
+ iconst -1
istore 25
- load_int 0
+ iconst 0
istore 26
- load_string ""
+ sconst ""
sstore 0
get_varbit 4150
- load_int 0
+ iconst 0
if_icmple LABEL209
get_varbit 4150
- load_int 9
+ iconst 9
if_icmpgt LABEL209
jump LABEL658
LABEL209:
iload 15
- load_int 816
+ iconst 816
if_icmplt LABEL213
jump LABEL238
LABEL213:
iload 3
iload 15
- widget_load_child
- load_int 1
+ cc_find
+ iconst 1
if_icmpeq LABEL219
jump LABEL221
LABEL219:
- load_int 1
- widget_put_hidden
+ iconst 1
+ cc_sethide
LABEL221:
- load_int 95
+ iconst 95
iload 15
- get_itemcontainer_itemid
- load_int -1
+ inv_getobj
+ iconst -1
if_icmpne LABEL227
jump LABEL233
LABEL227:
iload 24
- load_int 1
- iadd
+ iconst 1
+ add
iload 15
istore 25
istore 24
LABEL233:
iload 15
- load_int 1
- iadd
+ iconst 1
+ add
istore 15
jump LABEL209
LABEL238:
get_varbit 4171
get_varbit 4172
- iadd
+ add
get_varbit 4173
- iadd
+ add
get_varbit 4174
- iadd
+ add
get_varbit 4175
- iadd
+ add
get_varbit 4176
- iadd
+ add
get_varbit 4177
- iadd
+ add
get_varbit 4178
- iadd
+ add
get_varbit 4179
- iadd
+ add
istore 26
iload 26
- load_int 0
+ iconst 0
if_icmple LABEL260
jump LABEL264
LABEL260:
- load_int 816
- load_int 1
- isub
+ iconst 816
+ iconst 1
+ sub
istore 25
LABEL264:
iload 26
iload 25
- load_int 1
- iadd
- load_int 0
+ iconst 1
+ add
+ iconst 0
iload 3
iload 4
iload 10
@@ -313,16 +313,16 @@ LABEL264:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
- load_int 0
+ iconst 0
istore 15
get_varbit 4171
- load_int 0
+ iconst 0
if_icmpgt LABEL291
jump LABEL321
LABEL291:
- load_int 1
+ iconst 1
iload 3
iload 23
invoke 510
@@ -330,8 +330,8 @@ LABEL291:
iload 15
iload 15
get_varbit 4171
- iadd
- load_int 1
+ add
+ iconst 1
iload 3
iload 4
iload 10
@@ -346,19 +346,19 @@ LABEL291:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4171
- iadd
+ add
istore 15
LABEL321:
get_varbit 4172
- load_int 0
+ iconst 0
if_icmpgt LABEL325
jump LABEL355
LABEL325:
- load_int 2
+ iconst 2
iload 3
iload 23
invoke 510
@@ -366,8 +366,8 @@ LABEL325:
iload 15
iload 15
get_varbit 4172
- iadd
- load_int 2
+ add
+ iconst 2
iload 3
iload 4
iload 10
@@ -382,19 +382,19 @@ LABEL325:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4172
- iadd
+ add
istore 15
LABEL355:
get_varbit 4173
- load_int 0
+ iconst 0
if_icmpgt LABEL359
jump LABEL389
LABEL359:
- load_int 3
+ iconst 3
iload 3
iload 23
invoke 510
@@ -402,8 +402,8 @@ LABEL359:
iload 15
iload 15
get_varbit 4173
- iadd
- load_int 3
+ add
+ iconst 3
iload 3
iload 4
iload 10
@@ -418,19 +418,19 @@ LABEL359:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4173
- iadd
+ add
istore 15
LABEL389:
get_varbit 4174
- load_int 0
+ iconst 0
if_icmpgt LABEL393
jump LABEL423
LABEL393:
- load_int 4
+ iconst 4
iload 3
iload 23
invoke 510
@@ -438,8 +438,8 @@ LABEL393:
iload 15
iload 15
get_varbit 4174
- iadd
- load_int 4
+ add
+ iconst 4
iload 3
iload 4
iload 10
@@ -454,19 +454,19 @@ LABEL393:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4174
- iadd
+ add
istore 15
LABEL423:
get_varbit 4175
- load_int 0
+ iconst 0
if_icmpgt LABEL427
jump LABEL457
LABEL427:
- load_int 5
+ iconst 5
iload 3
iload 23
invoke 510
@@ -474,8 +474,8 @@ LABEL427:
iload 15
iload 15
get_varbit 4175
- iadd
- load_int 5
+ add
+ iconst 5
iload 3
iload 4
iload 10
@@ -490,19 +490,19 @@ LABEL427:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4175
- iadd
+ add
istore 15
LABEL457:
get_varbit 4176
- load_int 0
+ iconst 0
if_icmpgt LABEL461
jump LABEL491
LABEL461:
- load_int 6
+ iconst 6
iload 3
iload 23
invoke 510
@@ -510,8 +510,8 @@ LABEL461:
iload 15
iload 15
get_varbit 4176
- iadd
- load_int 6
+ add
+ iconst 6
iload 3
iload 4
iload 10
@@ -526,19 +526,19 @@ LABEL461:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4176
- iadd
+ add
istore 15
LABEL491:
get_varbit 4177
- load_int 0
+ iconst 0
if_icmpgt LABEL495
jump LABEL525
LABEL495:
- load_int 7
+ iconst 7
iload 3
iload 23
invoke 510
@@ -546,8 +546,8 @@ LABEL495:
iload 15
iload 15
get_varbit 4177
- iadd
- load_int 7
+ add
+ iconst 7
iload 3
iload 4
iload 10
@@ -562,19 +562,19 @@ LABEL495:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4177
- iadd
+ add
istore 15
LABEL525:
get_varbit 4178
- load_int 0
+ iconst 0
if_icmpgt LABEL529
jump LABEL559
LABEL529:
- load_int 8
+ iconst 8
iload 3
iload 23
invoke 510
@@ -582,8 +582,8 @@ LABEL529:
iload 15
iload 15
get_varbit 4178
- iadd
- load_int 8
+ add
+ iconst 8
iload 3
iload 4
iload 10
@@ -598,19 +598,19 @@ LABEL529:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4178
- iadd
+ add
istore 15
LABEL559:
get_varbit 4179
- load_int 0
+ iconst 0
if_icmpgt LABEL563
jump LABEL593
LABEL563:
- load_int 9
+ iconst 9
iload 3
iload 23
invoke 510
@@ -618,8 +618,8 @@ LABEL563:
iload 15
iload 15
get_varbit 4179
- iadd
- load_int 9
+ add
+ iconst 9
iload 3
iload 4
iload 10
@@ -634,78 +634,78 @@ LABEL563:
istore 23
iload 22
iload 21
- iadd
+ add
istore 22
iload 15
get_varbit 4179
- iadd
+ add
istore 15
LABEL593:
invoke 514
- load_int 1
+ iconst 1
if_icmpeq LABEL597
jump LABEL638
LABEL597:
- 049 359 ; Skip truncating of varcstr 22 by not calling 280
- tolowercase ; instead get the var directly and lowercase it
+ get_varc_string 359 ; Skip truncating of varcstr 22 by not calling 280
+ lowercase ; instead get the var directly and lowercase it
sstore 0
sload 0
string_length
- load_int 0
+ iconst 0
if_icmpgt LABEL604
jump LABEL623
LABEL604:
- load_string "Showing items: "
- load_string ""
+ sconst "Showing items: "
+ sconst ""
sload 0
- load_string ""
- string_append 4
+ sconst ""
+ join_string 4
iload 6
- widget_put_text_widget
- get_varc 5
- load_int 11
+ if_settext
+ get_varc_int 5
+ iconst 11
if_icmpeq LABEL615
jump LABEL622
LABEL615:
- load_string "Show items whose names contain the following text: ("
+ sconst "Show items whose names contain the following text: ("
iload 22
- int_to_string
- load_string " found)"
- string_append 3
+ tostring
+ sconst " found)"
+ join_string 3
iload 21 ; load number of matches
- load_string "setSearchBankInputTextFound" ; load event name
+ sconst "setSearchBankInputTextFound" ; load event name
runelite_callback ; invoke callback
pop_int ; pop number of matches
- load_int 10616876
- widget_put_text_widget
+ iconst 10616876
+ if_settext
LABEL622:
jump LABEL637
LABEL623:
- load_string "Showing items: "
- load_string ""
- load_string "*"
- load_string ""
- string_append 4
+ sconst "Showing items: "
+ sconst ""
+ sconst "*"
+ sconst ""
+ join_string 4
iload 6
- widget_put_text_widget
- get_varc 5
- load_int 11
+ if_settext
+ get_varc_int 5
+ iconst 11
if_icmpeq LABEL634
jump LABEL637
LABEL634:
- load_string "Show items whose names contain the following text:"
- load_string "setSearchBankInputText" ; load event name
+ sconst "Show items whose names contain the following text:"
+ sconst "setSearchBankInputText" ; load event name
runelite_callback ; invoke callback
- load_int 10616876
- widget_put_text_widget
+ iconst 10616876
+ if_settext
LABEL637:
jump LABEL641
LABEL638:
- load_string "The Bank of Gielinor"
- load_string "setBankTitle" ;
- runelite_callback ;
+ sconst "The Bank of Gielinor"
+ sconst "setBankTitle" ;
+ runelite_callback ;
iload 6
- widget_put_text_widget
+ if_settext
LABEL641:
iload 0
iload 1
@@ -726,51 +726,51 @@ LABEL641:
return
LABEL658:
invoke 514
- load_int 1
+ iconst 1
if_icmpeq LABEL662
jump LABEL665
LABEL662:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
LABEL665:
- load_int -1
+ iconst -1
istore 27
- load_int -1
+ iconst -1
istore 28
get_varbit 4150
invoke 513
istore 28
istore 27
- load_int 0
+ iconst 0
istore 29
- load_int 0
+ iconst 0
istore 30
LABEL677:
iload 15
- load_int 816
+ iconst 816
if_icmplt LABEL681
jump LABEL761
LABEL681:
iload 3
iload 15
- widget_load_child
- load_int 1
+ cc_find
+ iconst 1
if_icmpeq LABEL687
jump LABEL756
LABEL687:
- load_int 95
+ iconst 95
iload 15
- get_itemcontainer_itemid
+ inv_getobj
istore 20
iload 20
- load_int -1
+ iconst -1
if_icmpne LABEL695
jump LABEL699
LABEL695:
iload 24
- load_int 1
- iadd
+ iconst 1
+ add
istore 24
LABEL699:
iload 15
@@ -783,12 +783,12 @@ LABEL703:
if_icmplt LABEL707
jump LABEL754
LABEL707:
- load_int 0
- widget_put_hidden
+ iconst 0
+ cc_sethide
iload 20
- load_int 95
+ iconst 95
iload 15
- get_itemcontainer_stacksize
+ inv_getnum
iload 3
iload 4
iload 10
@@ -796,23 +796,23 @@ LABEL707:
iload 12
invoke 278
iload 30
- load_int 36
- imul
+ iconst 36
+ multiply
istore 23
- load_int 51
+ iconst 51
iload 29
- load_int 36
+ iconst 36
iload 19
- iadd
- imul
- iadd
+ add
+ multiply
+ add
iload 23
- load_int 0
- load_int 0
- widget_put_position
+ iconst 0
+ iconst 0
+ cc_setposition
iload 23
- load_int 32
- iadd
+ iconst 32
+ add
istore 23
iload 29
iload 17
@@ -820,55 +820,55 @@ LABEL707:
jump LABEL747
LABEL742:
iload 29
- load_int 1
- iadd
+ iconst 1
+ add
istore 29
jump LABEL753
LABEL747:
- load_int 0
+ iconst 0
iload 30
- load_int 1
- iadd
+ iconst 1
+ add
istore 30
istore 29
LABEL753:
jump LABEL756
LABEL754:
- load_int 1
- widget_put_hidden
+ iconst 1
+ cc_sethide
LABEL756:
iload 15
- load_int 1
- iadd
+ iconst 1
+ add
istore 15
jump LABEL677
LABEL761:
get_varbit 4170
- load_int 2
+ iconst 2
if_icmpeq LABEL765
jump LABEL775
LABEL765:
- load_string "Tab "
- load_int 105
- load_int 115
- load_int 207
+ sconst "Tab "
+ iconst 105
+ iconst 115
+ iconst 207
get_varbit 4150
- get_enum_value
- string_append 2
- load_string "setBankTitle" ;
- runelite_callback ;
+ enum
+ join_string 2
+ sconst "setBankTitle" ;
+ runelite_callback ;
iload 6
- widget_put_text_widget
+ if_settext
jump LABEL781
LABEL775:
- load_string "Tab "
+ sconst "Tab "
get_varbit 4150
- int_to_string
- string_append 2
- load_string "setBankTitle" ;
- runelite_callback ;
+ tostring
+ join_string 2
+ sconst "setBankTitle" ;
+ runelite_callback ;
iload 6
- widget_put_text_widget
+ if_settext
LABEL781:
iload 0
iload 1
diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm
index 2e0b41bec1..ccc78a7195 100644
--- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm
@@ -3,175 +3,175 @@
.string_stack_count 0
.int_var_count 15
.string_var_count 13
- load_int 10616890
- widget_get_width_widget
+ iconst 10616890
+ if_getwidth
istore 1
- get_localplayer_name
- string_remove_html
+ chat_playername
+ removetags
sstore 0
- load_int 0
+ iconst 0
istore 2
- get_varc 41
- load_int 3
+ get_varc_int 41
+ iconst 3
if_icmpeq LABEL12
jump LABEL14
LABEL12:
- load_int 1
+ iconst 1
istore 2
LABEL14:
- load_int 0
+ iconst 0
istore 3
- load_int 0
+ iconst 0
istore 4
- load_string ""
+ sconst ""
sstore 1
- load_string ""
+ sconst ""
sstore 2
- load_string ""
+ sconst ""
sstore 3
- load_string ""
+ sconst ""
sstore 4
- load_string ""
+ sconst ""
sstore 5
- load_string ""
+ sconst ""
sstore 6
- load_string ""
+ sconst ""
sstore 7
- load_string ""
+ sconst ""
sstore 8
invoke 921
- load_int 1
+ iconst 1
if_icmpeq LABEL38
jump LABEL58
LABEL38:
- load_int 16777215
- load_int 1
+ iconst 16777215
+ iconst 1
istore 4
istore 3
- load_string ""
- load_string ""
- load_string ""
- load_string ""
+ sconst ""
+ sconst ""
+ sconst ""
+ sconst ""
sstore 4
sstore 3
sstore 2
sstore 1
- load_string ""
- load_string ""
- load_string ""
- load_string ""
+ sconst ""
+ sconst ""
+ sconst ""
+ sconst ""
sstore 8
sstore 7
sstore 6
sstore 5
LABEL58:
- load_int 0
+ iconst 0
istore 5
- load_int 0
+ iconst 0
istore 6
- load_int 0
+ iconst 0
istore 7
- load_int 105
- load_int 73
- load_int 579
+ iconst 105
+ iconst 73
+ iconst 579
iload 7
- get_enum_value
+ enum
istore 8
- get_varc 41
- load_int 0
+ get_varc_int 41
+ iconst 0
if_icmpeq LABEL77
- get_varc 41
- load_int 2
+ get_varc_int 41
+ iconst 2
if_icmpeq LABEL77
jump LABEL133
LABEL77:
- 5022
+ chat_getmessagefilter
string_length
- load_int 0
+ iconst 0
if_icmpgt LABEL82
jump LABEL133
LABEL82:
sload 1
- load_string "Public chat filtering:"
- load_string ""
- load_string " "
- load_string ""
- 5022
- appendtags
- tolowercase
- load_string ""
- string_append 7
+ sconst "Public chat filtering:"
+ sconst ""
+ sconst " "
+ sconst ""
+ chat_getmessagefilter
+ escape
+ lowercase
+ sconst ""
+ join_string 7
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 199
istore 6
iload 8
- widget_put_actions_null_widget
- load_int -1
- load_string ""
+ if_clearops
+ iconst -1
+ sconst ""
iload 8
- widget_put_option_click_listener_widget
- load_int -1
- load_string ""
+ if_setonop
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_exit_listener_widget
+ if_setonmouseleave
iload 5
iload 6
- isub
+ sub
istore 5
iload 7
- load_int 1
- iadd
+ iconst 1
+ add
istore 7
- load_int 105
- load_int 73
- load_int 579
+ iconst 105
+ iconst 73
+ iconst 579
iload 7
- get_enum_value
+ enum
istore 8
LABEL133:
iload 0
istore 9
- load_int 0
+ iconst 0
istore 10
- load_int -1
+ iconst -1
istore 11
- load_string ""
+ sconst ""
sstore 9
- load_string ""
+ sconst ""
sstore 10
- load_string ""
+ sconst ""
sstore 11
- load_string ""
+ sconst ""
sstore 12
- load_int 0
+ iconst 0
istore 12
LABEL149:
iload 9
- load_int -1
+ iconst -1
if_icmpne LABEL153
jump LABEL645
LABEL153:
iload 8
- load_int -1
+ iconst -1
if_icmpne LABEL157
jump LABEL645
LABEL157:
iload 9
- get_chat_message
+ chat_gethistory_byuid
istore 12
sstore 11
sstore 10
@@ -182,7 +182,7 @@ LABEL157:
sload 9
iload 12
invoke 193
- load_int 1
+ iconst 1
if_icmpeq LABEL172
jump LABEL641
LABEL172:
@@ -194,7 +194,7 @@ LABEL172:
sload 0
iload 12
invoke 90
- load_int 1
+ iconst 1
if_icmpeq LABEL183
jump LABEL641
LABEL183:
@@ -217,26 +217,26 @@ LABEL183:
jump LABEL426
LABEL186:
iload 9 ; The id of the messageNode of the message being built
- load_string ""
- load_string "addTimestamp"
- runelite_callback
- pop_int
+ sconst ""
+ sconst "addTimestamp"
+ runelite_callback
+ pop_int
sload 9
- load_string ":"
- string_append 3 ; We need to append an extra string since we added the timestamp
+ sconst ":"
+ join_string 3 ; We need to append an extra string since we added the timestamp
sload 1
sload 11
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 203
@@ -244,26 +244,26 @@ LABEL186:
jump LABEL440
LABEL207:
iload 9 ; The id of the messageNode of the message being built
- load_string ""
- load_string "addTimestamp"
- runelite_callback
- pop_int
+ sconst ""
+ sconst "addTimestamp"
+ runelite_callback
+ pop_int
sload 9
- load_string ":"
- string_append 3 ; We need to append an extra string since we added the timestamp
+ sconst ":"
+ join_string 3 ; We need to append an extra string since we added the timestamp
sload 3
sload 11
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 203
@@ -271,29 +271,29 @@ LABEL207:
jump LABEL440
LABEL228:
iload 9 ; The id of the messageNode of the message being built
- load_string ""
- load_string "addTimestamp"
- runelite_callback
- pop_int
- load_string "From "
+ sconst ""
+ sconst "addTimestamp"
+ runelite_callback
+ pop_int
+ sconst "From "
sload 9
- load_string ":"
- load_string "privateChatFrom"
- runelite_callback
- string_append 4 ; We need to append an extra string since we added the timestamp
+ sconst ":"
+ sconst "privateChatFrom"
+ runelite_callback
+ join_string 4 ; We need to append an extra string since we added the timestamp
sload 2
sload 11
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 203
@@ -301,23 +301,23 @@ LABEL228:
jump LABEL440
LABEL250:
iload 9 ; The id of the messageNode of the message being built
- load_string ""
- load_string "addTimestamp"
- runelite_callback
- pop_int
+ sconst ""
+ sconst "addTimestamp"
+ runelite_callback
+ pop_int
sload 7
sload 11
- load_string ""
- string_append 4 ; We need to append an extra string since we added the timestamp
+ sconst ""
+ join_string 4 ; We need to append an extra string since we added the timestamp
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 199
@@ -325,70 +325,70 @@ LABEL250:
jump LABEL440
LABEL268:
iload 9 ; The id of the messageNode of the message being built
- load_string ""
- load_string "addTimestamp"
- runelite_callback
- pop_int
+ sconst ""
+ sconst "addTimestamp"
+ runelite_callback
+ pop_int
sload 2
sload 11
- load_string ""
- string_append 4 ; We need to append an extra string since we added the timestamp
+ sconst ""
+ join_string 4 ; We need to append an extra string since we added the timestamp
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 199
istore 6
get_varbit 1627
- load_int 0
+ iconst 0
if_icmpeq LABEL289
jump LABEL300
LABEL289:
iload 11
- load_int 500
- iadd
- load_int 1
- iadd
- put_varc 65
- load_int 664
- load_int 0
- load_string "1"
- load_int 10616832
- widget_put_render_listener_widget
+ iconst 500
+ add
+ iconst 1
+ add
+ set_varc_int 65
+ iconst 664
+ iconst 0
+ sconst "1"
+ iconst 10616832
+ if_setontimer
LABEL300:
jump LABEL440
LABEL301:
iload 9 ; The id of the messageNode of the message being built
- load_string ""
- load_string "addTimestamp"
- runelite_callback
- pop_int
- load_string "To "
+ sconst ""
+ sconst "addTimestamp"
+ runelite_callback
+ pop_int
+ sconst "To "
sload 9
- load_string ":"
- load_string "privateChatTo"
- runelite_callback
- string_append 4 ; We need to append an extra string since we added the timestamp
+ sconst ":"
+ sconst "privateChatTo"
+ runelite_callback
+ join_string 4 ; We need to append an extra string since we added the timestamp
sload 2
sload 11
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 203
@@ -396,23 +396,23 @@ LABEL301:
jump LABEL440
LABEL323:
iload 9 ; The id of the messageNode of the message being built
- load_string ""
- load_string "addTimestamp"
- runelite_callback
- pop_int
+ sconst ""
+ sconst "addTimestamp"
+ runelite_callback
+ pop_int
sload 8
sload 11
- load_string ""
- string_append 4 ; We need to append an extra string since we added the timestamp
+ sconst ""
+ join_string 4 ; We need to append an extra string since we added the timestamp
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 199
@@ -420,31 +420,31 @@ LABEL323:
jump LABEL440
LABEL341:
iload 9 ; The id of the messageNode of the message being built
- load_string ""
- load_string "addTimestamp"
- runelite_callback
- pop_int
- load_string "["
+ sconst ""
+ sconst "addTimestamp"
+ runelite_callback
+ pop_int
+ sconst "["
sload 5
sload 10
- load_string ""
- load_string "]Â "
+ sconst ""
+ sconst "]Â "
sload 9
- load_string ":"
- string_append 8 ; We need to append an extra string since we added the timestamp
+ sconst ":"
+ join_string 8 ; We need to append an extra string since we added the timestamp
sload 6
sload 11
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 203
@@ -456,42 +456,42 @@ LABEL367:
sstore 12
sstore 11
sload 4
- load_string "Broadcast:"
- load_string ""
- string_append 3
+ sconst "Broadcast:"
+ sconst ""
+ join_string 3
sload 11
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 203
istore 6
jump LABEL440
LABEL390:
- get_gamecycle
+ clientclock
iload 11
- isub
- load_int 500
+ sub
+ iconst 500
if_icmpgt LABEL396
jump LABEL411
LABEL396:
- load_string "jk :P"
+ sconst "jk :P"
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 199
@@ -501,13 +501,13 @@ LABEL411:
sload 11
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 199
@@ -518,20 +518,20 @@ LABEL426:
sload 11
iload 7
iload 8
- load_int 10616890
+ iconst 10616890
iload 1
- load_int 3
- load_int 14
+ iconst 3
+ iconst 14
iload 5
- load_int 0
- load_int 103
+ iconst 0
+ iconst 103
iload 3
iload 4
invoke 199
istore 6
LABEL440:
iload 8
- widget_put_actions_null_widget
+ if_clearops
iload 10
switch
1: LABEL445
@@ -549,221 +549,221 @@ LABEL440:
91: LABEL445
jump LABEL615
LABEL445:
- load_string ""
+ sconst ""
sload 9
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 8
- widget_put_name_widget
- load_int 86
- load_int -2147483644
- load_string "event_opbase"
- load_string "is"
+ if_setopbase
+ iconst 86
+ iconst -2147483644
+ sconst "event_opbase"
+ sconst "is"
iload 8
- widget_put_option_click_listener_widget
- load_int -1
- load_string ""
+ if_setonop
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_exit_listener_widget
+ if_setonmouseleave
sload 0
sload 9
- string_remove_html
- string_compare
- load_int 0
+ removetags
+ compare
+ iconst 0
if_icmpne LABEL472
jump LABEL509
LABEL472:
iload 12
- load_int 1
+ iconst 1
if_icmpeq LABEL476
jump LABEL481
LABEL476:
- load_int 6
- load_string "Message"
+ iconst 6
+ sconst "Message"
iload 8
- widget_put_action_widget
+ if_setop
jump LABEL489
LABEL481:
- load_int 6
- load_string "Add friend"
+ iconst 6
+ sconst "Add friend"
iload 8
- widget_put_action_widget
- load_int 7
- load_string "Add ignore"
+ if_setop
+ iconst 7
+ sconst "Add ignore"
iload 8
- widget_put_action_widget
+ if_setop
LABEL489:
- load_int 8
- load_string "Report"
+ iconst 8
+ sconst "Report"
iload 8
- widget_put_action_widget
+ if_setop
iload 10
- load_int 9
+ iconst 9
if_icmpeq LABEL497
jump LABEL509
LABEL497:
- get_clanchatcount
- load_int 0
+ clan_getchatcount
+ iconst 0
if_icmpgt LABEL501
jump LABEL509
LABEL501:
- get_clanchat_rank
- clanchat_kick_rank
+ clan_getchatrank
+ clan_getchatminkick
if_icmpge LABEL505
jump LABEL509
LABEL505:
- load_int 9
- load_string "Kick"
+ iconst 9
+ sconst "Kick"
iload 8
- widget_put_action_widget
+ if_setop
LABEL509:
jump LABEL627
LABEL510:
- load_string ""
+ sconst ""
sload 9
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 8
- widget_put_name_widget
- load_int 86
- load_int -2147483644
- load_string "event_opbase"
- load_string "is"
+ if_setopbase
+ iconst 86
+ iconst -2147483644
+ sconst "event_opbase"
+ sconst "is"
iload 8
- widget_put_option_click_listener_widget
- load_int -1
- load_string ""
+ if_setonop
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_exit_listener_widget
- load_int 1
- load_string "Accept trade"
+ if_setonmouseleave
+ iconst 1
+ sconst "Accept trade"
iload 8
- widget_put_action_widget
+ if_setop
jump LABEL627
LABEL535:
- load_string ""
+ sconst ""
sload 9
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 8
- widget_put_name_widget
- load_int 86
- load_int -2147483644
- load_string "event_opbase"
- load_string "is"
+ if_setopbase
+ iconst 86
+ iconst -2147483644
+ sconst "event_opbase"
+ sconst "is"
iload 8
- widget_put_option_click_listener_widget
- load_int -1
- load_string ""
+ if_setonop
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_exit_listener_widget
- load_int 2
- load_string "Accept challenge"
+ if_setonmouseleave
+ iconst 2
+ sconst "Accept challenge"
iload 8
- widget_put_action_widget
+ if_setop
jump LABEL627
LABEL560:
sload 12
string_length
- load_int 0
+ iconst 0
if_icmpgt LABEL565
jump LABEL590
LABEL565:
- load_int 6
- load_string "Open"
+ iconst 6
+ sconst "Open"
iload 8
- widget_put_action_widget
- load_int 7
- load_string "Check"
+ if_setop
+ iconst 7
+ sconst "Check"
iload 8
- widget_put_action_widget
- load_int 2065
+ if_setop
+ iconst 2065
iload 8
- widget_get_parentid_widget
+ if_getlayer
iload 7
- load_int 3158271
- load_string "Iii"
+ iconst 3158271
+ sconst "Iii"
iload 8
- widget_put_mouse_hover_listener_widget
- load_int 2065
+ if_setonmouserepeat
+ iconst 2065
iload 8
- widget_get_parentid_widget
+ if_getlayer
iload 7
iload 3
- load_string "Iii"
+ sconst "Iii"
iload 8
- widget_put_mouse_exit_listener_widget
+ if_setonmouseleave
jump LABEL598
LABEL590:
- load_int -1
- load_string ""
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_exit_listener_widget
+ if_setonmouseleave
LABEL598:
- load_int 9
- load_string "Clear history"
+ iconst 9
+ sconst "Clear history"
iload 8
- widget_put_action_widget
- load_string ""
- load_string "Notification"
- load_string ""
- string_append 3
+ if_setop
+ sconst ""
+ sconst "Notification"
+ sconst ""
+ join_string 3
iload 8
- widget_put_name_widget
- load_int 2064
- load_int -2147483644
+ if_setopbase
+ iconst 2064
+ iconst -2147483644
sload 12
- load_string "is"
+ sconst "is"
iload 8
- widget_put_option_click_listener_widget
+ if_setonop
jump LABEL627
LABEL615:
- load_int -1
- load_string ""
+ iconst -1
+ sconst ""
iload 8
- widget_put_option_click_listener_widget
- load_int -1
- load_string ""
+ if_setonop
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_exit_listener_widget
+ if_setonmouseleave
LABEL627:
iload 5
iload 6
- isub
+ sub
istore 5
iload 7
- load_int 1
- iadd
+ iconst 1
+ add
istore 7
- load_int 105
- load_int 73
- load_int 579
+ iconst 105
+ iconst 73
+ iconst 579
iload 7
- get_enum_value
+ enum
istore 8
LABEL641:
iload 9
- get_messagenode_next_id
+ chat_getprevuid
istore 9
jump LABEL149
LABEL645:
@@ -771,82 +771,82 @@ LABEL645:
istore 13
LABEL647:
iload 8
- load_int -1
+ iconst -1
if_icmpne LABEL651
jump LABEL708
LABEL651:
iload 8
- widget_put_actions_null_widget
- load_int -1
- load_string ""
+ if_clearops
+ iconst -1
+ sconst ""
iload 8
- widget_put_option_click_listener_widget
- load_int -1
- load_string ""
+ if_setonop
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 8
- widget_put_mouse_exit_listener_widget
- load_int 0
- load_int 0
- load_int 0
- load_int 0
+ if_setonmouseleave
+ iconst 0
+ iconst 0
+ iconst 0
+ iconst 0
iload 8
- widget_put_size_widget
- load_int 10616890
+ if_setsize
+ iconst 10616890
iload 7
- load_int 2
- imul
- widget_load_child
- load_int 1
+ iconst 2
+ multiply
+ cc_find
+ iconst 1
if_icmpeq LABEL679
jump LABEL683
LABEL679:
- load_string ""
- widget_put_text
- load_int 1
- widget_put_hidden
+ sconst ""
+ cc_settext
+ iconst 1
+ cc_sethide
LABEL683:
- load_int 10616890
+ iconst 10616890
iload 7
- load_int 2
- imul
- load_int 1
- iadd
- widget_load_child
- load_int 1
+ iconst 2
+ multiply
+ iconst 1
+ add
+ cc_find
+ iconst 1
if_icmpeq LABEL693
jump LABEL697
LABEL693:
- load_string ""
- widget_put_text
- load_int 1
- widget_put_hidden
+ sconst ""
+ cc_settext
+ iconst 1
+ cc_sethide
LABEL697:
iload 7
- load_int 1
- iadd
+ iconst 1
+ add
istore 7
- load_int 105
- load_int 73
- load_int 579
+ iconst 105
+ iconst 73
+ iconst 579
iload 7
- get_enum_value
+ enum
istore 8
jump LABEL647
LABEL708:
iload 5
- load_int 2
- isub
+ iconst 2
+ sub
istore 5
- load_int 0
+ iconst 0
iload 5
- isub
+ sub
istore 5
- load_int 10616890
- widget_get_height_widget
+ iconst 10616890
+ if_getheight
istore 14
iload 5
iload 14
@@ -860,83 +860,83 @@ LABEL725:
istore 7
LABEL727:
iload 7
- load_int 0
+ iconst 0
if_icmpgt LABEL731
jump LABEL784
LABEL731:
iload 7
- load_int 1
- isub
+ iconst 1
+ sub
istore 7
- load_int 105
- load_int 73
- load_int 579
+ iconst 105
+ iconst 73
+ iconst 579
iload 7
- get_enum_value
+ enum
istore 8
iload 8
- widget_get_relativey_widget
+ if_gety
iload 14
- iadd
- load_int 2
- isub
+ add
+ iconst 2
+ sub
istore 5
iload 8
- widget_get_relativex_widget
+ if_getx
iload 5
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
iload 8
- widget_put_position_widget
- load_int 10616890
+ if_setposition
+ iconst 10616890
iload 7
- load_int 2
- imul
- widget_load_child
- load_int 1
+ iconst 2
+ multiply
+ cc_find
+ iconst 1
if_icmpeq LABEL763
jump LABEL768
LABEL763:
- widget_get_relativex
+ cc_getx
iload 5
- load_int 0
- load_int 0
- widget_put_position
+ iconst 0
+ iconst 0
+ cc_setposition
LABEL768:
- load_int 10616890
+ iconst 10616890
iload 7
- load_int 2
- imul
- load_int 1
- iadd
- widget_load_child
- load_int 1
+ iconst 2
+ multiply
+ iconst 1
+ add
+ cc_find
+ iconst 1
if_icmpeq LABEL778
jump LABEL783
LABEL778:
- widget_get_relativex
+ cc_getx
iload 5
- load_int 0
- load_int 0
- widget_put_position
+ iconst 0
+ iconst 0
+ cc_setposition
LABEL783:
jump LABEL727
LABEL784:
- load_int 0
+ iconst 0
iload 14
- load_int 10616890
- widget_put_scrollwidthheight_widget
- load_int 10617391
- load_int 10616890
- get_varc 7
+ iconst 10616890
+ if_setscrollsize
+ iconst 10617391
+ iconst 10616890
+ get_varc_int 7
iload 14
- get_varc 8
- isub
- iadd
+ get_varc_int 8
+ sub
+ add
invoke 72
- load_int 10616890
- widget_get_scrolly_widget
+ iconst 10616890
+ if_getscrolly
iload 14
- put_varc 8
- put_varc 7
+ set_varc_int 8
+ set_varc_int 7
return
diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
index 39fa1e7b3c..8c48e849dd 100644
--- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
@@ -3,207 +3,207 @@
.string_stack_count 0
.int_var_count 16
.string_var_count 4
- load_int 0
+ iconst 0
istore 1
- load_int 2
+ iconst 2
istore 2
- load_int 103
+ iconst 103
istore 3
- load_int 4
+ iconst 4
istore 4
- load_int 23
+ iconst 23
istore 5
invoke 900
istore 6
- load_int 103
- load_int 105
- load_int 1136
+ iconst 103
+ iconst 105
+ iconst 1136
iload 6
- get_enum_value
- load_int 0
+ enum
+ iconst 0
if_icmpgt LABEL20
jump LABEL58
LABEL20:
iload 6
- load_int 1745
+ iconst 1745
if_icmpeq LABEL24
jump LABEL36
LABEL24:
- load_int 0
- load_int 102
- load_int 103
- load_int 105
- load_int 1960
+ iconst 0
+ iconst 102
+ iconst 103
+ iconst 105
+ iconst 1960
iload 6
- get_enum_value
- load_int 30
+ enum
+ iconst 30
istore 5
istore 1
istore 3
istore 2
LABEL36:
- get_varc 41
- load_int -1
+ get_varc_int 41
+ iconst -1
if_icmpeq LABEL40
jump LABEL49
LABEL40:
invoke 922
- load_int 1
+ iconst 1
if_icmpeq LABEL44
jump LABEL49
LABEL44:
iload 4
iload 5
- iadd
+ add
istore 4
jump LABEL58
LABEL49:
iload 4
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 6
- load_int 10551325
- get_enum_value
- widget_get_height_widget
- iadd
+ iconst 10551325
+ enum
+ if_getheight
+ add
istore 4
LABEL58:
iload 4
istore 7
- load_int 10682368
- widget_get_width_widget
+ iconst 10682368
+ if_getwidth
istore 8
- load_int 0
+ iconst 0
istore 9
- load_int 105
- load_int 73
- load_int 580
+ iconst 105
+ iconst 73
+ iconst 580
iload 9
- get_enum_value
+ enum
istore 10
- load_int 0
+ iconst 0
istore 11
- load_string ""
+ sconst ""
sstore 0
- get_system_update_timer
- load_int 0
+ reboottimer
+ iconst 0
if_icmpgt LABEL79
jump LABEL156
LABEL79:
- get_system_update_timer
- load_int 50
- idiv
- load_int 60
- modulo
+ reboottimer
+ iconst 50
+ div
+ iconst 60
+ mod
istore 11
iload 11
- load_int 10
+ iconst 10
if_icmplt LABEL89
jump LABEL100
LABEL89:
- load_string "System update in: "
- get_system_update_timer
- load_int 3000
- idiv
- int_to_string
- load_string ":0"
+ sconst "System update in: "
+ reboottimer
+ iconst 3000
+ div
+ tostring
+ sconst ":0"
iload 11
- int_to_string
- string_append 4
+ tostring
+ join_string 4
sstore 0
jump LABEL110
LABEL100:
- load_string "System update in: "
- get_system_update_timer
- load_int 3000
- idiv
- int_to_string
- load_string ":"
+ sconst "System update in: "
+ reboottimer
+ iconst 3000
+ div
+ tostring
+ sconst ":"
iload 11
- int_to_string
- string_append 4
+ tostring
+ join_string 4
sstore 0
LABEL110:
iload 7
sload 0
iload 9
iload 10
- load_int 10682368
+ iconst 10682368
iload 8
iload 1
- load_int 13
+ iconst 13
iload 7
iload 2
iload 3
- load_int 16776960
- load_int 1
+ iconst 16776960
+ iconst 1
invoke 199
- iadd
+ add
istore 7
iload 10
- widget_put_actions_null_widget
- load_int -1
- load_string ""
+ if_clearops
+ iconst -1
+ sconst ""
iload 10
- widget_put_option_click_listener_widget
- load_int -1
- load_string ""
+ if_setonop
+ iconst -1
+ sconst ""
iload 10
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 10
- widget_put_mouse_exit_listener_widget
- load_int 0
- load_int 0
- load_int 0
- load_int 0
+ if_setonmouseleave
+ iconst 0
+ iconst 0
+ iconst 0
+ iconst 0
iload 10
- widget_put_size_widget
+ if_setsize
iload 9
- load_int 1
- iadd
+ iconst 1
+ add
istore 9
- load_int 105
- load_int 73
- load_int 580
+ iconst 105
+ iconst 73
+ iconst 580
iload 9
- get_enum_value
+ enum
istore 10
LABEL156:
- load_int -1
+ iconst -1
istore 12
- load_int -1
+ iconst -1
istore 13
- load_string ""
+ sconst ""
sstore 1
- load_int 0
+ iconst 0
istore 14
- load_string ""
+ sconst ""
sstore 2
- load_string ""
+ sconst ""
sstore 3
- get_varc 55
- get_varc 202
+ get_varc_int 55
+ get_varc_int 202
if_icmpge LABEL172
jump LABEL282
LABEL172:
- get_varc 55
- get_gamecycle
- load_int 3000
- isub
+ get_varc_int 55
+ clientclock
+ iconst 3000
+ sub
if_icmpgt LABEL178
jump LABEL282
LABEL178:
- load_int 14
- get_chatlinebuffer_length
- load_int 0
+ iconst 14
+ chat_gethistorylength
+ iconst 0
if_icmpgt LABEL183
jump LABEL282
LABEL183:
- load_int 14
- load_int 0
- get_chat_message_type
+ iconst 14
+ iconst 0
+ chat_gethistory_bytypeandline
istore 14
sstore 0
sstore 2
@@ -211,7 +211,7 @@ LABEL183:
istore 13
istore 12
iload 12
- load_int -1
+ iconst -1
if_icmpne LABEL196
jump LABEL282
LABEL196:
@@ -223,124 +223,124 @@ LABEL196:
sload 0
iload 9
iload 10
- load_int 10682368
+ iconst 10682368
iload 8
iload 1
- load_int 13
+ iconst 13
iload 7
iload 2
iload 3
- load_int 16776960
- load_int 1
+ iconst 16776960
+ iconst 1
invoke 199
- iadd
+ add
istore 7
iload 10
- widget_put_actions_null_widget
+ if_clearops
sload 3
string_length
- load_int 0
+ iconst 0
if_icmpgt LABEL223
jump LABEL248
LABEL223:
- load_int 6
- load_string "Open"
+ iconst 6
+ sconst "Open"
iload 10
- widget_put_action_widget
- load_int 7
- load_string "Check"
+ if_setop
+ iconst 7
+ sconst "Check"
iload 10
- widget_put_action_widget
- load_int 2065
+ if_setop
+ iconst 2065
iload 10
- widget_get_parentid_widget
+ if_getlayer
iload 9
- load_int 16777215
- load_string "Iii"
+ iconst 16777215
+ sconst "Iii"
iload 10
- widget_put_mouse_hover_listener_widget
- load_int 2065
+ if_setonmouserepeat
+ iconst 2065
iload 10
- widget_get_parentid_widget
+ if_getlayer
iload 9
- load_int 16776960
- load_string "Iii"
+ iconst 16776960
+ sconst "Iii"
iload 10
- widget_put_mouse_exit_listener_widget
+ if_setonmouseleave
jump LABEL256
LABEL248:
- load_int -1
- load_string ""
+ iconst -1
+ sconst ""
iload 10
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 10
- widget_put_mouse_exit_listener_widget
+ if_setonmouseleave
LABEL256:
- load_int 9
- load_string "Clear history"
+ iconst 9
+ sconst "Clear history"
iload 10
- widget_put_action_widget
- load_string ""
- load_string "Notification"
- load_string ""
- string_append 3
+ if_setop
+ sconst ""
+ sconst "Notification"
+ sconst ""
+ join_string 3
iload 10
- widget_put_name_widget
- load_int 2064
- load_int -2147483644
+ if_setopbase
+ iconst 2064
+ iconst -2147483644
sload 3
- load_string "is"
+ sconst "is"
iload 10
- widget_put_option_click_listener_widget
+ if_setonop
iload 9
- load_int 1
- iadd
+ iconst 1
+ add
istore 9
- load_int 105
- load_int 73
- load_int 580
+ iconst 105
+ iconst 73
+ iconst 580
iload 9
- get_enum_value
+ enum
istore 10
LABEL282:
iload 0
istore 12
- load_int 0
+ iconst 0
istore 15
get_varp 287
- load_int 1
+ iconst 1
if_icmpeq LABEL290
jump LABEL479
LABEL290:
- get_varc 41
- load_int -1
+ get_varc_int 41
+ iconst -1
if_icmpne LABEL297
get_varbit 4089
- load_int 0
+ iconst 0
if_icmpeq LABEL297
jump LABEL479
LABEL297:
iload 12
- load_int -1
+ iconst -1
if_icmpne LABEL301
jump LABEL479
LABEL301:
iload 10
- load_int -1
+ iconst -1
if_icmpne LABEL305
jump LABEL479
LABEL305:
iload 7
iload 4
- isub
- load_int 57
+ sub
+ iconst 57
if_icmplt LABEL311
jump LABEL479
LABEL311:
iload 12
- get_chat_message
+ chat_gethistory_byuid
istore 14
sstore 0
sstore 2
@@ -352,7 +352,7 @@ LABEL311:
iload 13
iload 14
invoke 91
- load_int 1
+ iconst 1
if_icmpeq LABEL327
jump LABEL475
LABEL327:
@@ -364,50 +364,50 @@ LABEL327:
jump LABEL372
LABEL330:
iload 7
- load_string "From "
+ sconst "From "
sload 1
- load_string ":"
- load_string "privateChatSplitFrom"
- runelite_callback
- string_append 3
+ sconst ":"
+ sconst "privateChatSplitFrom"
+ runelite_callback
+ join_string 3
sload 0
iload 9
iload 10
- load_int 10682368
+ iconst 10682368
iload 8
iload 1
- load_int 13
+ iconst 13
iload 7
iload 2
iload 3
- load_int 65535
- load_int 1
+ iconst 65535
+ iconst 1
invoke 203
- iadd
+ add
istore 7
jump LABEL407
LABEL351:
iload 7
- load_string "To "
+ sconst "To "
sload 1
- load_string ":"
- load_string "privateChatSplitTo"
- runelite_callback
- string_append 3
+ sconst ":"
+ sconst "privateChatSplitTo"
+ runelite_callback
+ join_string 3
sload 0
iload 9
iload 10
- load_int 10682368
+ iconst 10682368
iload 8
iload 1
- load_int 13
+ iconst 13
iload 7
iload 2
iload 3
- load_int 65535
- load_int 1
+ iconst 65535
+ iconst 1
invoke 203
- iadd
+ add
istore 7
jump LABEL407
LABEL372:
@@ -415,184 +415,184 @@ LABEL372:
sload 0
iload 9
iload 10
- load_int 10682368
+ iconst 10682368
iload 8
iload 1
- load_int 13
+ iconst 13
iload 7
iload 2
iload 3
- load_int 65535
- load_int 1
+ iconst 65535
+ iconst 1
invoke 199
- iadd
+ add
istore 7
iload 15
- load_int 5
+ iconst 5
if_icmpeq LABEL392
jump LABEL407
LABEL392:
get_varbit 1627
- load_int 0
+ iconst 0
if_icmpeq LABEL396
jump LABEL407
LABEL396:
iload 13
- load_int 500
- iadd
- load_int 1
- iadd
- put_varc 65
- load_int 664
- load_int 0
- load_string "1"
- load_int 10616832
- widget_put_render_listener_widget
+ iconst 500
+ add
+ iconst 1
+ add
+ set_varc_int 65
+ iconst 664
+ iconst 0
+ sconst "1"
+ iconst 10616832
+ if_setontimer
LABEL407:
iload 10
- widget_put_actions_null_widget
+ if_clearops
iload 15
- load_int 3
+ iconst 3
if_icmpeq LABEL419
iload 15
- load_int 6
+ iconst 6
if_icmpeq LABEL419
iload 15
- load_int 7
+ iconst 7
if_icmpeq LABEL419
jump LABEL453
LABEL419:
iload 14
- load_int 1
+ iconst 1
if_icmpeq LABEL423
jump LABEL428
LABEL423:
- load_int 8
- load_string "Message"
+ iconst 8
+ sconst "Message"
iload 10
- widget_put_action_widget
+ if_setop
jump LABEL436
LABEL428:
- load_int 8
- load_string "Add friend"
+ iconst 8
+ sconst "Add friend"
iload 10
- widget_put_action_widget
- load_int 9
- load_string "Add ignore"
+ if_setop
+ iconst 9
+ sconst "Add ignore"
iload 10
- widget_put_action_widget
+ if_setop
LABEL436:
- load_int 10
- load_string "Report"
+ iconst 10
+ sconst "Report"
iload 10
- widget_put_action_widget
- load_string ""
+ if_setop
+ sconst ""
sload 1
- load_string ""
- string_append 3
+ sconst ""
+ join_string 3
iload 10
- widget_put_name_widget
- load_int 88
- load_int -2147483644
- load_string "event_opbase"
- load_string "is"
+ if_setopbase
+ iconst 88
+ iconst -2147483644
+ sconst "event_opbase"
+ sconst "is"
iload 10
- widget_put_option_click_listener_widget
+ if_setonop
jump LABEL457
LABEL453:
- load_int -1
- load_string ""
+ iconst -1
+ sconst ""
iload 10
- widget_put_option_click_listener_widget
+ if_setonop
LABEL457:
- load_int -1
- load_string ""
+ iconst -1
+ sconst ""
iload 10
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 10
- widget_put_mouse_exit_listener_widget
+ if_setonmouseleave
iload 9
- load_int 1
- iadd
+ iconst 1
+ add
istore 9
- load_int 105
- load_int 73
- load_int 580
+ iconst 105
+ iconst 73
+ iconst 580
iload 9
- get_enum_value
+ enum
istore 10
LABEL475:
iload 12
- get_messagenode_next_id
+ chat_getprevuid
istore 12
jump LABEL297
LABEL479:
iload 10
- load_int -1
+ iconst -1
if_icmpne LABEL483
jump LABEL540
LABEL483:
iload 10
- widget_put_actions_null_widget
- load_int -1
- load_string ""
+ if_clearops
+ iconst -1
+ sconst ""
iload 10
- widget_put_option_click_listener_widget
- load_int -1
- load_string ""
+ if_setonop
+ iconst -1
+ sconst ""
iload 10
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
iload 10
- widget_put_mouse_exit_listener_widget
- load_int 0
- load_int 0
- load_int 0
- load_int 0
+ if_setonmouseleave
+ iconst 0
+ iconst 0
+ iconst 0
+ iconst 0
iload 10
- widget_put_size_widget
- load_int 10682368
+ if_setsize
+ iconst 10682368
iload 9
- load_int 2
- imul
- widget_load_child
- load_int 1
+ iconst 2
+ multiply
+ cc_find
+ iconst 1
if_icmpeq LABEL511
jump LABEL515
LABEL511:
- load_string ""
- widget_put_text
- load_int 1
- widget_put_hidden
+ sconst ""
+ cc_settext
+ iconst 1
+ cc_sethide
LABEL515:
- load_int 10682368
+ iconst 10682368
iload 9
- load_int 2
- imul
- load_int 1
- iadd
- widget_load_child
- load_int 1
+ iconst 2
+ multiply
+ iconst 1
+ add
+ cc_find
+ iconst 1
if_icmpeq LABEL525
jump LABEL529
LABEL525:
- load_string ""
- widget_put_text
- load_int 1
- widget_put_hidden
+ sconst ""
+ cc_settext
+ iconst 1
+ cc_sethide
LABEL529:
iload 9
- load_int 1
- iadd
+ iconst 1
+ add
istore 9
- load_int 105
- load_int 73
- load_int 580
+ iconst 105
+ iconst 73
+ iconst 580
iload 9
- get_enum_value
+ enum
istore 10
jump LABEL479
LABEL540:
diff --git a/runelite-client/src/main/scripts/ChatboxInput.rs2asm b/runelite-client/src/main/scripts/ChatboxInput.rs2asm
index a9f0cf7f57..98567e8f1c 100644
--- a/runelite-client/src/main/scripts/ChatboxInput.rs2asm
+++ b/runelite-client/src/main/scripts/ChatboxInput.rs2asm
@@ -5,47 +5,47 @@
.string_var_count 1
sload 0 ; load input
iload 0 ; load chat type
- load_string "chatboxInput" ; event name
- runelite_callback ; invoke callback
- pop_int ; pop chat type
- string_length ; get string length of chat message
- load_int 0 ; load 0
+ sconst "chatboxInput" ; event name
+ runelite_callback ; invoke callback
+ pop_int ; pop chat type
+ string_length ; get string length of chat message
+ iconst 0 ; load 0
if_icmpne LABEL100 ; if length is not 0, continue
- return
+ return
LABEL100:
get_varbit 4394
- load_int 1
+ iconst 1
if_icmpeq LABEL4
jump LABEL24
LABEL4:
iload 0
- load_int 1
+ iconst 1
if_icmpeq LABEL8
jump LABEL16
LABEL8:
- get_localplayer_name
- load_string ": "
- load_string ""
+ chat_playername
+ sconst ": "
+ sconst ""
sload 0
- load_string ""
- string_append 5
- send_game_message
+ sconst ""
+ join_string 5
+ mes
jump LABEL23
LABEL16:
- get_localplayer_name
- load_string ": "
- load_string ""
+ chat_playername
+ sconst ": "
+ sconst ""
sload 0
- load_string ""
- string_append 5
- send_game_message
+ sconst ""
+ join_string 5
+ mes
LABEL23:
jump LABEL27
LABEL24:
sload 0
iload 0
- chatbox_input
+ chat_sendpublic
LABEL27:
- get_gamecycle
- put_varc 61
- return
+ clientclock
+ set_varc_int 61
+ return
diff --git a/runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm b/runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm
deleted file mode 100644
index 106f53218e..0000000000
--- a/runelite-client/src/main/scripts/ChatboxInputHandler.rs2asm
+++ /dev/null
@@ -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
diff --git a/runelite-client/src/main/scripts/ChatboxInputInit.rs2asm b/runelite-client/src/main/scripts/ChatboxInputInit.rs2asm
deleted file mode 100644
index a29faa76c6..0000000000
--- a/runelite-client/src/main/scripts/ChatboxInputInit.rs2asm
+++ /dev/null
@@ -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
diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm
index 63c13e7aee..7d608c5d0c 100644
--- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm
@@ -3,166 +3,166 @@
.string_stack_count 0
.int_var_count 4
.string_var_count 3
- load_string ""
+ sconst ""
sstore 0
- load_int 0
+ iconst 0
istore 0
- load_int 6250335
+ iconst 6250335
istore 1
invoke 921
- load_int 1
+ iconst 1
if_icmpeq LABEL10
jump LABEL20
LABEL10:
- load_string ""
- load_int 16777215
- load_int 12566463
+ sconst ""
+ iconst 16777215
+ iconst 12566463
istore 1
istore 0
sstore 0
- load_int 1
- load_int 10616889
- widget_put_text_shadowed_widget
+ iconst 1
+ iconst 10616889
+ if_settextshadow
jump LABEL23
LABEL20:
- load_int 0
- load_int 10616889
- widget_put_text_shadowed_widget
+ iconst 0
+ iconst 10616889
+ if_settextshadow
LABEL23:
iload 0
- load_int 10616889
- widget_put_textcolor_widget
- 049 335
+ iconst 10616889
+ if_setcolour
+ get_varc_string 335
string_length
istore 2
- 049 335
- appendtags
+ get_varc_string 335
+ escape
sstore 1
- load_string ""
+ sconst ""
sstore 2
- load_int 0
+ iconst 0
istore 3
get_varbit 8119
- load_int 1
+ iconst 1
if_icmpeq LABEL40
jump LABEL99
LABEL40:
- load_int 105
- load_int 115
- load_int 1894
+ iconst 105
+ iconst 115
+ iconst 1894
get_varbit 1777
- get_enum_value
- get_localplayer_name
- load_string ":Â "
+ enum
+ chat_playername
+ sconst ":Â "
sload 0
sload 1
- load_string ""
- string_append 6
+ sconst ""
+ join_string 6
sstore 2
iload 2
- load_int 80
+ iconst 80
if_icmplt LABEL56
jump LABEL63
LABEL56:
sload 2
sload 0
- load_string "*"
- load_string ""
- string_append 3
- concat_string
+ sconst "*"
+ sconst ""
+ join_string 3
+ append
sstore 2
LABEL63:
sload 2
- load_int 2147483647
- load_int 495
- get_max_line_width
+ iconst 2147483647
+ iconst 495
+ parawidth
istore 3
iload 3
- load_int 10616889
- widget_get_width_widget
+ iconst 10616889
+ if_getwidth
if_icmpgt LABEL73
jump LABEL79
LABEL73:
- load_int 2
- load_int 2
- load_int 0
- load_int 10616889
- widget_put_text_alignment_widget
+ iconst 2
+ iconst 2
+ iconst 0
+ iconst 10616889
+ if_settextalign
jump LABEL84
LABEL79:
- load_int 0
- load_int 2
- load_int 0
- load_int 10616889
- widget_put_text_alignment_widget
+ iconst 0
+ iconst 2
+ iconst 0
+ iconst 10616889
+ if_settextalign
LABEL84:
- load_int 10616889
- widget_put_actions_null_widget
- load_int -1
- load_string ""
- load_int 10616889
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
- load_int 10616889
- widget_put_mouse_exit_listener_widget
- load_int -1
- load_string ""
- load_int 10616889
- widget_put_option_click_listener_widget
+ iconst 10616889
+ if_clearops
+ iconst -1
+ sconst ""
+ iconst 10616889
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
+ iconst 10616889
+ if_setonmouseleave
+ iconst -1
+ sconst ""
+ iconst 10616889
+ if_setonop
jump LABEL140
LABEL99:
- load_int 105
- load_int 115
- load_int 1894
+ iconst 105
+ iconst 115
+ iconst 1894
get_varbit 1777
- get_enum_value
- load_string " You must set a name before you can chat."
- string_append 2
+ enum
+ sconst " You must set a name before you can chat."
+ join_string 2
sstore 2
- load_int 1
- load_int 2
- load_int 0
- load_int 10616889
- widget_put_text_alignment_widget
- load_int 10
- load_string "Configure"
- load_int 10616889
- widget_put_action_widget
- load_string ""
- load_string "Display name"
- load_string ""
- string_append 3
- load_int 10616889
- widget_put_name_widget
- load_int 45
- load_int -2147483645
+ iconst 1
+ iconst 2
+ iconst 0
+ iconst 10616889
+ if_settextalign
+ iconst 10
+ sconst "Configure"
+ iconst 10616889
+ if_setop
+ sconst ""
+ sconst "Display name"
+ sconst ""
+ join_string 3
+ iconst 10616889
+ if_setopbase
+ iconst 45
+ iconst -2147483645
iload 1
- load_string "Ii"
- load_int 10616889
- widget_put_mouse_hover_listener_widget
- load_int 45
- load_int -2147483645
+ sconst "Ii"
+ iconst 10616889
+ if_setonmouserepeat
+ iconst 45
+ iconst -2147483645
iload 0
- load_string "Ii"
- load_int 10616889
- widget_put_mouse_exit_listener_widget
- load_int 489
- load_int -2147483644
- load_int 1024
- load_string "ii"
- load_int 10616889
- widget_put_option_click_listener_widget
+ sconst "Ii"
+ iconst 10616889
+ if_setonmouseleave
+ iconst 489
+ iconst -2147483644
+ iconst 1024
+ sconst "ii"
+ iconst 10616889
+ if_setonop
LABEL140:
sload 2
- load_int 10616889
- widget_put_text_widget
- load_string "setChatboxInput"
+ iconst 10616889
+ if_settext
+ sconst "setChatboxInput"
runelite_callback
- load_int 3
- load_int 16
- load_int 1
- load_int 0
- load_int 10616889
- widget_put_size_widget
+ iconst 3
+ iconst 16
+ iconst 1
+ iconst 0
+ iconst 10616889
+ if_setsize
return
diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm
index eba8db6af1..0926703d6b 100644
--- a/runelite-client/src/main/scripts/CommandScript.rs2asm
+++ b/runelite-client/src/main/scripts/CommandScript.rs2asm
@@ -3,238 +3,238 @@
.string_stack_count 0
.int_var_count 5
.string_var_count 0
- load_int 10616887
- widget_get_hidden_widget
- load_int 1
+ iconst 10616887
+ if_gethide
+ iconst 1
if_icmpeq LABEL9
- load_int 10616888
- widget_get_hidden_widget
- load_int 1
+ iconst 10616888
+ if_gethide
+ iconst 1
if_icmpeq LABEL9
jump LABEL10
LABEL9:
return
LABEL10:
get_varbit 8119
- load_int 0
+ iconst 0
if_icmpeq LABEL19
- load_int -1
- load_int 162
+ iconst -1
+ iconst 162
invoke 1701
- load_int 0
+ iconst 0
if_icmpeq LABEL19
jump LABEL20
LABEL19:
return
LABEL20:
- 049 335
+ get_varc_string 335
string_length
istore 2
- load_int 0
+ iconst 0
istore 3
- load_int 0
+ iconst 0
istore 4
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL31
jump LABEL37
LABEL31:
- get_varc 41
- load_int 4
+ get_varc_int 41
+ iconst 4
if_icmpeq LABEL35
jump LABEL37
LABEL35:
- load_int 1
+ iconst 1
istore 4
LABEL37:
- get_rights
- load_int 0
+ staffmodlevel
+ iconst 0
if_icmpgt LABEL41
jump LABEL43
LABEL41:
- load_int 1
+ iconst 1
istore 3
LABEL43:
iload 3
- load_int 1
+ iconst 1
if_icmpeq LABEL47
jump LABEL58
LABEL47:
- load_string "`"
+ sconst "`"
iload 1
- string_indexof
- load_int -1
+ string_indexof_char
+ iconst -1
if_icmpne LABEL53
jump LABEL58
LABEL53:
iload 2
- load_int 0
+ iconst 0
if_icmpeq LABEL57
jump LABEL58
LABEL57:
return
LABEL58:
iload 0
- load_int 84
+ iconst 84
if_icmpeq LABEL62
jump LABEL179
LABEL62:
invoke 1984
iload 2
- load_int 0
+ iconst 0
if_icmpgt LABEL67
jump LABEL178
LABEL67:
- 049 335
- load_string "/"
- load_int 0
- string_indexof_from
- load_int 0
+ get_varc_string 335
+ sconst "/"
+ iconst 0
+ string_indexof_string
+ iconst 0
if_icmpeq LABEL77
iload 4
- load_int 1
+ iconst 1
if_icmpeq LABEL77
jump LABEL112
LABEL77:
- get_clanchatcount
- load_int 0
+ clan_getchatcount
+ iconst 0
if_icmpgt LABEL81
jump LABEL108
LABEL81:
iload 2
- load_int 1
+ iconst 1
if_icmple LABEL85
jump LABEL90
LABEL85:
iload 4
- load_int 0
+ iconst 0
if_icmpeq LABEL89
jump LABEL90
LABEL89:
return
LABEL90:
get_varbit 4394
- load_int 1
+ iconst 1
if_icmpeq LABEL94
jump LABEL96
LABEL94:
- part_clanchat
+ clan_leavechat
jump LABEL107
LABEL96:
iload 4
- load_int 1
+ iconst 1
if_icmpeq LABEL100
jump LABEL104
LABEL100:
- load_string "/"
- 049 335
- concat_string
- 050 335
+ sconst "/"
+ get_varc_string 335
+ append
+ set_varc_string 335
LABEL104:
- 049 335
- load_int 2
+ get_varc_string 335
+ iconst 2
invoke 96
LABEL107:
jump LABEL111
LABEL108:
- 049 335
- load_int 0
+ get_varc_string 335
+ iconst 0
invoke 96
LABEL111:
jump LABEL174
LABEL112:
- 049 335
- load_string "::"
- load_int 0
- string_indexof_from
- load_int 0
+ get_varc_string 335
+ sconst "::"
+ iconst 0
+ string_indexof_string
+ iconst 0
if_icmpeq LABEL119
jump LABEL171
LABEL119:
iload 2
- load_int 2
+ iconst 2
if_icmpgt LABEL123
jump LABEL167
LABEL123:
- 049 335
- load_string "::toggleroof"
- load_int 0
- string_indexof_from
- load_int 0
+ get_varc_string 335
+ sconst "::toggleroof"
+ iconst 0
+ string_indexof_string
+ iconst 0
if_icmpeq LABEL130
jump LABEL144
LABEL130:
- get_hideroofs
- load_int 1
+ getremoveroofs
+ iconst 1
if_icmpeq LABEL134
jump LABEL139
LABEL134:
- load_int 0
- set_hideroofs
- load_string "Roofs will only be removed selectively."
- send_game_message
+ iconst 0
+ setremoveroofs
+ sconst "Roofs will only be removed selectively."
+ mes
jump LABEL143
LABEL139:
- load_int 1
- set_hideroofs
- load_string "Roofs are now all hidden."
- send_game_message
+ iconst 1
+ setremoveroofs
+ sconst "Roofs are now all hidden."
+ mes
LABEL143:
jump LABEL166
LABEL144:
- 049 335
- load_string "::bank"
- load_int 0
- string_indexof_from
- load_int 0
+ get_varc_string 335
+ sconst "::bank"
+ iconst 0
+ string_indexof_string
+ iconst 0
if_icmpeq LABEL151
- load_string "runeliteCommand" ; load callback name
+ sconst "runeliteCommand" ; load callback name
runelite_callback ; invoke callback
jump LABEL155
LABEL151:
- load_string "Hey, everyone, I just tried to do something very silly!"
- load_int 0
+ sconst "Hey, everyone, I just tried to do something very silly!"
+ iconst 0
invoke 96
jump LABEL166
LABEL155:
- 049 335
+ get_varc_string 335
invoke 224
- 050 335
- 049 335
+ set_varc_string 335
+ get_varc_string 335
string_length
istore 2
- 049 335
- load_int 2
+ get_varc_string 335
+ iconst 2
iload 2
- string_substring
- run_command
+ substring
+ docheat
LABEL166:
jump LABEL170
LABEL167:
- 049 335
- load_int 0
+ get_varc_string 335
+ iconst 0
invoke 96
LABEL170:
jump LABEL174
LABEL171:
- 049 335
- load_int 0
+ get_varc_string 335
+ iconst 0
invoke 96
LABEL174:
- 049 335
+ get_varc_string 335
invoke 77
- load_string ""
- 050 335
+ sconst ""
+ set_varc_string 335
LABEL178:
jump LABEL247
LABEL179:
iload 0
- load_int 104
+ iconst 104
if_icmpeq LABEL183
jump LABEL189
LABEL183:
iload 3
- load_int 1
+ iconst 1
if_icmpeq LABEL187
jump LABEL188
LABEL187:
@@ -243,12 +243,12 @@ LABEL188:
jump LABEL247
LABEL189:
iload 0
- load_int 105
+ iconst 105
if_icmpeq LABEL193
jump LABEL199
LABEL193:
iload 3
- load_int 1
+ iconst 1
if_icmpeq LABEL197
jump LABEL198
LABEL197:
@@ -257,68 +257,68 @@ LABEL198:
jump LABEL247
LABEL199:
iload 0
- load_int 80
+ iconst 80
if_icmpeq LABEL203
jump LABEL241
LABEL203:
- 049 356
+ get_varc_string 356
string_length
- load_int 0
+ iconst 0
if_icmpgt LABEL208
jump LABEL228
LABEL208:
- 049 356
- is_friend
- load_int 1
+ get_varc_string 356
+ friend_test
+ iconst 1
if_icmpeq LABEL213
jump LABEL216
LABEL213:
- 049 356
+ get_varc_string 356
invoke 107
return
LABEL216:
- get_varc 60
- get_gamecycle
+ get_varc_int 60
+ clientclock
if_icmpgt LABEL220
jump LABEL221
LABEL220:
return
LABEL221:
- get_gamecycle
- load_int 50
- iadd
- put_varc 60
- load_string "That player was not found on your Friends list."
- send_game_message
+ clientclock
+ iconst 50
+ add
+ set_varc_int 60
+ sconst "That player was not found on your Friends list."
+ mes
return
LABEL228:
- get_varc 60
- get_gamecycle
+ get_varc_int 60
+ clientclock
if_icmpgt LABEL232
jump LABEL233
LABEL232:
return
LABEL233:
- get_gamecycle
- load_int 50
- iadd
- put_varc 60
- load_string "You haven't received any messages to which you can reply."
- send_game_message
+ clientclock
+ iconst 50
+ add
+ set_varc_int 60
+ sconst "You haven't received any messages to which you can reply."
+ mes
return
jump LABEL247
LABEL241:
- 049 335
- load_int 0
+ get_varc_string 335
+ iconst 0
iload 0
iload 1
invoke 74
- load_int 1 ; check if we're ignoring input
- load_int 0 ;
- load_string "blockChatInput" ;
+ iconst 1 ; check if we're ignoring input
+ iconst 0 ;
+ sconst "blockChatInput" ;
runelite_callback ;
if_icmpeq LABEL247 ; don't add to input varcstr
- 050 335
+ set_varc_string 335
LABEL247:
invoke 223
return
diff --git a/runelite-client/src/main/scripts/GEOffersSetupInit.hash b/runelite-client/src/main/scripts/GEOffersSetupInit.hash
new file mode 100644
index 0000000000..689d72d678
--- /dev/null
+++ b/runelite-client/src/main/scripts/GEOffersSetupInit.hash
@@ -0,0 +1 @@
+B370DDEEF61E0F420C1990DDA4FBBEDCEE8324F3750ABAC79B072A27268D887B
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/GEOffersSetupInit.rs2asm b/runelite-client/src/main/scripts/GEOffersSetupInit.rs2asm
new file mode 100644
index 0000000000..e884731804
--- /dev/null
+++ b/runelite-client/src/main/scripts/GEOffersSetupInit.rs2asm
@@ -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 ""
+ sconst "Too much money!"
+ sconst ""
+ 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 ""
+ sconst "Confirm"
+ sconst ""
+ 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
diff --git a/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm
index aa38d28de9..547863277a 100644
--- a/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm
+++ b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm
@@ -3,42 +3,42 @@
.string_stack_count 0
.int_var_count 0
.string_var_count 1
- get_varc 11
- load_int 1
+ get_varc_int 11
+ iconst 1
if_icmpeq LABEL4
jump LABEL5
LABEL4:
- close_window
+ if_close
LABEL5:
- load_int 11
+ iconst 11
invoke 677
- load_string "Show items whose names contain the following text:"
- load_string "setSearchBankInputText" ; load event name
+ sconst "Show items whose names contain the following text:"
+ sconst "setSearchBankInputText" ; load event name
runelite_callback ; invoke callback
- load_int 10616876
- widget_put_text_widget
- load_string ""
+ iconst 10616876
+ if_settext
+ sconst ""
invoke 222
- load_string ""
+ sconst ""
sstore 0
- load_int 112
- load_int -2147483640
- load_int -2147483639
+ iconst 112
+ iconst -2147483640
+ iconst -2147483639
sload 0
- load_string "izs"
- load_int 10616877
- widget_put_key_listener_widget
- load_int 138
- load_string ""
- load_int 10616877
- widget_put_dialog_abort_listener_widget
+ sconst "izs"
+ iconst 10616877
+ if_setonkey
+ iconst 138
+ sconst ""
+ iconst 10616877
+ if_setondialogabort
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL29
jump LABEL32
LABEL29:
- load_int 0
- load_int 80
+ iconst 0
+ iconst 80
invoke 1983
LABEL32:
return
diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
index bb6da79dd8..afb820ff0f 100644
--- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
+++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
@@ -3,253 +3,253 @@
.string_stack_count 0
.int_var_count 21
.string_var_count 0
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551298
- get_enum_value
+ iconst 10551298
+ enum
istore 2
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551306
- get_enum_value
+ iconst 10551306
+ enum
istore 3
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551301
- get_enum_value
+ iconst 10551301
+ enum
istore 4
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551308
- get_enum_value
+ iconst 10551308
+ enum
istore 5
- load_int 103
- load_int 105
- load_int 1960
+ iconst 103
+ iconst 105
+ iconst 1960
iload 1
- get_enum_value
+ enum
istore 6
- load_int 103
- load_int 105
- load_int 1961
+ iconst 103
+ iconst 105
+ iconst 1961
iload 1
- get_enum_value
+ enum
istore 7
- load_int 103
- load_int 105
- load_int 1135
+ iconst 103
+ iconst 105
+ iconst 1135
iload 1
- get_enum_value
+ enum
istore 8
- load_int 103
- load_int 105
- load_int 1136
+ iconst 103
+ iconst 105
+ iconst 1136
iload 1
- get_enum_value
+ enum
istore 9
- load_int 0
+ iconst 0
istore 10
- load_int 0
+ iconst 0
istore 11
- load_int 0
+ iconst 0
istore 12
- load_int 0
+ iconst 0
istore 13
- load_int 0
+ iconst 0
istore 14
- load_int 0
+ iconst 0
istore 15
iload 0
- widget_get_width_widget
+ if_getwidth
istore 16
iload 0
- widget_get_height_widget
+ if_getheight
istore 17
iload 1
- load_int 1745
+ iconst 1745
if_icmpeq LABEL70
jump LABEL84
LABEL70:
- load_int 0
+ iconst 0
iload 16
- load_int 39387148
- widget_get_width_widget
- isub
+ iconst 39387148
+ if_getwidth
+ sub
invoke 1045
istore 14
- load_int 0
+ iconst 0
iload 17
- load_int 39387148
- widget_get_height_widget
- isub
+ iconst 39387148
+ if_getheight
+ sub
invoke 1045
istore 15
LABEL84:
get_varbit 4606
- load_int 0
+ iconst 0
if_icmpne LABEL88
jump LABEL253
LABEL88:
get_varbit 4606
- load_int 2
+ iconst 2
if_icmpeq LABEL92
jump LABEL101
LABEL92:
- load_int 512
- load_int 220
- 6200
- load_int 0
- load_int 0
- load_int 0
- load_int 0
- 6202
+ iconst 512
+ iconst 220
+ viewport_setfov
+ iconst 0
+ iconst 0
+ iconst 0
+ iconst 0
+ viewport_clampfov
jump LABEL106
LABEL101:
- load_int 512
- load_int 512
- load_int 512
- load_int 512
- 6202
+ iconst 512
+ iconst 512
+ iconst 512
+ iconst 512
+ viewport_clampfov
LABEL106:
- load_int 50
- set_camera_focal_point_height
+ iconst 50
+ cam_setfollowheight
iload 2
- load_int -1
+ iconst -1
if_icmpne LABEL112
jump LABEL252
LABEL112:
iload 3
- load_int -1
+ iconst -1
if_icmpne LABEL116
jump LABEL252
LABEL116:
- get_viewport_size
+ viewport_geteffectivesize
istore 11
istore 10
- load_int 0
+ iconst 0
iload 16
iload 10
- isub
+ sub
invoke 1045
- load_int 0
+ iconst 0
iload 17
iload 11
- isub
+ sub
invoke 1045
istore 13
istore 12
iload 10
iload 11
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
iload 2
- widget_put_size_widget
+ if_setsize
iload 10
- load_int 0
+ iconst 0
iload 14
iload 12
- isub
+ sub
invoke 1045
- isub
+ sub
iload 11
- load_int 0
+ iconst 0
iload 15
iload 13
- isub
+ sub
invoke 1045
- isub
- load_int 0
- load_int 0
+ sub
+ iconst 0
+ iconst 0
iload 3
- widget_put_size_widget
+ if_setsize
iload 4
- load_int -1
+ iconst -1
if_icmpne LABEL159
jump LABEL242
LABEL159:
iload 5
- load_int -1
+ iconst -1
if_icmpne LABEL163
jump LABEL242
LABEL163:
iload 12
iload 14
- isub
- load_int 2
- idiv
+ sub
+ iconst 2
+ div
iload 13
iload 15
- isub
- load_int 2
- idiv
+ sub
+ iconst 2
+ div
istore 13
istore 12
- load_int 0
+ iconst 0
iload 6
iload 12
- isub
+ sub
invoke 1045
- load_int 0
+ iconst 0
iload 8
iload 12
- isub
+ sub
invoke 1045
istore 8
istore 6
- load_int 0
+ iconst 0
iload 7
iload 13
- isub
+ sub
invoke 1045
- load_int 0
+ iconst 0
iload 9
iload 13
- isub
+ sub
invoke 1045
istore 9
istore 7
iload 6
iload 7
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
iload 4
- widget_put_position_widget
+ if_setposition
iload 6
iload 7
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
iload 5
- widget_put_position_widget
+ if_setposition
iload 6
iload 8
- iadd
+ add
iload 7
iload 9
- iadd
- load_int 1
- load_int 1
+ add
+ iconst 1
+ iconst 1
iload 4
- widget_put_size_widget
+ if_setsize
iload 6
iload 8
- iadd
+ add
iload 7
iload 9
- iadd
- load_int 1
- load_int 1
+ add
+ iconst 1
+ iconst 1
iload 5
- widget_put_size_widget
+ if_setsize
iload 1
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551307
- get_enum_value
+ iconst 10551307
+ enum
iload 5
iload 8
iload 9
@@ -257,137 +257,137 @@ LABEL163:
jump LABEL252
LABEL242:
iload 1
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551307
- get_enum_value
+ iconst 10551307
+ enum
iload 3
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
invoke 910
LABEL252:
jump LABEL369
LABEL253:
- load_int 0
- load_int 0
- load_int 0
- load_int 0
- 6202
- get_varc 73
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
+ iconst 0
+ iconst 0
+ iconst 0
+ iconst 0
+ viewport_clampfov
+ get_varc_int 73
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
if_icmpge LABEL262
jump LABEL278
LABEL262:
- get_varc 73
- load_int 896
- load_string "innerZoomLimit"
+ get_varc_int 73
+ iconst 896
+ sconst "innerZoomLimit"
runelite_callback
if_icmple LABEL266
jump LABEL278
LABEL266:
- get_varc 74
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
+ get_varc_int 74
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
if_icmpge LABEL270
jump LABEL278
LABEL270:
- get_varc 74
- load_int 896
- load_string "innerZoomLimit"
+ get_varc_int 74
+ iconst 896
+ sconst "innerZoomLimit"
runelite_callback
if_icmple LABEL274
jump LABEL278
LABEL274:
- get_varc 73
- get_varc 74
+ get_varc_int 73
+ get_varc_int 74
invoke 42
jump LABEL281
LABEL278:
- load_int 512
- load_int 512
+ iconst 512
+ iconst 512
invoke 42
LABEL281:
- get_viewport_size
+ viewport_geteffectivesize
istore 11
istore 10
iload 2
- load_int -1
+ iconst -1
if_icmpne LABEL288
jump LABEL369
LABEL288:
iload 3
- load_int -1
+ iconst -1
if_icmpne LABEL292
jump LABEL369
LABEL292:
iload 10
iload 11
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
iload 2
- widget_put_size_widget
+ if_setsize
iload 10
iload 14
- isub
+ sub
iload 11
iload 15
- isub
- load_int 0
- load_int 0
+ sub
+ iconst 0
+ iconst 0
iload 3
- widget_put_size_widget
+ if_setsize
iload 4
- load_int -1
+ iconst -1
if_icmpne LABEL312
jump LABEL359
LABEL312:
iload 5
- load_int -1
+ iconst -1
if_icmpne LABEL316
jump LABEL359
LABEL316:
iload 6
iload 7
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
iload 4
- widget_put_position_widget
+ if_setposition
iload 6
iload 7
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
iload 5
- widget_put_position_widget
+ if_setposition
iload 6
iload 8
- iadd
+ add
iload 7
iload 9
- iadd
- load_int 1
- load_int 1
+ add
+ iconst 1
+ iconst 1
iload 4
- widget_put_size_widget
+ if_setsize
iload 6
iload 8
- iadd
+ add
iload 7
iload 9
- iadd
- load_int 1
- load_int 1
+ add
+ iconst 1
+ iconst 1
iload 5
- widget_put_size_widget
+ if_setsize
iload 1
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551307
- get_enum_value
+ iconst 10551307
+ enum
iload 5
iload 8
iload 9
@@ -395,191 +395,191 @@ LABEL316:
jump LABEL369
LABEL359:
iload 1
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551307
- get_enum_value
+ iconst 10551307
+ enum
iload 3
- load_int 0
- load_int 0
+ iconst 0
+ iconst 0
invoke 910
LABEL369:
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551309
- get_enum_value
+ iconst 10551309
+ enum
istore 18
iload 18
- load_int -1
+ iconst -1
if_icmpne LABEL379
jump LABEL423
LABEL379:
invoke 1972
- load_int 0
+ iconst 0
if_icmpeq LABEL383
jump LABEL417
LABEL383:
iload 18
- widget_get_index_widget
- load_int 1
+ if_hassub
+ iconst 1
if_icmpeq LABEL388
jump LABEL417
LABEL388:
- get_varc 173
- load_int -2
+ get_varc_int 173
+ iconst -2
if_icmpeq LABEL392
jump LABEL399
LABEL392:
- load_int 512
- load_int 0
- load_int 0
- load_int 1
+ iconst 512
+ iconst 0
+ iconst 0
+ iconst 1
iload 18
- widget_put_size_widget
+ if_setsize
jump LABEL416
LABEL399:
- get_varc 173
- load_int -3
+ get_varc_int 173
+ iconst -3
if_icmpeq LABEL403
jump LABEL410
LABEL403:
- load_int 0
- load_int 0
- load_int 1
- load_int 1
+ iconst 0
+ iconst 0
+ iconst 1
+ iconst 1
iload 18
- widget_put_size_widget
+ if_setsize
jump LABEL416
LABEL410:
- load_int 512
- load_int 334
- load_int 0
- load_int 0
+ iconst 512
+ iconst 334
+ iconst 0
+ iconst 0
iload 18
- widget_put_size_widget
+ if_setsize
LABEL416:
jump LABEL423
LABEL417:
- load_int 512
- load_int 334
- load_int 0
- load_int 0
+ iconst 512
+ iconst 334
+ iconst 0
+ iconst 0
iload 18
- widget_put_size_widget
+ if_setsize
LABEL423:
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551311
- get_enum_value
+ iconst 10551311
+ enum
istore 18
- load_int 0
+ iconst 0
istore 19
- load_int 0
+ iconst 0
istore 20
iload 18
- load_int -1
+ iconst -1
if_icmpne LABEL437
jump LABEL481
LABEL437:
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551303
- get_enum_value
- widget_get_index_widget
- load_int 1
+ iconst 10551303
+ enum
+ if_hassub
+ iconst 1
if_icmpeq LABEL446
jump LABEL455
LABEL446:
get_varbit 4692
- load_int 0
+ iconst 0
if_icmpne LABEL450
jump LABEL453
LABEL450:
- load_int 0
+ iconst 0
istore 20
jump LABEL455
LABEL453:
- load_int 38
+ iconst 38
istore 20
LABEL455:
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL459
jump LABEL473
LABEL459:
get_varbit 6254
- load_int 0
+ iconst 0
if_icmpeq LABEL463
jump LABEL468
LABEL463:
- load_int 182
- load_int 4
- iadd
+ iconst 182
+ iconst 4
+ add
istore 19
jump LABEL472
LABEL468:
- load_int 120
- load_int 4
- iadd
+ iconst 120
+ iconst 4
+ add
istore 19
LABEL472:
jump LABEL475
LABEL473:
- load_int 0
+ iconst 0
istore 19
LABEL475:
iload 19
iload 20
- load_int 2
- load_int 0
+ iconst 2
+ iconst 0
iload 18
- widget_put_position_widget
+ if_setposition
LABEL481:
- load_int 73
- load_int 73
+ iconst 73
+ iconst 73
iload 1
- load_int 10551303
- get_enum_value
+ iconst 10551303
+ enum
istore 18
- load_int 0
+ iconst 0
istore 19
iload 18
- load_int -1
+ iconst -1
if_icmpne LABEL493
jump LABEL515
LABEL493:
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL497
jump LABEL507
LABEL497:
get_varbit 6254
- load_int 0
+ iconst 0
if_icmpeq LABEL501
jump LABEL504
LABEL501:
- load_int 182
+ iconst 182
istore 19
jump LABEL506
LABEL504:
- load_int 120
+ iconst 120
istore 19
LABEL506:
jump LABEL509
LABEL507:
- load_int 0
+ iconst 0
istore 19
LABEL509:
iload 19
- load_int 0
- load_int 1
- load_int 1
+ iconst 0
+ iconst 1
+ iconst 1
iload 18
- widget_put_size_widget
+ if_setsize
LABEL515:
iload 0
iload 1
diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm
index 35bc2c04d4..a9aa9f62ad 100644
--- a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm
+++ b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm
@@ -6,77 +6,77 @@
; locals
; 2 bar size
get_varbit 4606
- load_int 0
+ iconst 0
if_icmpne LABEL4
jump LABEL5
LABEL4:
return
LABEL5:
- load_int 512
+ iconst 512
istore 3
- load_int 512
+ iconst 512
istore 4
iload 1
- widget_get_width_widget
+ if_getwidth
iload 0
- widget_get_width_widget
- isub
+ if_getwidth
+ sub
istore 5
- load_int 0
+ iconst 0
iload 2
invoke 1045
istore 2
iload 1
- widget_get_width_widget
+ if_getwidth
iload 0
- widget_get_width_widget
- isub
+ if_getwidth
+ sub
iload 2
invoke 1046
istore 2
- load_int 896
- load_string "innerZoomLimit"
+ iconst 896
+ sconst "innerZoomLimit"
runelite_callback
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
- isub
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
+ sub
istore 6 ; resizable delta
- load_int 896
- load_string "innerZoomLimit"
+ iconst 896
+ sconst "innerZoomLimit"
runelite_callback
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
- isub
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
+ sub
istore 7 ; fixed delta
iload 2
iload 6
- imul
+ multiply
iload 5
- idiv
+ div
iload 6
- load_string "zoomLinToExp"
- runelite_callback
- pop_int
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
- iadd
+ sconst "zoomLinToExp"
+ runelite_callback
+ pop_int
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
+ add
istore 3
iload 2
iload 7
- imul
+ multiply
iload 5
- idiv
+ div
iload 7
- load_string "zoomLinToExp"
- runelite_callback
- pop_int
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
- iadd
+ sconst "zoomLinToExp"
+ runelite_callback
+ pop_int
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
+ add
istore 4
iload 4
iload 3
diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
index ae8b33dd98..3abf21a570 100644
--- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
+++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
@@ -7,77 +7,77 @@
; 0 resizableZoomRange
; 1 fixedZoomRange
; 2 bar size
- load_int 896
- load_string "innerZoomLimit"
+ iconst 896
+ sconst "innerZoomLimit"
runelite_callback
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
- isub
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
+ sub
istore 0
- load_int 896
- load_string "innerZoomLimit"
+ iconst 896
+ sconst "innerZoomLimit"
runelite_callback
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
- isub
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
+ sub
istore 1
- load_int 17104910
- widget_get_width_widget
- load_int 17104911
- widget_get_width_widget
- isub
+ iconst 17104910
+ if_getwidth
+ iconst 17104911
+ if_getwidth
+ sub
istore 2
- load_int 0
+ iconst 0
istore 3
- load_int 0
+ iconst 0
istore 4
- get_viewport_size
+ viewport_geteffectivesize
istore 4
istore 3
- load_int 0
+ iconst 0
istore 5
iload 3
- load_int 334
+ iconst 334
if_icmpgt LABEL27
jump LABEL36
LABEL27:
- get_varc 74
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
- isub
+ get_varc_int 74
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
+ sub
iload 0
- load_string "zoomExpToLin"
+ sconst "zoomExpToLin"
runelite_callback
pop_int
iload 2
- imul
+ multiply
iload 0
- idiv
+ div
istore 5
jump LABEL44
LABEL36:
- get_varc 73
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
- isub
+ get_varc_int 73
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
+ sub
iload 0
- load_string "zoomExpToLin"
+ sconst "zoomExpToLin"
runelite_callback
pop_int
iload 2
- imul
+ multiply
iload 1
- idiv
+ div
istore 5
LABEL44:
iload 5
- load_int 0
- load_int 0
- load_int 0
- load_int 17104911
- widget_put_position_widget
+ iconst 0
+ iconst 0
+ iconst 0
+ iconst 17104911
+ if_setposition
return
diff --git a/runelite-client/src/main/scripts/PrivateMessage.rs2asm b/runelite-client/src/main/scripts/PrivateMessage.rs2asm
index c15cbc9dee..3d9d8901f6 100644
--- a/runelite-client/src/main/scripts/PrivateMessage.rs2asm
+++ b/runelite-client/src/main/scripts/PrivateMessage.rs2asm
@@ -3,28 +3,28 @@
.string_stack_count 0
.int_var_count 2
.string_var_count 1
- get_varc 5
- load_int 14
+ get_varc_int 5
+ iconst 14
if_icmpeq LABEL4
jump LABEL7
LABEL4:
- load_int 1
- put_varc 66
+ iconst 1
+ set_varc_int 66
return
LABEL7:
- load_int -1
+ iconst -1
istore 0
- load_string ""
+ sconst ""
sstore 0
- 049 359
+ get_varc_string 359
string_length
istore 1
iload 1
- load_int 0
+ iconst 0
if_icmpgt LABEL18
jump LABEL184
LABEL18:
- get_varc 5
+ get_varc_int 5
switch
1: LABEL21
2: LABEL44
@@ -46,87 +46,87 @@ LABEL21:
return
jump LABEL183
LABEL23:
- get_ignorecount
- load_int 0
+ ignore_count
+ iconst 0
if_icmplt LABEL27
jump LABEL30
LABEL27:
- load_string "Unable to update ignore list - system busy."
- send_game_message
+ sconst "Unable to update ignore list - system busy."
+ mes
jump LABEL43
LABEL30:
- get_varc 5
- load_int 4
+ get_varc_int 5
+ iconst 4
if_icmpeq LABEL34
jump LABEL37
LABEL34:
- 049 359
- add_ignore
+ get_varc_string 359
+ ignore_add
jump LABEL43
LABEL37:
- get_varc 5
- load_int 5
+ get_varc_int 5
+ iconst 5
if_icmpeq LABEL41
jump LABEL43
LABEL41:
- 049 359
- remove_ignore
+ get_varc_string 359
+ ignore_del
LABEL43:
jump LABEL183
LABEL44:
- get_friendcount
- load_int 0
+ friend_count
+ iconst 0
if_icmplt LABEL48
jump LABEL51
LABEL48:
- load_string "Unable to complete action - system busy."
- send_game_message
+ sconst "Unable to complete action - system busy."
+ mes
jump LABEL106
LABEL51:
- get_varc 5
- load_int 2
+ get_varc_int 5
+ iconst 2
if_icmpeq LABEL55
jump LABEL58
LABEL55:
- 049 359
- add_friend
+ get_varc_string 359
+ friend_add
jump LABEL106
LABEL58:
- get_varc 5
- load_int 3
+ get_varc_int 5
+ iconst 3
if_icmpeq LABEL62
jump LABEL65
LABEL62:
- 049 359
- remove_friend
+ get_varc_string 359
+ friend_del
jump LABEL106
LABEL65:
- get_varc 5
- load_int 6
+ get_varc_int 5
+ iconst 6
if_icmpeq LABEL69
jump LABEL106
LABEL69:
get_varbit 8119
- load_int 0
+ iconst 0
if_icmpeq LABEL73
jump LABEL79
LABEL73:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
- load_string "You must set a name before you can chat."
- send_game_message
+ sconst "You must set a name before you can chat."
+ mes
return
LABEL79:
- 5005
- load_int 2
+ chat_getfilter_private
+ iconst 2
if_icmpeq LABEL83
jump LABEL94
LABEL83:
- 5000
- load_int 1
- 5016
- chatfilter_update
+ chat_getfilter_public
+ iconst 1
+ chat_getfilter_trade
+ chat_setfilter
invoke 178
invoke 553
istore 0
@@ -136,122 +136,122 @@ LABEL83:
invoke 89
LABEL94:
get_varbit 4394
- load_int 1
+ iconst 1
if_icmpeq LABEL98
jump LABEL101
LABEL98:
- 049 360
- remove_friend
+ get_varc_string 360
+ friend_del
jump LABEL104
LABEL101:
- 049 360
- 049 359
- load_string "privateMessage" ; load event name
- load_int 0 ; whether or not to skip
+ get_varc_string 360
+ get_varc_string 359
+ sconst "privateMessage" ; load event name
+ iconst 0 ; whether or not to skip
runelite_callback ; invoke callback
- load_int 1
+ iconst 1
if_icmpeq LABEL104 ; if skipped, do not message
- privmsg
+ chat_sendprivate
LABEL104:
- get_gamecycle
- put_varc 61
+ clientclock
+ set_varc_int 61
LABEL106:
jump LABEL183
LABEL107:
- 049 359
+ get_varc_string 359
invoke 212
- numeric_input
+ resume_countdialog
jump LABEL183
LABEL111:
- 049 359
- string_remove_html
- 050 361
- 049 359
- string_input_1
+ get_varc_string 359
+ removetags
+ set_varc_string 361
+ get_varc_string 359
+ resume_namedialog
jump LABEL183
LABEL117:
- 049 359
- string_input_2
+ get_varc_string 359
+ resume_stringdialog
jump LABEL183
LABEL120:
get_varbit 8119
- load_int 0
+ iconst 0
if_icmpeq LABEL124
jump LABEL130
LABEL124:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
- load_string "You must set a name before you can chat."
- send_game_message
+ sconst "You must set a name before you can chat."
+ mes
return
LABEL130:
- 049 359
- string_remove_html
- 050 362
- 049 359
- join_clanchat
+ get_varc_string 359
+ removetags
+ set_varc_string 362
+ get_varc_string 359
+ clan_joinchat
jump LABEL183
LABEL136:
iload 1
- load_int 10
+ iconst 10
if_icmpgt LABEL140
jump LABEL146
LABEL140:
- 049 359
- load_int 0
- load_int 9
- string_substring
+ get_varc_string 359
+ iconst 0
+ iconst 9
+ substring
sstore 0
jump LABEL148
LABEL146:
- 049 359
+ get_varc_string 359
sstore 0
LABEL148:
sload 0
- tolowercase
- 5021
+ lowercase
+ chat_setmessagefilter
invoke 553
invoke 84
jump LABEL183
LABEL154:
get_varbit 8119
- load_int 0
+ iconst 0
if_icmpeq LABEL158
jump LABEL164
LABEL158:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
- load_string "You must set a name before you can chat."
- send_game_message
+ sconst "You must set a name before you can chat."
+ mes
return
LABEL164:
- 049 359
- load_int 0
- put_varc 62
- 050 358
+ get_varc_string 359
+ iconst 0
+ set_varc_int 62
+ set_varc_string 358
invoke 95
- load_int 552
- load_int -2147483645
- load_int 1
- load_string "I1"
- load_int 10616845
- widget_put_render_listener_widget
+ iconst 552
+ iconst -2147483645
+ iconst 1
+ sconst "I1"
+ iconst 10616845
+ if_setontimer
jump LABEL183
LABEL176:
- load_int 0
- load_int 1
+ iconst 0
+ iconst 1
invoke 299
return
jump LABEL183
LABEL181:
- 049 359
+ get_varc_string 359
invoke 2061
LABEL183:
jump LABEL190
LABEL184:
- get_varc 5
+ get_varc_int 5
switch
16: LABEL189
7: LABEL187
@@ -265,7 +265,7 @@ LABEL187:
LABEL189:
return
LABEL190:
- load_int 1
- load_int 1
+ iconst 1
+ iconst 1
invoke 299
return
diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm
index 605608f9bd..4aeb36de78 100644
--- a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm
+++ b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm
@@ -3,19 +3,19 @@
.string_stack_count 0
.int_var_count 3
.string_var_count 0
- load_string "resetChatboxInput"
+ sconst "resetChatboxInput"
runelite_callback
- load_int 1
- load_int 10616872
- widget_put_hidden_widget
- load_int 0
- load_int 10616887
- widget_put_hidden_widget
+ iconst 1
+ iconst 10616872
+ if_sethide
+ iconst 0
+ iconst 10616887
+ if_sethide
invoke 923
- load_int 0
+ iconst 0
istore 2
iload 1
- load_int 1
+ iconst 1
if_icmpeq LABEL13
jump LABEL27
LABEL13:
@@ -26,144 +26,144 @@ LABEL13:
iload 2
invoke 89
invoke 223
- load_int 1
+ iconst 1
invoke 927
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL26
jump LABEL27
LABEL26:
invoke 1984
LABEL27:
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL31
jump LABEL32
LABEL31:
invoke 2581
LABEL32:
- load_int 0
- put_varc 5
+ iconst 0
+ set_varc_int 5
iload 0
- load_int 1
+ iconst 1
if_icmpeq LABEL38
jump LABEL40
LABEL38:
- load_string ""
- 050 359
+ sconst ""
+ set_varc_string 359
LABEL40:
- load_int 0
- load_int -8
- load_int 1
- load_int 1
- load_int 10616876
- widget_put_position_widget
- load_int 0
- load_int 40
- load_int 1
- load_int 0
- load_int 10616876
- widget_put_size_widget
- load_int 0
- load_int 22
- load_int 1
- load_int 1
- load_int 10616877
- widget_put_position_widget
- load_int 0
- load_int 20
- load_int 1
- load_int 0
- load_int 10616877
- widget_put_size_widget
- load_int 0
- load_int 10616876
- widget_put_hidden_widget
- load_int 0
- load_int 10616877
- widget_put_hidden_widget
- load_int 1
- load_int 10616881
- widget_put_hidden_widget
- load_int 10616885
- widget_unset_children
- load_int 10616886
- widget_unset_children
- load_int -1
- load_string ""
- load_int 10616872
- widget_put_mouse_press_listener_widget
- load_int -1
- load_string ""
- load_int 10616872
- widget_put_render_listener_widget
- load_int 10616872
- widget_unset_children
- load_int 10616878
- widget_unset_children
- load_int 10616879
- widget_unset_children
- load_int 10616880
- widget_unset_children
- load_int 1
- load_int 10616878
- widget_put_hidden_widget
- load_int 1
- load_int 10616879
- widget_put_hidden_widget
- load_int 1
- load_int 10616880
- widget_put_hidden_widget
- load_int -1
- load_string ""
- load_int 10616878
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
- load_int 10616879
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
- load_int 10616880
- widget_put_mouse_hover_listener_widget
- load_int -1
- load_string ""
- load_int 10616878
- widget_put_mouse_exit_listener_widget
- load_int -1
- load_string ""
- load_int 10616879
- widget_put_mouse_exit_listener_widget
- load_int -1
- load_string ""
- load_int 10616880
- widget_put_mouse_exit_listener_widget
- load_int -1
- load_string ""
- load_int 10616878
- widget_put_render_listener_widget
- load_int -1
- load_string ""
- load_int 10616879
- widget_put_render_listener_widget
- load_int -1
- load_string ""
- load_int 10616880
- widget_put_render_listener_widget
- load_int -1
- load_string ""
- load_int 10616878
- widget_put_mouse_press_listener_widget
- load_int -1
- load_string ""
- load_int 10616879
- widget_put_mouse_press_listener_widget
- load_int -1
- load_string ""
- load_int 10616880
- widget_put_mouse_press_listener_widget
- get_varc 41
- load_int -1
+ iconst 0
+ iconst -8
+ iconst 1
+ iconst 1
+ iconst 10616876
+ if_setposition
+ iconst 0
+ iconst 40
+ iconst 1
+ iconst 0
+ iconst 10616876
+ if_setsize
+ iconst 0
+ iconst 22
+ iconst 1
+ iconst 1
+ iconst 10616877
+ if_setposition
+ iconst 0
+ iconst 20
+ iconst 1
+ iconst 0
+ iconst 10616877
+ if_setsize
+ iconst 0
+ iconst 10616876
+ if_sethide
+ iconst 0
+ iconst 10616877
+ if_sethide
+ iconst 1
+ iconst 10616881
+ if_sethide
+ iconst 10616885
+ cc_deleteall
+ iconst 10616886
+ cc_deleteall
+ iconst -1
+ sconst ""
+ iconst 10616872
+ if_setonclick
+ iconst -1
+ sconst ""
+ iconst 10616872
+ if_setontimer
+ iconst 10616872
+ cc_deleteall
+ iconst 10616878
+ cc_deleteall
+ iconst 10616879
+ cc_deleteall
+ iconst 10616880
+ cc_deleteall
+ iconst 1
+ iconst 10616878
+ if_sethide
+ iconst 1
+ iconst 10616879
+ if_sethide
+ iconst 1
+ iconst 10616880
+ if_sethide
+ iconst -1
+ sconst ""
+ iconst 10616878
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
+ iconst 10616879
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
+ iconst 10616880
+ if_setonmouserepeat
+ iconst -1
+ sconst ""
+ iconst 10616878
+ if_setonmouseleave
+ iconst -1
+ sconst ""
+ iconst 10616879
+ if_setonmouseleave
+ iconst -1
+ sconst ""
+ iconst 10616880
+ if_setonmouseleave
+ iconst -1
+ sconst ""
+ iconst 10616878
+ if_setontimer
+ iconst -1
+ sconst ""
+ iconst 10616879
+ if_setontimer
+ iconst -1
+ sconst ""
+ iconst 10616880
+ if_setontimer
+ iconst -1
+ sconst ""
+ iconst 10616878
+ if_setonclick
+ iconst -1
+ sconst ""
+ iconst 10616879
+ if_setonclick
+ iconst -1
+ sconst ""
+ iconst 10616880
+ if_setonclick
+ get_varc_int 41
+ iconst -1
if_icmpeq LABEL154
jump LABEL156
LABEL154:
@@ -171,7 +171,7 @@ LABEL154:
pop_int
LABEL156:
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL160
jump LABEL161
LABEL160:
diff --git a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
index 9ca40fbbf2..665eb44242 100644
--- a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
+++ b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
@@ -3,43 +3,43 @@
.string_stack_count 0
.int_var_count 4
.string_var_count 0
- load_int 1
- load_int 0
- load_string "scrollWheelZoom"
+ iconst 1
+ iconst 0
+ sconst "scrollWheelZoom"
runelite_callback
if_icmpeq LABEL18
- load_int 0
+ iconst 0
iload 0
- load_int 25
- imul
- isub
+ iconst 25
+ multiply
+ sub
istore 1
- load_int 512
+ iconst 512
istore 2
- load_int 512
+ iconst 512
istore 3
get_varbit 6357
- load_int 0
+ iconst 0
if_icmpeq LABEL14
jump LABEL33
LABEL14:
get_varbit 4606
- load_int 0
+ iconst 0
if_icmpne LABEL18
jump LABEL19
LABEL18:
return
LABEL19:
- 6205
+ viewport_getfov
istore 2
istore 3
iload 3
iload 1
- iadd
+ add
istore 3
iload 2
iload 1
- iadd
+ add
istore 2
iload 3
iload 2
diff --git a/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm b/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm
index 3e1e3a8d47..1803820d2d 100644
--- a/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm
+++ b/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm
@@ -30,5 +30,5 @@
; Send a private message
sload 0
sload 1
- privmsg
- return
+ chat_sendprivate
+ return
diff --git a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm
index c3e1f8261b..a9529b3efb 100644
--- a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm
@@ -3,112 +3,112 @@
.string_stack_count 1
.int_var_count 11
.string_var_count 4
- load_int 83
- load_int 49
- load_int 1497
+ iconst 83
+ iconst 49
+ iconst 1497
iload 0
- get_enum_value
+ enum
istore 3
iload 0
- get_boostedskilllevels
- int_to_string
- widget_put_text
+ stat
+ tostring
+ cc_settext
iload 0
- get_realskilllevels
+ stat_base
istore 4
iload 0 ; load the skill id from arguments
iload 4 ; load the current real skill level
- load_string "skillTabBaseLevel" ; push event name
+ sconst "skillTabBaseLevel" ; push event name
runelite_callback ; invoke callback
istore 4 ; store the (possibly) edited real skill level
iload 4
- int_to_string
- widget_put_text 1
+ tostring
+ cc_settext 1
iload 0
- get_skillexperiences
+ stat_xp
istore 5
- load_string ","
+ sconst ","
sstore 1
sload 0
- load_string " XP:"
- string_append 2
+ sconst " XP:"
+ join_string 2
sstore 2
iload 5
sload 1
invoke 46
sstore 3
- load_int 0
+ iconst 0
istore 6
get_varbit 4181
- load_int 0
+ iconst 0
if_icmpeq LABEL35
jump LABEL66
LABEL35:
iload 4
- load_int 99
- load_string "skillTabMaxLevel" ; push event name
+ iconst 99
+ sconst "skillTabMaxLevel" ; push event name
runelite_callback ; invoke callback
if_icmplt LABEL39
jump LABEL65
LABEL39:
- load_int 105
- load_int 105
- load_int 256
+ iconst 105
+ iconst 105
+ iconst 256
iload 4
- load_int 1
- iadd
- get_enum_value
+ iconst 1
+ add
+ enum
istore 6
sload 2
- load_string "|Next level at:|Remaining XP:"
- concat_string
+ sconst "|Next level at:|Remaining XP:"
+ append
sstore 2
sload 3
- load_string "|"
+ sconst "|"
iload 6
sload 1
invoke 46
- load_string "|"
+ sconst "|"
iload 6
iload 5
- isub
+ sub
sload 1
invoke 46
- string_append 4
- concat_string
+ join_string 4
+ append
sstore 3
LABEL65:
jump LABEL84
LABEL66:
sload 2
- load_string "|Next level at:"
- concat_string
+ sconst "|Next level at:"
+ append
sstore 2
sload 3
- load_string "|"
- load_int 105
- load_int 105
- load_int 256
+ sconst "|"
+ iconst 105
+ iconst 105
+ iconst 256
iload 4
- load_int 1
- iadd
- get_enum_value
+ iconst 1
+ add
+ enum
sload 1
invoke 46
- string_append 2
- concat_string
+ join_string 2
+ append
sstore 3
LABEL84:
- load_int 0
+ iconst 0
istore 7
- load_int 0
+ iconst 0
istore 8
- load_int 0
+ iconst 0
istore 9
- load_int 0
+ iconst 0
istore 10
invoke 1138
- load_int 1
+ iconst 1
if_icmpeq LABEL96
jump LABEL278
LABEL96:
@@ -116,13 +116,13 @@ LABEL96:
invoke 1936
istore 7
iload 7
- load_int -1
+ iconst -1
if_icmpne LABEL103
jump LABEL133
LABEL103:
iload 7
- load_int 10
- idiv
+ iconst 10
+ div
istore 7
iload 7
iload 5
@@ -130,35 +130,35 @@ LABEL103:
jump LABEL133
LABEL111:
sload 2
- load_string "|"
- load_string ""
- load_string "XP to regain:"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "XP to regain:"
+ sconst ""
+ join_string 4
+ append
sstore 2
sload 3
- load_string "|"
- load_string ""
+ sconst "|"
+ sconst ""
iload 7
iload 5
- isub
+ sub
sload 1
invoke 46
- load_string ""
- string_append 4
- concat_string
+ sconst ""
+ join_string 4
+ append
sstore 3
- load_int 1
+ iconst 1
istore 8
LABEL133:
iload 8
- load_int 0
+ iconst 0
if_icmpeq LABEL137
jump LABEL278
LABEL137:
get_varp 1588
- load_int 0
+ iconst 0
if_icmpgt LABEL141
jump LABEL278
LABEL141:
@@ -171,279 +171,279 @@ LABEL141:
6: LABEL144
jump LABEL278
LABEL144:
- load_int 20
+ iconst 20
invoke 2031
istore 10
iload 10
- load_int 0
+ iconst 0
if_icmpgt LABEL151
jump LABEL170
LABEL151:
sload 2
- load_string "|"
- load_string ""
- load_string "XP permitted:"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "XP permitted:"
+ sconst ""
+ join_string 4
+ append
sstore 2
sload 3
- load_string "|"
- load_string ""
+ sconst "|"
+ sconst ""
iload 10
sload 1
invoke 46
- load_string ""
- string_append 4
- concat_string
+ sconst ""
+ join_string 4
+ append
sstore 3
jump LABEL188
LABEL170:
- load_int 1
+ iconst 1
istore 9
sload 2
- load_string "|"
- load_string ""
- load_string "XP permitted:"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "XP permitted:"
+ sconst ""
+ join_string 4
+ append
sstore 2
sload 3
- load_string "|"
- load_string ""
- load_string "NONE"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "NONE"
+ sconst ""
+ join_string 4
+ append
sstore 3
LABEL188:
jump LABEL278
LABEL189:
- load_int 30
+ iconst 30
invoke 2031
istore 10
iload 10
- load_int 0
+ iconst 0
if_icmpgt LABEL196
jump LABEL215
LABEL196:
sload 2
- load_string "|"
- load_string ""
- load_string "XP permitted:"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "XP permitted:"
+ sconst ""
+ join_string 4
+ append
sstore 2
sload 3
- load_string "|"
- load_string ""
+ sconst "|"
+ sconst ""
iload 10
sload 1
invoke 46
- load_string ""
- string_append 4
- concat_string
+ sconst ""
+ join_string 4
+ append
sstore 3
jump LABEL233
LABEL215:
- load_int 1
+ iconst 1
istore 9
sload 2
- load_string "|"
- load_string ""
- load_string "XP permitted:"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "XP permitted:"
+ sconst ""
+ join_string 4
+ append
sstore 2
sload 3
- load_string "|"
- load_string ""
- load_string "NONE"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "NONE"
+ sconst ""
+ join_string 4
+ append
sstore 3
LABEL233:
jump LABEL278
LABEL234:
- load_int 40
+ iconst 40
invoke 2031
istore 10
iload 10
- load_int 0
+ iconst 0
if_icmpgt LABEL241
jump LABEL260
LABEL241:
sload 2
- load_string "|"
- load_string ""
- load_string "XP permitted:"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "XP permitted:"
+ sconst ""
+ join_string 4
+ append
sstore 2
sload 3
- load_string "|"
- load_string ""
+ sconst "|"
+ sconst ""
iload 10
sload 1
invoke 46
- load_string ""
- string_append 4
- concat_string
+ sconst ""
+ join_string 4
+ append
sstore 3
jump LABEL278
LABEL260:
- load_int 1
+ iconst 1
istore 9
sload 2
- load_string "|"
- load_string ""
- load_string "XP permitted:"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "XP permitted:"
+ sconst ""
+ join_string 4
+ append
sstore 2
sload 3
- load_string "|"
- load_string ""
- load_string "NONE"
- load_string ""
- string_append 4
- concat_string
+ sconst "|"
+ sconst ""
+ sconst "NONE"
+ sconst ""
+ join_string 4
+ append
sstore 3
LABEL278:
iload 1
- load_int 5
- widget_load_child 1
- load_int 1
+ iconst 5
+ cc_find 1
+ iconst 1
if_icmpeq LABEL284
jump LABEL294
LABEL284:
iload 9
- load_int 1
+ iconst 1
if_icmpeq LABEL288
jump LABEL291
LABEL288:
- load_int 0
- widget_put_hidden 1
+ iconst 0
+ cc_sethide 1
jump LABEL293
LABEL291:
- load_int 1
- widget_put_hidden 1
+ iconst 1
+ cc_sethide 1
LABEL293:
jump LABEL321
LABEL294:
iload 1
- load_int 5
- load_int 5
- widget_create_child 1
- load_int 6
- load_int 0
- load_int 0
- load_int 1
- widget_put_position 1
- load_int 19
- load_int 19
- load_int 0
- load_int 0
- widget_put_size 1
- load_int 940
- widget_put_spriteid 1
- load_int 65793
- widget_put_sprite2 1
+ iconst 5
+ iconst 5
+ cc_create 1
+ iconst 6
+ iconst 0
+ iconst 0
+ iconst 1
+ cc_setposition 1
+ iconst 19
+ iconst 19
+ iconst 0
+ iconst 0
+ cc_setsize 1
+ iconst 940
+ cc_setgraphic 1
+ iconst 65793
+ cc_setgraphicshadow 1
iload 9
- load_int 1
+ iconst 1
if_icmpeq LABEL316
jump LABEL319
LABEL316:
- load_int 0
- widget_put_hidden 1
+ iconst 0
+ cc_sethide 1
jump LABEL321
LABEL319:
- load_int 1
- widget_put_hidden 1
+ iconst 1
+ cc_sethide 1
LABEL321:
iload 3
- load_int 1
+ iconst 1
if_icmpeq LABEL325
jump LABEL344
LABEL325:
- get_ismembers
- load_int 0
+ map_members
+ iconst 0
if_icmpeq LABEL329
jump LABEL344
LABEL329:
- get_varc 103
- load_int 0
+ get_varc_int 103
+ iconst 0
if_icmpeq LABEL333
jump LABEL344
LABEL333:
- load_string ""
+ sconst ""
sload 0
- load_string ":"
- load_string ""
- string_append 4
+ sconst ":"
+ sconst ""
+ join_string 4
sstore 2
- load_string ""
- load_string "Members Only"
- load_string ""
- string_append 3
+ sconst ""
+ sconst "Members Only"
+ sconst ""
+ join_string 3
sstore 3
LABEL344:
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL348
jump LABEL375
LABEL348:
- load_int 2367
- load_int -2147483644
- load_int -2147483645
- load_int -1
+ iconst 2367
+ iconst -2147483644
+ iconst -2147483645
+ iconst -1
iload 2
sload 2
sload 3
- load_int 495
- load_string "iIiIssf"
+ iconst 495
+ sconst "iIiIssf"
iload 1
- widget_put_option_click_listener_widget
- get_varc 218
+ if_setonop
+ get_varc_int 218
iload 1
if_icmpeq LABEL363
jump LABEL374
LABEL363:
- get_varc 217
- load_int -1
+ get_varc_int 217
+ iconst -1
if_icmpeq LABEL367
jump LABEL374
LABEL367:
iload 1
- load_int -1
+ iconst -1
iload 2
sload 2
sload 3
- load_int 495
+ iconst 495
invoke 2344
LABEL374:
jump LABEL390
LABEL375:
- load_int 992
- load_int -2147483645
- load_int -1
+ iconst 992
+ iconst -2147483645
+ iconst -1
iload 2
sload 2
sload 3
- load_int 495
- load_int 25
- load_int 5
- idiv
- load_string "IiIssfi"
+ iconst 495
+ iconst 25
+ iconst 5
+ div
+ sconst "IiIssfi"
iload 1
- widget_put_mouse_hover_listener_widget
- load_int 0
- put_varc 2
+ if_setonmouserepeat
+ iconst 0
+ set_varc_int 2
LABEL390:
return
diff --git a/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm b/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm
index 2d1142dc7a..2f623396d6 100644
--- a/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm
+++ b/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm
@@ -5,105 +5,105 @@
.string_var_count 2
invoke 1007
istore 2
- load_string "Total level:"
- load_string "
"
+ sconst "Total level:"
+ sconst "
"
iload 2
- int_to_string
- string_append 3
+ tostring
+ join_string 3
iload 0
- load_string "skillTabTotalLevel" ; push event name
+ sconst "skillTabTotalLevel" ; push event name
runelite_callback ; invoke callback
- widget_put_text_widget
+ if_settext
iload 0
- widget_put_actions_null_widget
- load_string ""
+ if_clearops
+ sconst ""
sstore 0
- load_string ""
+ sconst ""
sstore 1
- get_ismembers
- load_int 1
+ map_members
+ iconst 1
if_icmpeq LABEL22
- get_varc 103
- load_int 1
+ get_varc_int 103
+ iconst 1
if_icmpeq LABEL22
jump LABEL28
LABEL22:
- load_string "Total XP:"
+ sconst "Total XP:"
sstore 0
invoke 1008
invoke 1009
sstore 1
jump LABEL37
LABEL28:
- load_string "Total XP:|Free Total Level:"
+ sconst "Total XP:|Free Total Level:"
sstore 0
invoke 1008
invoke 1009
- load_string "|"
+ sconst "|"
invoke 1320
- int_to_string
- string_append 3
+ tostring
+ join_string 3
sstore 1
LABEL37:
invoke 1972
- load_int 1
+ iconst 1
if_icmpeq LABEL41
jump LABEL72
LABEL41:
- load_int 1
- load_string "Toggle Total XP"
+ iconst 1
+ sconst "Toggle Total XP"
iload 0
- widget_put_action_widget
- load_int 2367
- load_int -2147483644
- load_int -2147483645
- load_int -1
+ if_setop
+ iconst 2367
+ iconst -2147483644
+ iconst -2147483645
+ iconst -1
iload 1
sload 0
sload 1
- load_int 495
- load_string "iIiIssf"
+ iconst 495
+ sconst "iIiIssf"
iload 0
- widget_put_option_click_listener_widget
- get_varc 218
+ if_setonop
+ get_varc_int 218
iload 0
if_icmpeq LABEL60
jump LABEL71
LABEL60:
- get_varc 217
- load_int -1
+ get_varc_int 217
+ iconst -1
if_icmpeq LABEL64
jump LABEL71
LABEL64:
iload 0
- load_int -1
+ iconst -1
iload 1
sload 0
sload 1
- load_int 495
+ iconst 495
invoke 2344
LABEL71:
jump LABEL92
LABEL72:
- load_int 992
- load_int -2147483645
- load_int -1
+ iconst 992
+ iconst -2147483645
+ iconst -1
iload 1
sload 0
sload 1
- load_int 495
- load_int 25
- load_int 5
- idiv
- load_string "IiIssfi"
+ iconst 495
+ iconst 25
+ iconst 5
+ div
+ sconst "IiIssfi"
iload 0
- widget_put_mouse_hover_listener_widget
- load_int 40
+ if_setonmouserepeat
+ iconst 40
iload 1
- load_string "I"
+ sconst "I"
iload 0
- widget_put_mouse_exit_listener_widget
- load_int 0
- put_varc 2
+ if_setonmouseleave
+ iconst 0
+ set_varc_int 2
LABEL92:
return
diff --git a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm
index 4b739a959c..a9fd094407 100644
--- a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm
+++ b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm
@@ -5,24 +5,24 @@
.string_var_count 0
; Check if we should allow server to relayout bank
- load_int 1 ; true
- load_int 0 ; load active boolean
- load_string "getSearchingTagTab" ; push event name
- runelite_callback ; invoke callback
+ iconst 1 ; true
+ iconst 0 ; load active boolean
+ sconst "getSearchingTagTab" ; push event name
+ runelite_callback ; invoke callback
if_icmpne LABEL2
; Let layout continue if current bank tab is 0
get_varbit 4150
- load_int 0
+ iconst 0
if_icmpeq LABEL2
; Reset the current bank tab to 0 otherwise
- load_int 0
+ iconst 0
set_varbit 4150
- load_string "Server attempted to reset bank tab."
- load_string "debug"
- runelite_callback
+ sconst "Server attempted to reset bank tab."
+ sconst "debug"
+ runelite_callback
LABEL2:
iload 0
@@ -39,4 +39,4 @@ LABEL2:
iload 11
iload 12
invoke 277
- return
+ return
diff --git a/runelite-client/src/main/scripts/ZoomHandler.rs2asm b/runelite-client/src/main/scripts/ZoomHandler.rs2asm
index b19086168e..5ff5fa6fe6 100644
--- a/runelite-client/src/main/scripts/ZoomHandler.rs2asm
+++ b/runelite-client/src/main/scripts/ZoomHandler.rs2asm
@@ -4,88 +4,88 @@
.int_var_count 6
.string_var_count 0
get_varbit 4606
- load_int 0
+ iconst 0
if_icmpne LABEL4
jump LABEL5
LABEL4:
return
LABEL5:
- load_int 896
- load_string "innerZoomLimit"
+ iconst 896
+ sconst "innerZoomLimit"
runelite_callback
iload 0
invoke 1046
istore 0
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
iload 0
invoke 1045
istore 0
- load_int 896
- load_string "innerZoomLimit"
+ iconst 896
+ sconst "innerZoomLimit"
runelite_callback
iload 1
invoke 1046
istore 1
- load_int 128
- load_string "outerZoomLimit"
- runelite_callback
+ iconst 128
+ sconst "outerZoomLimit"
+ runelite_callback
iload 1
invoke 1045
istore 1
iload 0
iload 1
- 6200
- load_int 0
+ viewport_setfov
+ iconst 0
istore 2
- load_int 0
+ iconst 0
istore 3
- get_viewport_size
+ viewport_geteffectivesize
istore 3
istore 2
iload 3
- load_int 334
- isub
+ iconst 334
+ sub
istore 4
iload 4
- load_int 0
+ iconst 0
if_icmplt LABEL39
jump LABEL42
LABEL39:
- load_int 0
+ iconst 0
istore 4
jump LABEL48
LABEL42:
iload 4
- load_int 100
+ iconst 100
if_icmpgt LABEL46
jump LABEL48
LABEL46:
- load_int 100
+ iconst 100
istore 4
LABEL48:
iload 0
iload 1
iload 0
- isub
+ sub
iload 4
- imul
- load_int 100
- idiv
- iadd
+ multiply
+ iconst 100
+ div
+ add
istore 5
- load_int 25
- load_int 25
+ iconst 25
+ iconst 25
iload 5
- imul
- load_int 256
- idiv
- iadd
- set_camera_focal_point_height
+ multiply
+ iconst 256
+ div
+ add
+ cam_setfollowheight
iload 0
iload 1
- put_varc 74
- put_varc 73
+ set_varc_int 74
+ set_varc_int 73
invoke 1049
return
diff --git a/runelite-client/src/main/scripts/null.rs2asm b/runelite-client/src/main/scripts/null.rs2asm
index 81afec5354..6c402affd9 100644
--- a/runelite-client/src/main/scripts/null.rs2asm
+++ b/runelite-client/src/main/scripts/null.rs2asm
@@ -34,4 +34,4 @@
.int_var_count 0
.string_var_count 0
-return
+return
diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml
index 5a230785a0..ebd3311ff8 100644
--- a/runelite-mixins/pom.xml
+++ b/runelite-mixins/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
mixins
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
index 455c0c36a8..4130ce5930 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
@@ -519,7 +519,15 @@ public abstract class RSWidgetMixin implements RSWidget
}
else
{
- index = siblings.length;
+ index = 0;
+ for (int i = siblings.length - 1; i >= 0; i--)
+ {
+ if (siblings[i] != null)
+ {
+ index = i + 1;
+ break;
+ }
+ }
}
}
diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml
index 3860a4a34c..a168700652 100644
--- a/runelite-script-assembler-plugin/pom.xml
+++ b/runelite-script-assembler-plugin/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
script-assembler-plugin
diff --git a/runelite-script-assembler-plugin/src/main/java/net/runelite/script/RuneLiteInstructions.java b/runelite-script-assembler-plugin/src/main/java/net/runelite/script/RuneLiteInstructions.java
index 654e5e407c..02073e8144 100644
--- a/runelite-script-assembler-plugin/src/main/java/net/runelite/script/RuneLiteInstructions.java
+++ b/runelite-script-assembler-plugin/src/main/java/net/runelite/script/RuneLiteInstructions.java
@@ -33,6 +33,6 @@ public class RuneLiteInstructions extends Instructions
public void init()
{
super.init();
- add(RUNELITE_EXECUTE, "runelite_callback", 0, 0, 1, 0);
+ add(RUNELITE_EXECUTE, "runelite_callback");
}
}
diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml
index e74de3f44f..f7a1af8997 100644
--- a/runescape-api/pom.xml
+++ b/runescape-api/pom.xml
@@ -29,7 +29,7 @@
net.runelite
runelite-parent
- 1.5.16-SNAPSHOT
+ 1.5.17-SNAPSHOT
net.runelite.rs