From 901ff8e5cc38ce0a8d8076b3e081dac2c1d76b41 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 29 Sep 2017 12:06:03 -0400 Subject: [PATCH] cache: update opcodes --- .../runelite/cache/script/Instructions.java | 531 ++++++++++-------- .../net/runelite/cache/script/Opcodes.java | 76 ++- .../runelite/cache/script/assembler/91.rs2asm | 6 +- 3 files changed, 368 insertions(+), 245 deletions(-) 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 97d456b412..0d2d6f427a 100644 --- a/cache/src/main/java/net/runelite/cache/script/Instructions.java +++ b/cache/src/main/java/net/runelite/cache/script/Instructions.java @@ -26,6 +26,7 @@ package net.runelite.cache.script; import java.util.HashMap; import java.util.Map; +import static net.runelite.cache.script.Opcodes.*; public class Instructions { @@ -37,219 +38,219 @@ public class Instructions instructions.clear(); instructionsByName.clear(); - add(Opcodes.LOAD_INT, "load_int", 0, 1); - add(Opcodes.GET_SETTINGS, "get_settings", 0, 1); - add(Opcodes.PUT_SETTINGS, "put_settings", 0, 1); - add(Opcodes.LOAD_STRING, "load_string", 0, 0, 0, 1); - add(Opcodes.JUMP, "jump", 0, 0); - add(Opcodes.IF_ICMPNE, "if_icmpne", 2, 0); - add(Opcodes.IF_ICMPEQ, "if_icmpeq", 2, 0); - add(Opcodes.IF_ICMPLT, "if_icmplt", 2, 0); - add(Opcodes.IF_ICMPGT, "if_icmpgt", 2, 0); - add(Opcodes.RETURN, "return", 0, 0); - add(25, 0, 1); - add(27, 1, 0); - add(Opcodes.IF_ICMPLE, "if_icmple", 2, 0); - add(Opcodes.IF_ICMPGE, "if_icmpge", 2, 0); - add(Opcodes.ILOAD, "iload", 0, 1); - add(Opcodes.ISTORE, "istore", 1, 0); - add(Opcodes.SLOAD, "sload", 0, 0, 0, 1); - add(Opcodes.SSTORE, "sstore", 0, 0, 1, 0); - add(Opcodes.STRING_APPEND, 0, 0, -1, 1); - add(Opcodes.POP_INT, "pop_int", 1, 0); - add(Opcodes.POP_STRING, "pop_string", 0, 0, 1, 0); - add(Opcodes.INVOKE, "invoke", -1, -1, -1, -1); + add(LOAD_INT, "load_int", 0, 1); + add(GET_SETTINGS, "get_settings", 0, 1); + add(PUT_SETTINGS, "put_settings", 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, 0, 1); + add(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, 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(42, 0, 1); add(43, 1, 0); add(44, 1, 0); add(45, 1, 1); add(46, 2, 0); - add(47, 0, 0, 0, 1); - add(48, 0, 0, 1, 0); - add(Opcodes.SWITCH, "switch", 1, 0); - add(100, 3, 0); - add(101, 0, 0); - add(102, 1, 0); - add(200, 2, 1); - add(201, 1, 1); + add(GET_VARC_STRING, "get_varc_string", 0, 0, 0, 1); + add(PUT_VARC_STRING, "put_varc_string", 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(1000, 4, 0); add(1001, 4, 0); - add(Opcodes.WIDGET_PUT_HIDDEN, "widget_put_hidden", 1, 0); + add(WIDGET_PUT_HIDDEN, "widget_put_hidden", 1, 0); add(1005, 1, 0); add(1006, 1, 0); // 2100-2200 and 1100-1200 do the same thing - add(Opcodes.WIDGET_PUT_SCROLL, "widget_put_scroll", 2, 0); - add(Opcodes.WIDGET_PUT_TEXTCOLOR, "widget_put_textcolor", 1, 0); + add(WIDGET_PUT_SCROLL, "widget_put_scroll", 2, 0); + add(WIDGET_PUT_TEXTCOLOR, "widget_put_textcolor", 1, 0); add(1102, 1, 0); - add(Opcodes.WIDGET_PUT_OPACITY, "widget_put_opacity", 1, 0); + add(WIDGET_PUT_OPACITY, "widget_put_opacity", 1, 0); add(1104, 1, 0); - add(Opcodes.WIDGET_PUT_TEXTUREID, "widget_put_textureid", 1, 0); - add(1106, 1, 0); + add(WIDGET_PUT_SPRITEID, "widget_put_spriteid", 1, 0); + add(WIDGET_PUT_TEXTUREID, "widget_put_textureid", 1, 0); add(1107, 1, 0); - add(Opcodes.WIDGET_PUT_MODELID_1, "widget_put_modelid_1", 1, 0); + add(WIDGET_PUT_MODELID_1, "widget_put_modelid_1", 1, 0); add(1109, 6, 0); add(1110, 1, 0); add(1111, 1, 0); - add(1112, 0, 0, 1, 0); - add(Opcodes.WIDGET_PUT_FONTID, "widget_put_fontid", 1, 0); + add(WIDGET_PUT_TEXT, "widget_put_text", 0, 0, 1, 0); + add(WIDGET_PUT_FONTID, "widget_put_fontid", 1, 0); add(1114, 3, 0); - add(1115, 1, 0); - add(Opcodes.WIDGET_PUT_BORDERTHICKNESS, "widget_put_borderthickness", 1, 0); - add(1117, 1, 0); - add(Opcodes.WIDGET_PUT_FLIPPEDVERTICALLY, "widget_put_flippedvertically", 1, 0); - add(Opcodes.WIDGET_PUT_FLIPPEDHORIZONALLY, "widget_put_flippedhorizonally", 1, 0); - add(Opcodes.WIDGET_PUT_SCROLLWIDTHHEIGHT, "widget_put_scrollwidthheight", 2, 0); - add(1121, 0, 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(Opcodes.WIDGET_PUT_MODELID_2, "widget_put_modelid_2", 1, 0); - add(Opcodes.WIDGET_PUT_MODELID_3, "widget_put_modelid_3", 0, 0); + 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(1300, 1, 0, 1, 0); - add(Opcodes.WIDGET_PUT_DRAG_PARENT, "widget_put_drag_parent", 2, 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(Opcodes.WIDGET_PUT_NAME, "widget_put_name", 0, 0, 1, 0); - add(1306, 0, 0, 1, 0); - add(Opcodes.WIDGET_PUT_ACTIONS_NULL, "widget_put_actions_null", 0, 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 // and 1500-1600 and 2500-2600 - add(Opcodes.WIDGET_GET_RELATIVEX, "widget_get_relativex", 0, 1); - add(Opcodes.WIDGET_GET_RELATIVEY, "widget_get_relativey", 0, 1); - add(Opcodes.WIDGET_GET_WIDTH, "widget_get_width", 0, 1); - add(Opcodes.WIDGET_GET_HEIGHT, "widget_get_height", 0, 1); - add(Opcodes.WIDGET_GET_HIDDEN, "widget_get_hidden", 0, 1); - add(Opcodes.WIDGET_GET_PARENTID, "widget_get_parentid", 0, 1); + 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(Opcodes.WIDGET_GET_SCROLLX, "widget_get_scrollx", 0, 1); - add(Opcodes.WIDGET_GET_SCROLLY, "widget_get_scrolly", 0, 1); - add(Opcodes.WIDGET_GET_TEXT, "widget_get_text", 0, 0, 0, 1); - add(Opcodes.WIDGET_GET_SCROLLWIDTH, "widget_get_scrollwidth", 0, 1); - add(Opcodes.WIDGET_GET_SCROLLHEIGHT, "widget_get_scrollheight", 0, 1); - add(1605, 0, 1); - add(Opcodes.WIDGET_GET_ROTATIONX, "widget_get_rotationx", 0, 1); - add(Opcodes.WIDGET_GET_ROTATIONY, "widget_get_rotationy", 0, 1); - add(Opcodes.WIDGET_GET_ROTATIONZ, "widget_get_rotationz", 0, 1); - add(Opcodes.WIDGET_GET_OPACITY, "widget_get_opacity", 0, 1); + 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(Opcodes.WIDGET_GET_TEXTCOLOR, "widget_get_textcolor", 0, 1); + add(WIDGET_GET_TEXTCOLOR, "widget_get_textcolor", 0, 1); add(1612, 0, 1); add(1613, 0, 1); // 1700 - add(Opcodes.WIDGET_GET_ITEMID, "widget_get_itemid", 0, 1); - add(Opcodes.WIDGET_GET_STACKSIZE, "widget_get_stacksize", 0, 1); - add(1702, 0, 1); - add(1800, 0, 1); - add(1801, 1, 0, 0, 1); - add(Opcodes.WIDGET_GET_NAME, "widget_get_name", 0, 0, 0, 1); + 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(2000, 5, 0); add(2001, 5, 0); - add(Opcodes.WIDGET_PUT_HIDDEN_WIDGET, "widget_put_hidden_widget", 2, 0); + add(WIDGET_PUT_HIDDEN_WIDGET, "widget_put_hidden_widget", 2, 0); add(2005, 2, 0); add(2006, 2, 0); // 2100-2200 - add(Opcodes.WIDGET_PUT_SCROLL_WIDGET, "widget_put_scroll_widget", 3, 0); - add(Opcodes.WIDGET_PUT_TEXTCOLOR_WIDGET, "widget_put_textcolor_widget", 2, 0); + add(WIDGET_PUT_SCROLL_WIDGET, "widget_put_scroll_widget", 3, 0); + add(WIDGET_PUT_TEXTCOLOR_WIDGET, "widget_put_textcolor_widget", 2, 0); add(2102, 2, 0); - add(Opcodes.WIDGET_PUT_OPACITY_WIDGET, "widget_put_opacity_widget", 2, 0); + add(WIDGET_PUT_OPACITY_WIDGET, "widget_put_opacity_widget", 2, 0); add(2104, 2, 0); - add(Opcodes.WIDGET_PUT_TEXTUREID_WIDGET, "widget_put_textureid_widget", 2, 0); - add(2106, 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(2107, 2, 0); - add(Opcodes.WIDGET_PUT_MODELID_1_WIDGET, "widget_put_modelid_1_widget", 2, 0); + add(WIDGET_PUT_MODELID_1_WIDGET, "widget_put_modelid_1_widget", 2, 0); add(2109, 7, 0); add(2110, 2, 0); add(2111, 2, 0); - add(2112, 1, 0, 1, 0); - add(Opcodes.WIDGET_PUT_FONTID_WIDGET, "widget_put_fontid_widget", 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(2114, 4, 0); - add(2115, 2, 0); - add(Opcodes.WIDGET_PUT_BORDERTHICKNESS_WIDGET, "widget_put_borderthickness_widget", 2, 0); - add(2117, 2, 0); - add(Opcodes.WIDGET_PUT_FLIPPEDVERTICALLY_WIDGET, "widget_put_flippedvertically_widget", 2, 0); - add(Opcodes.WIDGET_PUT_FLIPPEDHORIZONALLY_WIDGET, "widget_put_flippedhorizonally_widget", 2, 0); - add(Opcodes.WIDGET_PUT_SCROLLWIDTHHEIGHT_WIDGET, "widget_put_scrollwidthheight_widget", 3, 0); - add(2121, 1, 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, 1, 0); add(2122, 2, 0); add(2123, 2, 0); add(2124, 2, 0); add(2125, 2, 0); // 2200-2300 - add(Opcodes.WIDGET_PUT_MODELID_2_WIDGET, "widget_put_modelid_2_widget", 2, 0); - add(Opcodes.WIDGET_PUT_MODELID_3_WIDGET, "widget_put_modelid_3_widget", 1, 0); + 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(2300, 2, 0, 1, 0); - add(Opcodes.WIDGET_PUT_DRAG_PARENT_WIDGET, "widget_put_drag_parent_widget", 3, 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(Opcodes.WIDGET_PUT_NAME_WIDGET, "widget_put_name_widget", 1, 0, 1, 0); - add(2306, 1, 0, 1, 0); - add(Opcodes.WIDGET_PUT_ACTIONS_NULL_WIDGET, "widget_put_actions_null_widget", 1, 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 // 2500-2600 - add(Opcodes.WIDGET_GET_RELATIVEX_WIDGET, "widget_get_relativex_widget", 1, 1); - add(Opcodes.WIDGET_GET_RELATIVEY_WIDGET, "widget_get_relativey_widget", 1, 1); - add(Opcodes.WIDGET_GET_WIDTH_WIDGET, "widget_get_width_widget", 1, 1); - add(Opcodes.WIDGET_GET_HEIGHT_WIDGET, "widget_get_height_widget", 1, 1); - add(Opcodes.WIDGET_GET_HIDDEN_WIDGET, "widget_get_hidden_widget", 1, 1); - add(Opcodes.WIDGET_GET_PARENTID_WIDGET, "widget_get_parentid_widget", 1, 1); + 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(Opcodes.WIDGET_GET_SCROLLX_WIDGET, "widget_get_scrollx_widget", 1, 1); - add(Opcodes.WIDGET_GET_SCROLLY_WIDGET, "widget_get_scrolly_widget", 1, 1); - add(Opcodes.WIDGET_GET_TEXT_WIDGET, "widget_get_text_widget", 1, 0, 0, 1); - add(Opcodes.WIDGET_GET_SCROLLWIDTH_WIDGET, "widget_get_scrollwidth_widget", 1, 1); - add(Opcodes.WIDGET_GET_SCROLLHEIGHT_WIDGET, "widget_get_scrollheight_widget", 1, 1); - add(2605, 1, 1); - add(Opcodes.WIDGET_GET_ROTATIONX_WIDGET, "widget_get_rotationx_widget", 1, 1); - add(Opcodes.WIDGET_GET_ROTATIONY_WIDGET, "widget_get_rotationy_widget", 1, 1); - add(Opcodes.WIDGET_GET_ROTATIONZ_WIDGET, "widget_get_rotationz_widget", 1, 1); - add(Opcodes.WIDGET_GET_OPACITY_WIDGET, "widget_get_opacity_widget", 1, 1); + 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(Opcodes.WIDGET_GET_TEXTCOLOR_WIDGET, "widget_get_textcolor_widget", 1, 1); + add(WIDGET_GET_TEXTCOLOR_WIDGET, "widget_get_textcolor_widget", 1, 1); add(2612, 1, 1); add(2613, 1, 1); // 2700-2800 - add(Opcodes.WIDGET_GET_ITEMID_WIDGET, "widget_get_itemid_widget", 1, 1); - add(Opcodes.WIDGET_GET_STACKSIZE_WIDGET, "widget_get_stacksize_widget", 1, 1); - add(2702, 1, 1); + 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(2706, 0, 1); // 2800-2900 - add(2800, 1, 1); - add(2801, 2, 0, 0, 1); - add(Opcodes.WIDGET_GET_NAME_WIDGET, "widget_get_name_widget", 1, 0, 0, 1); + 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(Opcodes.SEND_GAME_MESSAGE, "send_game_message", 0, 0, 1, 0); - add(3101, 2, 0); - add(3103, 0, 0); - add(3104, 0, 0, 1, 0); - add(3105, 0, 0, 1, 0); - add(3106, 0, 0, 1, 0); - add(3107, 1, 0, 1, 0); + 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(3108, 3, 0); add(3109, 2, 0); add(3110, 1, 0); - add(3111, 0, 1); - add(3112, 1, 0); - add(3113, 1, 0, 1, 0); - add(3115, 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(3116, 1, 0, 2, 0); add(3117, 1, 0); // 3200-3300 @@ -257,65 +258,66 @@ public class Instructions add(3201, 1, 0); add(3202, 2, 0); // 3300-3400 - add(Opcodes.GET_GAMECYCLE, "get_gamecycle", 0, 1); - add(3301, 2, 0); - add(3302, 2, 1); - add(3303, 2, 1); - add(Opcodes.GET_INVENTORY_SIZE, "get_inventory_size", 1, 1); - add(Opcodes.GET_BOOSTEDSKILLLEVELS, "get_boostedskilllevels", 1, 1); - add(Opcodes.GET_REALSKILLLEVELS, "get_realskilllevels", 1, 1); - add(Opcodes.GET_SKILLEXPERIENCES, "get_skillexperiences", 1, 1); - add(Opcodes.GET_COORDINATES, "get_coordinates", 0, 1); - add(Opcodes.DIVIDE_BY_16384, "divide_by_16384", 1, 1); - add(Opcodes.RIGHT_SHIFT_28, "right_shift_28", 1, 1); - add(Opcodes.AND_16384, "and_16384", 1, 1); - add(Opcodes.GET_ISMEMBERS, "get_ismembers", 0, 1); - add(3313, 2, 1); - add(3314, 2, 1); - add(3315, 2, 1); - add(3316, 0, 1); + 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(3317, 0, 1); - add(Opcodes.GET_WORLD, "get_world", 0, 1); - add(Opcodes.GET_ENERGY, "get_energy", 0, 1); - add(Opcodes.GET_WEIGHT, "get_weight", 0, 1); + add(GET_WORLDNUM, "get_worldnum", 0, 1); + add(GET_ENERGY, "get_energy", 0, 1); + add(GET_WEIGHT, "get_weight", 0, 1); add(3323, 0, 1); - add(Opcodes.GET_FLAGS, "get_flags", 0, 1); + add(GET_FLAGS, "get_flags", 0, 1); + add(3325, 4, 1); // 3400-3500 add(3400, 2, 0, 0, 1); // 3408 is variable // 3500-3700 - add(Opcodes.GET_FRIENDCOUNT, "get_friendcount", 0, 1); - add(Opcodes.GET_FRIEND, "get_friend", 1, 0, 0, 2); - add(Opcodes.GET_FRIEND_WORLD, "get_friend_world", 1, 1); - add(Opcodes.GET_FRIEND_RANK, "get_friend_rank", 1, 1); + 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(Opcodes.ADD_FRIEND, "add_friend", 0, 0, 1, 0); - add(Opcodes.REMOVE_FRIEND, "remove_friend", 0, 0, 1, 0); - add(Opcodes.ADD_IGNORE, "add_ignore", 0, 0, 1, 0); - add(Opcodes.REMOVE_IGNORE, "remove_ignore", 0, 0, 1, 0); - add(3609, 0, 1, 1, 0); - add(3611, 0, 0, 0, 1); - add(Opcodes.GET_CLANCHATCOUNT, "get_clanchatcount", 0, 1); - add(Opcodes.GET_CLAN_MEMBER_NAME, "get_clan_member_name", 1, 0, 0, 1); - add(Opcodes.GET_CLAN_MEMBER_WORLD, "get_clan_member_world", 1, 1); - add(Opcodes.GET_CLAN_MEMBER_RANK, "get_clan_member_rank", 1, 1); + 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(3616, 0, 1); add(3617, 0, 0, 1, 0); - add(3618, 0, 1); - add(3619, 0, 0, 1, 0); - add(3620, 0, 0); - add(Opcodes.GET_IGNORECOUNT, "get_ignorecount", 0, 1); - add(Opcodes.GET_IGNORE, "get_ignore", 1, 0, 0, 2); - add(3623, 0, 1, 1, 0); - add(Opcodes.CLANMEMBER_ISME, "clanmember_isme", 1, 1); - add(Opcodes.GET_CLANCHATOWNER, "get_clanchatowner", 0, 0, 0, 1); + 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(3903, 1, 1); - add(Opcodes.GET_GRANDEXCHANGE_OFFER_ITEMID, "get_grandexchange_offer_itemid", 1, 1); - add(Opcodes.GET_GRANDEXCHANGE_OFFER_PRICE, "get_grandexchange_offer_price", 1, 1); - add(Opcodes.GET_GRANDEXCHANGE_OFFER_TOTALQUANTITY, "get_grandexchange_offer_totalquantity", 1, 1); - add(Opcodes.GET_GRANDEXCHANGE_OFFER_QUANTITYSOLD, "get_grandexchange_offer_quantitysold", 1, 1); - add(Opcodes.GET_GRANDEXCHANGE_OFFER_SPENT, "get_grandexchange_offer_spent", 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(3910, 1, 1); add(3911, 1, 1); add(3912, 1, 1); @@ -334,55 +336,55 @@ public class Instructions add(3925, 1, 1); add(3926, 1, 1); // 4000-4100 - add(Opcodes.IADD, "iadd", 2, 1); - add(Opcodes.ISUB, "isub", 2, 1); - add(Opcodes.IMUL, "imul", 2, 1); - add(Opcodes.IDIV, "idiv", 2, 1); - add(Opcodes.RAND_EXCL, "rand_excl", 1, 1); - add(Opcodes.RAND_INCL, "rand_incl", 1, 1); + 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(4006, 5, 1); add(4007, 2, 1); - add(Opcodes.SET_BIT, "set_bit", 2, 1); - add(Opcodes.CLEAR_BIT, "clear_bit", 2, 1); - add(Opcodes.TEST_BIT, "test_bit", 2, 1); - add(Opcodes.MODULO, "modulo", 2, 1); - add(Opcodes.POW, "pow", 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(4013, 2, 1); - add(Opcodes.AND, "and", 2, 1); - add(Opcodes.OR, "or", 2, 1); + add(AND, "and", 2, 1); + add(OR, "or", 2, 1); add(4018, 3, 1); // 4100-4200 - add(Opcodes.CONCAT_INT, "concat_int", 1, 0, 1, 1); - add(Opcodes.CONCAT_STRING, "concat_string", 0, 0, 2, 1); + 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(Opcodes.TOLOWERCASE, "tolowercase", 0, 0, 1, 1); - add(Opcodes.FORMAT_DATE, "format_date", 1, 0, 0, 1); - add(Opcodes.SWITCH_MALE_OR_FEMALE, "switch_male_or_female", 0, 0, 2, 1); - add(Opcodes.INT_TO_STRING, "int_to_string", 1, 0, 0, 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(4107, 0, 1, 2, 0); add(4108, 2, 1, 1, 0); add(4109, 2, 1, 1, 0); - add(Opcodes.SWITCH_STRING, "switch_string", 1, 0, 2, 1); - add(4111, 0, 0, 1, 1); - add(Opcodes.CONCAT_CHAR, "concat_char", 1, 0, 1, 1); - add(Opcodes.CHAR_IS_PRINTABLE, "char_is_printable", 1, 1); - add(4114, 1, 1); - add(4115, 1, 1); - add(4116, 1, 1); - add(Opcodes.STRING_LENGTH, "string_length", 0, 1, 1, 0); - add(Opcodes.STRING_SUBSTRING, "string_substring", 2, 0, 1, 1); - add(Opcodes.STRING_REMOVE_HTML, "string_remove_html", 0, 0, 1, 1); - add(Opcodes.STRING_INDEXOF, "string_indexof", 1, 1, 1, 0); - add(Opcodes.STRING_INDEXOF_FROM, "string_indexof_from", 1, 1, 2, 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, 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(Opcodes.GET_ITEM_NAME, "get_item_name", 1, 0, 0, 1); - add(Opcodes.GET_ITEM_GROUND_ACTION, "get_item_ground_action", 2, 0, 0, 1); - add(Opcodes.GET_ITEM_INVENTORY_ACTION, "get_item_inventory_action", 2, 0, 0, 1); - add(Opcodes.GET_ITEM_PRICE, "get_item_price", 1, 1); - add(Opcodes.GET_ITEM_STACKABLE, "get_item_stackable", 1, 1); - add(Opcodes.GET_ITEM_NOTE_1, "get_item_note_1", 1, 1); - add(Opcodes.GET_ITEM_NOTE_2, "get_item_note_2", 1, 1); - add(Opcodes.GET_ITEM_ISMEMBERS, "get_item_ismembers", 1, 1); + 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(4210, 1, 1, 1, 0); @@ -390,30 +392,30 @@ public class Instructions add(4212, 0, 0); // 4300-5100 add(5000, 0, 1); - add(5001, 3, 0); - add(5002, 2, 0, 1, 0); - add(5003, 2, 2, 0, 3); - add(5004, 1, 2, 0, 3); + 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(5008, 1, 0, 1, 0); - add(5009, 0, 0, 2, 0); - add(Opcodes.GET_LOCALPLAYER_NAME, "get_localplayer_name", 0, 0, 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(5017, 1, 1); - add(5018, 1, 1); - add(5019, 1, 1); - add(Opcodes.RUN_COMMAND, "run_command", 0, 0, 1, 0); + 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(Opcodes.GET_ISRESIZED, "get_isresized", 0, 1); - add(Opcodes.SET_ISRESIZED, "set_isresized", 1, 0); - add(5308, 0, 1); - add(5309, 1, 0); + 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(5506, 0, 1); + add(GET_MAPANGLE, "get_mapangle", 0, 1); add(5530, 1, 0); add(5531, 0, 1); // 5600-5700 @@ -422,17 +424,66 @@ public class Instructions add(6200, 2, 0); add(6201, 2, 0); add(6202, 4, 0); - add(6203, 0, 2); + add(GET_VIEWPORT_SIZE, "get_viewport_size", 0, 2); add(6204, 0, 2); add(6205, 0, 2); // 6300-6600 - add(Opcodes.LOAD_WORLDS, "load_worlds", 0, 1); - add(6501, 0, 4, 0, 2); - add(6502, 0, 4, 0, 2); - add(Opcodes.GET_WORLD_BY_ID, "get_world_by_id", 1, 4, 0, 2); + 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(Opcodes.GET_WORLD_BY_INDEX, "get_world_by_index", 1, 4, 0, 2); + add(GET_WORLD_BY_INDEX, "get_world_by_index", 1, 4, 0, 2); add(6512, 1, 0); + // 6600-6700 + add(6600, 0, 0); + add(6601, 1, 0, 0, 1); + add(6602, 1, 0); + add(6603, 0, 1); + add(6604, 1, 0); + add(6605, 0, 1); + add(6606, 1, 0); + add(6607, 1, 0); + add(6608, 1, 0); + add(6609, 1, 0); + add(6610, 0, 2); + add(6611, 1, 1); + add(6612, 1, 2); + add(6613, 1, 4); + add(6614, 1, 1); + add(6615, 2, 2); + add(6616, 0, 1); + add(6617, 1, 2); + // 6618 variable + add(6619, 2, 1); + add(6620, 2, 1); + add(6621, 2, 1); + add(622, 0, 1); + add(6623, 1, 1); + add(6624, 1, 0); + add(6625, 0, 0); + add(6626, 1, 0); + add(6627, 0, 0); + add(6628, 1, 0); + add(6629, 1, 0); + add(6630, 1, 0); + add(6631, 0, 0); + add(6632, 1, 0); + add(6633, 2, 0); + add(6634, 2, 0); + add(6635, 0, 1); + add(6636, 0, 1); + add(6637, 1, 1); + add(6638, 2, 1); + add(6639, 0, 2); + add(6640, 0, 2); + add(GET_AREA_NAME, "get_area_name", 1, 0, 0, 1); + add(6694, 1, 1); + add(6695, 1, 1); + add(6696, 1, 1); + add(6697, 0, 1); + add(6698, 0, 1); + add(6699, 0, 1); } private static void add(int opcode, String name, int ipops, int ipushes, int spops, int spushes) 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 dfb85c48c4..1b4baa2052 100644 --- a/cache/src/main/java/net/runelite/cache/script/Opcodes.java +++ b/cache/src/main/java/net/runelite/cache/script/Opcodes.java @@ -36,6 +36,8 @@ public class Opcodes public static final int IF_ICMPLT = 9; public static final int IF_ICMPGT = 10; public static final int RETURN = 21; + public static final int GET_VARBIT = 25; + public static final int SET_VARBIT = 27; public static final int IF_ICMPLE = 31; public static final int IF_ICMPGE = 32; public static final int ILOAD = 33; @@ -46,22 +48,35 @@ public class Opcodes 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_STRING = 47; + public static final int PUT_VARC_STRING = 48; 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_HIDDEN = 1003; public static final int WIDGET_PUT_SCROLL = 1100; public static final int WIDGET_PUT_TEXTCOLOR = 1101; public static final int WIDGET_PUT_OPACITY = 1103; - public static final int WIDGET_PUT_TEXTUREID = 1105; + public static final int WIDGET_PUT_SPRITEID = 1105; + public static final int WIDGET_PUT_TEXTUREID = 1106; public static final int WIDGET_PUT_MODELID_1 = 1108; + public static final int WIDGET_PUT_TEXT = 1112; public static final int WIDGET_PUT_FONTID = 1113; + 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_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_GET_RELATIVEX = 1500; public static final int WIDGET_GET_RELATIVEY = 1501; @@ -74,6 +89,7 @@ public class Opcodes 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; @@ -81,22 +97,31 @@ public class Opcodes 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_HIDDEN_WIDGET = WIDGET_PUT_HIDDEN + 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_OPACITY_WIDGET = WIDGET_PUT_OPACITY + 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_MODELID_1_WIDGET = WIDGET_PUT_MODELID_1 + 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_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_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_GET_RELATIVEX_WIDGET = WIDGET_GET_RELATIVEX + 1000; public static final int WIDGET_GET_RELATIVEY_WIDGET = WIDGET_GET_RELATIVEY + 1000; @@ -109,6 +134,7 @@ public class Opcodes 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; @@ -116,9 +142,25 @@ public class Opcodes 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 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 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 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; @@ -128,7 +170,11 @@ public class Opcodes 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_WORLD = 3318; + 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_WORLDNUM = 3318; public static final int GET_ENERGY = 3321; public static final int GET_WEIGHT = 3322; public static final int GET_FLAGS = 3324; @@ -140,12 +186,18 @@ public class Opcodes 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 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_ITEMID = 3904; @@ -173,8 +225,12 @@ public class Opcodes public static final int SWITCH_MALE_OR_FEMALE = 4105; public static final int INT_TO_STRING = 4106; 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 STRING_LENGTH = 4117; public static final int STRING_SUBSTRING = 4118; public static final int STRING_REMOVE_HTML = 4119; @@ -188,11 +244,27 @@ public class Opcodes 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 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 GET_VIEWPORT_SIZE = 6203; 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_AREA_NAME = 6693; } 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 69de55fa2b..b162beeef5 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 @@ -20,7 +20,7 @@ LABEL7: LABEL9: sload 0 string_remove_html - 3623 + is_ignore load_int 1 if_icmpeq LABEL15 jump LABEL17 @@ -42,7 +42,7 @@ LABEL24: LABEL26: sload 0 string_remove_html - 3623 + is_ignore load_int 1 if_icmpeq LABEL32 jump LABEL34 @@ -64,7 +64,7 @@ LABEL40: jump LABEL51 LABEL44: sload 0 - 3609 + is_friend load_int 1 if_icmpeq LABEL49 jump LABEL51