diff --git a/gradle.properties b/gradle.properties index 1c9ca12800c..07790e38c48 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,11 +28,11 @@ org.gradle.parallel=true org.gradle.caching=false project.build.group=net.runelite -project.build.version=1.12.34.1 -runelite.injected-client.version=1.12.34.1 +project.build.version=1.12.35 +runelite.injected-client.version=1.12.35 glslang.path= -microbot.version=2.6.18 +microbot.version=2.6.19 microbot.commit.sha=nogit microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/ microbot.repo.username= 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 8c4d0f2cdb3..834b9eb2d94 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -16615,5 +16615,6 @@ public final class ItemID public static final int DULL_SUNSTONE_CORE = 34056; public static final int FINAL_LETTER = 34057; public static final int WYRMSCRAIG = 34058; + public static final int FAIRY_TALE_QUEST_LAMP = 34059; /* This file is automatically generated. Do not edit. */ } \ No newline at end of file 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 a8e83ad23af..9f0cf41482c 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -13579,5 +13579,11 @@ public final class NpcID public static final int FISHING_SPOT_16335 = 16335; public static final int FISHING_SPOT_16336 = 16336; public static final int FISHING_SPOT_16337 = 16337; + public static final int FISHING_SPOT_16338 = 16338; + public static final int FISHING_SPOT_16339 = 16339; + public static final int FISHING_SPOT_16340 = 16340; + public static final int FISHING_SPOT_16341 = 16341; + public static final int FISHING_SPOT_16342 = 16342; + public static final int FISHING_SPOT_16343 = 16343; /* This file is automatically generated. Do not edit. */ } 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 c68439f7f7a..b714f4d06f9 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -17129,5 +17129,6 @@ public final class NullItemID public static final int NULL_34041 = 34041; public static final int NULL_34043 = 34043; public static final int NULL_34047 = 34047; + public static final int NULL_34060 = 34060; /* This file is automatically generated. Do not edit. */ } \ No newline at end of file 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 c93d19455e3..79210586a14 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -30094,5 +30094,6 @@ public final class ObjectID public static final int SUNSTONE_ROCKS_62394 = 62394; public static final int BUOY_62395 = 62395; public static final int BUOY_62396 = 62396; + public static final int BROKEN_WALL_62400 = 62400; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java b/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java index bc1438875d3..753cc2bc6b0 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java @@ -7020,6 +7020,7 @@ public static final class Row public static final int HISCORES_BOSSES_YAMA = 5130; public static final int HISCORES_BOSSES_DOOM_OF_MOKHAIOTL = 5484; public static final int HISCORES_BOSSES_MAD_ANGEL = 7208; + public static final int HISCORES_BOSSES_MAGGOT_KING = 7209; public static final int HISCORES_BOSSES_GRYPHON_BOSS = 9447; public static final int HISCORES_BOSSES_COWBOSS = 9655; } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java b/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java index be023d01dbb..72773266080 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java @@ -27722,47 +27722,51 @@ public static final class OmnishopMain { public static final int INFINITY = 0x0333_0000; public static final int UNIVERSE = 0x0333_0001; - public static final int DROPDOWN_CONTAINER = 0x0333_0002; - public static final int FRAME = 0x0333_0003; - public static final int CONTENT = 0x0333_0004; - public static final int R_COL = 0x0333_0005; - public static final int CONTROL_LAYER = 0x0333_0006; - public static final int VIEW_TOGGLE_LAYER = 0x0333_0007; - public static final int HELP_BUTTON_LAYER = 0x0333_0008; - public static final int FILTER_LAYER = 0x0333_0009; - public static final int POINTS_LAYER_1 = 0x0333_000a; - public static final int LIST_LAYER = 0x0333_000b; - public static final int LIST_LAYER_RECT0 = 0x0333_000c; - public static final int POINTS_LAYER_RECT0 = 0x0333_000d; - public static final int R_COL_BACK = 0x0333_000e; - public static final int R_COL_CONTENT = 0x0333_000f; - public static final int R_COL_BORDER = 0x0333_0010; - public static final int INFO_LAYER = 0x0333_0011; - public static final int POINTS_LAYER = 0x0333_0012; - public static final int BUTTONS_INFO = 0x0333_0013; - public static final int BUTTON_INFO_HOLDER = 0x0333_0014; - public static final int NOTE_BUTTON_LAYER = 0x0333_0015; - public static final int BUTTON_1 = 0x0333_0016; - public static final int BUTTON_2 = 0x0333_0017; - public static final int BUTTON_3 = 0x0333_0018; - public static final int BUTTON_4 = 0x0333_0019; - public static final int INFO_LAYER_RECT0 = 0x0333_001a; - public static final int POINTS_BORDER = 0x0333_001b; - public static final int POINTS_TITLE = 0x0333_001c; - public static final int POINTS_VALUE = 0x0333_001d; - public static final int INFO_BORDER = 0x0333_001e; - public static final int INFO = 0x0333_001f; - public static final int INFO_SCROLLER = 0x0333_0020; - public static final int LIST_BORDER = 0x0333_0021; - public static final int LIST = 0x0333_0022; - public static final int LIST_SCROLLER = 0x0333_0023; - public static final int DROPDOWN = 0x0333_0024; - public static final int DROPDOWN_CONTENT = 0x0333_0025; - public static final int DROPDOWN_SCROLLER = 0x0333_0026; - public static final int POINTS_LAYER_1_RECT0 = 0x0333_0027; - public static final int POINTS_BORDER_1 = 0x0333_0028; - public static final int POINTS_TITLE_1 = 0x0333_0029; - public static final int POINTS_VALUE_1 = 0x0333_002a; + public static final int TRIGGERS = 0x0333_0002; + public static final int TRIGGER_EXAMINE = 0x0333_0003; + public static final int TRIGGER_BUY = 0x0333_0004; + public static final int TRIGGER_REQUEST_INFO = 0x0333_0005; + public static final int DROPDOWN_CONTAINER = 0x0333_0006; + public static final int FRAME = 0x0333_0007; + public static final int CONTENT = 0x0333_0008; + public static final int R_COL = 0x0333_0009; + public static final int CONTROL_LAYER = 0x0333_000a; + public static final int VIEW_TOGGLE_LAYER = 0x0333_000b; + public static final int HELP_BUTTON_LAYER = 0x0333_000c; + public static final int FILTER_LAYER = 0x0333_000d; + public static final int POINTS_LAYER_1 = 0x0333_000e; + public static final int LIST_LAYER = 0x0333_000f; + public static final int LIST_LAYER_RECT0 = 0x0333_0010; + public static final int POINTS_LAYER_RECT0 = 0x0333_0011; + public static final int R_COL_BACK = 0x0333_0012; + public static final int R_COL_CONTENT = 0x0333_0013; + public static final int R_COL_BORDER = 0x0333_0014; + public static final int INFO_LAYER = 0x0333_0015; + public static final int POINTS_LAYER = 0x0333_0016; + public static final int BUTTONS_INFO = 0x0333_0017; + public static final int BUTTON_INFO_HOLDER = 0x0333_0018; + public static final int NOTE_BUTTON_LAYER = 0x0333_0019; + public static final int BUTTON_1 = 0x0333_001a; + public static final int BUTTON_2 = 0x0333_001b; + public static final int BUTTON_3 = 0x0333_001c; + public static final int BUTTON_4 = 0x0333_001d; + public static final int INFO_LAYER_RECT0 = 0x0333_001e; + public static final int POINTS_BORDER = 0x0333_001f; + public static final int POINTS_TITLE = 0x0333_0020; + public static final int POINTS_VALUE = 0x0333_0021; + public static final int INFO_BORDER = 0x0333_0022; + public static final int INFO = 0x0333_0023; + public static final int INFO_SCROLLER = 0x0333_0024; + public static final int LIST_BORDER = 0x0333_0025; + public static final int LIST = 0x0333_0026; + public static final int LIST_SCROLLER = 0x0333_0027; + public static final int DROPDOWN = 0x0333_0028; + public static final int DROPDOWN_CONTENT = 0x0333_0029; + public static final int DROPDOWN_SCROLLER = 0x0333_002a; + public static final int POINTS_LAYER_1_RECT0 = 0x0333_002b; + public static final int POINTS_BORDER_1 = 0x0333_002c; + public static final int POINTS_TITLE_1 = 0x0333_002d; + public static final int POINTS_VALUE_1 = 0x0333_002e; } public static final class WorldswitcherFilter diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java b/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java index 1f5af9dae0c..42e89bf4d73 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java @@ -89146,6 +89146,11 @@ public final class ItemID */ public static final int SAILING_SKILLGUIDE_PORTS_WYRMSCRAIG = 34058; + /** + * Fairy tale quest lamp + */ + public static final int DEADMAN_QUEST_LAMP_TIER_11 = 34059; + public static final class Cert { public static final int TWPART1 = 7; @@ -93851,6 +93856,7 @@ public static final class Cert public static final int GOAT_PIT_FUR = 34018; public static final int HALLOWFELL = 34028; public static final int MAD_ANGEL_SWORD = 34036; + public static final int BH_EMBLEM_5 = 34060; } public static final class Placeholder diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/NpcID.java b/runelite-api/src/main/java/net/runelite/api/gameval/NpcID.java index 60d4786866a..03c9f37747e 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/NpcID.java @@ -70718,5 +70718,35 @@ public final class NpcID * Fishing spot */ public static final int _0_40_134_LAVAFISH = 16337; + + /** + * Fishing spot + */ + public static final int FISHING_BOAT_SALTFISH = 16338; + + /** + * Fishing spot + */ + public static final int FISHING_BOAT_MEMBERFISH = 16339; + + /** + * Fishing spot + */ + public static final int FISHING_BOAT_RAREFISH = 16340; + + /** + * Fishing spot + */ + public static final int FISHING_BOAT_KARAMBWANFISH = 16341; + + /** + * Fishing spot + */ + public static final int FISHING_BOAT_PISCARILIUSFISH = 16342; + + /** + * Fishing spot + */ + public static final int FISHING_BOAT_MONKFISH = 16343; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java b/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java index eb8a62f6052..f2124d81a54 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java @@ -83180,5 +83180,10 @@ public class ObjectID1 public static final int SAILING_GANGPLANK_WYRMSCRAIG = 62397; public static final int SAILING_GANGPLANK_WYRMSCRAIG_CAVE = 62398; public static final int HAVEN_TOWER_BASEMENT_WALL_STONE_CREVICE = 62399; + + /** + * Broken wall + */ + public static final int DEADMAN_POH_GAP_WHERE_WINDOW_IS_NOT = 62400; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java b/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java index 629d3fce512..41c06e571e9 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java @@ -862,6 +862,7 @@ public final class SpriteID public static final int LEAFYTREE_TILED_AUTUMN01 = 8557; public static final int LEAFYTREE_AUTUMN02 = 8558; public static final int LEAFYTREE_TILED_AUTUMN02 = 8559; + public static final int MINIMENU_ICONS = 8560; public static final class _2XStandardSpellsOn { diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/VarClientID.java b/runelite-api/src/main/java/net/runelite/api/gameval/VarClientID.java index 88305358d4c..cd9e4eebc09 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/VarClientID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/VarClientID.java @@ -1511,5 +1511,6 @@ public final class VarClientID public static final int MUSIC_CLIENT_SYNC_TIMER_TIME_PER_INTERVAL = 1504; public static final int CASTLE_DRAKAN_WORLD_MAP_X = 1505; public static final int CASTLE_DRAKAN_WORLD_MAP_Y = 1506; + public static final int SETTINGS_RENDERER_OPTION = 1507; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java b/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java index df4fdb878e2..2d09d762b7a 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java @@ -5945,6 +5945,7 @@ public final class VarbitID public static final int LEAGUE_TYPE = 10032; public static final int LEAGUE_TASK_FILTER_TIER = 10033; public static final int LEAGUE_TASK_FILTER_COMPLETED = 10034; + public static final int MOUSEOVER_TEXT_DISABLED = 10035; public static final int LEAGUE_MAIN_PROFILE_INTRO = 10036; public static final int LEAGUE_TUTORIAL_COMPLETED = 10037; public static final int LEAGUE_GRUBBY_CHEST_COUNTER = 10038; @@ -7085,6 +7086,7 @@ public final class VarbitID public static final int TALENT_EXTRA_RETRO_EQUIP_ECHO_WEP = 11618; public static final int TALENT_EXTRA_RETRO_EQUIP_MOONS_ITEM = 11619; public static final int ENDLESS_HARVEST_LAST_OP = 11620; + public static final int SETTINGS_RT7_WARNING_SHOWN = 11621; public static final int TALENT_FREE_RESET_2 = 11622; public static final int GRIMSTONE_UNCERTER_STATUS = 11623; public static final int SETTINGS_SAILING_WIND_ON_ORB_DISABLED = 11624; @@ -7600,7 +7602,6 @@ public final class VarbitID public static final int STAT_BOOSTS_HUD_TOOLTIPS_HIDDEN = 12374; public static final int STAT_BOOSTS_HUD_NUM_DISPLAYS = 12375; public static final int STAT_BOOSTS_HUD_DISPLAY_RELATIVE = 12376; - public static final int MOUSEOVER_TEXT_ENABLED = 12377; public static final int OPTION_HIDE_ROOFTOPS = 12378; public static final int AGILITY_HELPER_DISABLED = 12379; public static final int AGILITY_HELPER_HIGHLIGHT_OBSTACLES_ENABLED = 12380; @@ -10372,6 +10373,7 @@ public final class VarbitID public static final int SLAYER_CHOOSE_TASK_2 = 15801; public static final int SLAYER_CHOOSE_TASK_3 = 15802; public static final int SLAYER_CHOOSE_TASK_1_BOSS_ID = 15803; + public static final int DEADMAN_QUEST_LAMP_TIER_11 = 15804; public static final int XMAS24_MATCH_AMIK = 15892; public static final int XMAS24_MATCH_HAIRDRESSER = 15902; public static final int XMAS24_MATCH_SARAH = 15903; @@ -10536,7 +10538,6 @@ public final class VarbitID public static final int COLLECTION_CLUES_SCROLL_CASES_COMPLETED = 16609; public static final int GIANT_BONE_BURY_WARNING_DISABLE = 16616; public static final int SETTINGS_HD_NEW_RENDERER_TOGGLE = 16617; - public static final int SETTINGS_HD_WARNING_SHOWN = 16618; public static final int SETTINGS_SD_BETA_ENABLED = 16619; public static final int SAILING_WARNING_TELEPORTOFFBOAT = 16620; public static final int SETTINGS_WORLD_MAP_HOTKEY_DISABLED = 16621; diff --git a/runelite-client/src/main/scripts/BankMainBuild.hash b/runelite-client/src/main/scripts/BankMainBuild.hash index 5234cf89cc3..ab433d8e361 100644 --- a/runelite-client/src/main/scripts/BankMainBuild.hash +++ b/runelite-client/src/main/scripts/BankMainBuild.hash @@ -1 +1 @@ -0DC667D052C87AB3A8C728C4304FD41B21DB5F1AF3747FEC3B03FA81B25A6BD3 \ No newline at end of file +529C412482C269504EAEA9FD65214207A1A2097004449304998BDEACF909387B \ No newline at end of file diff --git a/runelite-client/src/main/scripts/BankMainBuild.rs2asm b/runelite-client/src/main/scripts/BankMainBuild.rs2asm index 4d6c72fc281..e733148e33f 100644 --- a/runelite-client/src/main/scripts/BankMainBuild.rs2asm +++ b/runelite-client/src/main/scripts/BankMainBuild.rs2asm @@ -456,12 +456,12 @@ LABEL390: get_varbit 4150 iconst 9 if_icmpgt LABEL397 - jump LABEL884 + jump LABEL879 LABEL397: get_varbit 4150 iconst 15 if_icmpne LABEL401 - jump LABEL884 + jump LABEL879 LABEL401: iload 25 iconst 1410 @@ -896,26 +896,25 @@ LABEL805: iload 37 iconst 1 if_icmpeq LABEL809 - jump LABEL848 + jump LABEL843 LABEL809: oload 2 string_length iconst 0 if_icmpgt LABEL814 - jump LABEL833 + jump LABEL832 LABEL814: - sconst "Showing items: " - sconst "" + sconst "Showing items: " oload 2 sconst "" - join_string 4 + join_string 3 iload 6 if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL825 - jump LABEL832 -LABEL825: + if_icmpeq LABEL824 + jump LABEL831 +LABEL824: sconst "Show items whose names contain the following text: (" iload 32 tostring @@ -927,44 +926,40 @@ LABEL825: pop_int ; pop number of matches iconst 10616875 if_settext +LABEL831: + jump LABEL842 LABEL832: - jump LABEL847 -LABEL833: - sconst "Showing items: " - sconst "" - sconst "*" - sconst "" - join_string 4 + sconst "Showing items: *" iload 6 if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL844 - jump LABEL847 -LABEL844: + if_icmpeq LABEL839 + jump LABEL842 +LABEL839: sconst "Show items whose names contain the following text:" sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback iconst 10616875 if_settext -LABEL847: - jump LABEL860 -LABEL848: +LABEL842: + jump LABEL855 +LABEL843: get_varc_int 1380 iconst -1 - if_icmpne LABEL852 - jump LABEL857 -LABEL852: + if_icmpne LABEL847 + jump LABEL852 +LABEL847: get_varc_int 1380 invoke 9552 iload 6 if_settext - jump LABEL860 -LABEL857: + jump LABEL855 +LABEL852: sconst "The Bank of Gielinor" iload 6 if_settext -LABEL860: +LABEL855: iload 0 iload 1 iload 2 @@ -1011,18 +1006,18 @@ singletabbuildmode: get_varbit 4179 ; add ; istore 36 ; store start to the first item in the "All items" tab -LABEL884: +LABEL879: ; if (~bankmain_searching = 1) { iload 37 iconst 1 - if_icmpeq LABEL888 - jump LABEL892 -LABEL888: + if_icmpeq LABEL883 + jump LABEL887 +LABEL883: iconst 1 iconst 1 iconst 1 invoke 299 -LABEL892: +LABEL887: ; after ~meslayer close iconst -1 istore 38 @@ -1036,12 +1031,12 @@ LABEL892: istore 40 iconst 0 istore 41 -LABEL904: +LABEL899: iload 25 iconst 1410 - if_icmplt LABEL908 - jump LABEL984 -LABEL908: + if_icmplt LABEL903 + jump LABEL979 +LABEL903: ; item index = (loop index + offset) % bank size iload 25 ; loop index iload 36 ; offset @@ -1056,9 +1051,9 @@ LOAD_ITEM_INDEX: iload 35 ; use item index instead of loop index cc_find iconst 1 - if_icmpeq LABEL914 - jump LABEL979 -LABEL914: + if_icmpeq LABEL909 + jump LABEL974 +LABEL909: iconst 95 jump LOAD_ITEM_INDEX2 iload 25 @@ -1068,34 +1063,34 @@ LOAD_ITEM_INDEX2: istore 30 iload 30 iconst -1 - if_icmpne LABEL922 - jump LABEL926 -LABEL922: + if_icmpne LABEL917 + jump LABEL921 +LABEL917: iload 34 iconst 1 add istore 34 -LABEL926: +LABEL921: iload 42 ; overriding single tab building mode? iconst 1 ; if_icmpeq filtertest ; iload 25 iload 38 - if_icmpge LABEL930 - jump LABEL977 -LABEL930: + if_icmpge LABEL925 + jump LABEL972 +LABEL925: iload 25 iload 39 - if_icmplt LABEL934 - jump LABEL977 + if_icmplt LABEL929 + jump LABEL972 filtertest: iload 30 ; obj iload 37 ; bankmain_searching oload 2 ; bankmain_filterstring invoke 279 ; ~bankmain_filteritem iconst 1 ; - if_icmpne LABEL977 ; -LABEL934: + if_icmpne LABEL972 ; +LABEL929: iconst 0 cc_sethide iload 30 @@ -1124,15 +1119,15 @@ LOAD_ITEM_INDEX3: cc_setposition iload 40 iload 27 - if_icmplt LABEL961 - jump LABEL966 -LABEL961: + if_icmplt LABEL956 + jump LABEL961 +LABEL956: iload 40 iconst 1 add istore 40 - jump LABEL976 -LABEL966: + jump LABEL971 +LABEL961: iconst 0 iload 41 iconst 1 @@ -1143,43 +1138,43 @@ LABEL966: iconst 36 multiply istore 33 -LABEL976: - jump LABEL979 -LABEL977: +LABEL971: + jump LABEL974 +LABEL972: iconst 1 cc_sethide -LABEL979: +LABEL974: iload 25 iconst 1 add istore 25 - jump LABEL904 -LABEL984: + jump LABEL899 +LABEL979: iload 33 iconst 32 add istore 33 get_varc_int 1380 iconst -1 - if_icmpne LABEL992 - jump LABEL997 -LABEL992: + if_icmpne LABEL987 + jump LABEL992 +LABEL987: get_varc_int 1380 invoke 9552 iload 6 if_settext - jump LABEL1025 -LABEL997: + jump LABEL1020 +LABEL992: get_varbit 4150 iconst 15 - if_icmpeq LABEL1001 - jump LABEL1005 -LABEL1001: + if_icmpeq LABEL996 + jump LABEL1000 +LABEL996: sconst "Potion storage" iload 6 if_settext - jump LABEL1025 -LABEL1005: + jump LABEL1020 +LABEL1000: iload 42 ; overriding single tab building mode? iconst 1 ; if_icmpne tabtitle ; set normal "Tab" title @@ -1190,9 +1185,9 @@ LABEL1005: tabtitle: ; get_varbit 4170 iconst 2 - if_icmpeq LABEL1009 - jump LABEL1019 -LABEL1009: + if_icmpeq LABEL1004 + jump LABEL1014 +LABEL1004: sconst "Tab " iconst 105 iconst 115 @@ -1202,8 +1197,8 @@ LABEL1009: join_string 2 iload 6 if_settext - jump LABEL1025 -LABEL1019: + jump LABEL1020 +LABEL1014: sconst "Tab " get_varbit 4150 tostring @@ -1211,7 +1206,7 @@ LABEL1019: iload 6 if_settext FinishBuilding: -LABEL1025: +LABEL1020: iload 0 iload 1 iload 2 diff --git a/runelite-client/src/main/scripts/ChatBuilder.hash b/runelite-client/src/main/scripts/ChatBuilder.hash index 7d363aec698..ea71db21560 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.hash +++ b/runelite-client/src/main/scripts/ChatBuilder.hash @@ -1 +1 @@ -D1173E761A81C65F358FC67899ACE5720266BD90A09F8609D96256E948D696BD \ No newline at end of file +58CD909CABCDDA7ECEA2E1602D9DF9316092E2B6B12438509200256E023D70C1 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm index 99cdea70439..e9260e2d9b3 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm @@ -298,24 +298,21 @@ LABEL239: get_varc_int 41 iconst 2 if_icmpeq LABEL290 - jump LABEL346 + jump LABEL343 LABEL290: chat_getmessagefilter string_length iconst 0 if_icmpgt LABEL295 - jump LABEL346 + jump LABEL343 LABEL295: oload 4 - sconst "Public chat filtering:" - sconst "" - sconst " " - sconst "" + sconst "Public chat filtering: " chat_getmessagefilter escape lowercase sconst "" - join_string 7 + join_string 4 iload 8 iload 9 iconst 10616890 @@ -357,7 +354,7 @@ LABEL295: iload 8 enum istore 9 -LABEL346: +LABEL343: iload 0 istore 10 iconst 0 @@ -393,33 +390,33 @@ LABEL346: iconst 0 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL383 - jump LABEL403 -LABEL383: + if_icmpeq LABEL380 + jump LABEL400 +LABEL380: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL388 - jump LABEL403 -LABEL388: + if_icmpeq LABEL385 + jump LABEL400 +LABEL385: oload 0 activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpne LABEL395 - jump LABEL398 -LABEL395: + if_icmpne LABEL392 + jump LABEL395 +LABEL392: iload 17 activeclanchannel_getuserrank istore 18 -LABEL398: +LABEL395: activeclanchannel_getrankkick iconst 2956 invoke 4456 istore 20 istore 19 -LABEL403: +LABEL400: sconst "" ostore 24 iconst 0 @@ -428,17 +425,17 @@ LABEL403: ostore 25 iconst -1 istore 22 -LABEL411: +LABEL408: iload 10 iconst -1 - if_icmpne LABEL415 - jump LABEL2353 -LABEL415: + if_icmpne LABEL412 + jump LABEL2320 +LABEL412: iload 9 iconst -1 - if_icmpne LABEL419 - jump LABEL2353 -LABEL419: + if_icmpne LABEL416 + jump LABEL2320 +LABEL416: iload 10 chat_gethistoryex_byuid istore 21 @@ -456,7 +453,7 @@ LABEL419: invoke 193 iconst 1 if_icmpeq CHAT_FILTER - jump LABEL2349 + jump LABEL2316 CHAT_FILTER: oload 21 ; Load the message iconst 1 ; Gets changed to 0 if message is blocked @@ -468,9 +465,9 @@ CHAT_FILTER: pop_int ; Pop the messageType iconst 1 ; 2nd half of conditional ostore 21 ; Override the message with our filtered message - if_icmpeq LABEL437 ; Check if we are building this message - jump LABEL2349 ; continue to next message, skipping this -LABEL437: + if_icmpeq LABEL434 ; Check if we are building this message + jump LABEL2316 ; continue to next message, skipping this +LABEL434: iload 11 oload 19 oload 24 @@ -484,9 +481,9 @@ LABEL437: iload 15 invoke 90 iconst 1 - if_icmpeq LABEL452 - jump LABEL2349 -LABEL452: + if_icmpeq LABEL449 + jump LABEL2316 +LABEL449: iconst 0 ; splitpmbox iload 10 ; message uid oload 20 ; message channel @@ -503,36 +500,36 @@ LABEL452: ostore 20 ; message channel iload 11 switch - 2: LABEL455 - 1: LABEL455 - 90: LABEL479 - 91: LABEL479 - 3: LABEL503 - 7: LABEL503 - 101: LABEL528 - 5: LABEL549 - 6: LABEL585 - 103: LABEL610 - 104: LABEL610 - 110: LABEL610 - 109: LABEL631 - 9: LABEL652 - 111: LABEL681 - 112: LABEL706 - 41: LABEL731 - 44: LABEL950 - 43: LABEL1115 - 46: LABEL1343 - 14: LABEL1398 - 118: LABEL1428 - 107: LABEL1453 - 113: LABEL1492 - 114: LABEL1513 - 116: LABEL1567 - 0: LABEL1621 - 117: LABEL1658 - jump LABEL1679 -LABEL455: + 2: LABEL452 + 1: LABEL452 + 90: LABEL476 + 91: LABEL476 + 3: LABEL500 + 7: LABEL500 + 101: LABEL525 + 5: LABEL546 + 6: LABEL582 + 103: LABEL607 + 104: LABEL607 + 110: LABEL607 + 109: LABEL628 + 9: LABEL649 + 111: LABEL677 + 112: LABEL702 + 41: LABEL727 + 44: LABEL940 + 43: LABEL1100 + 46: LABEL1324 + 14: LABEL1378 + 118: LABEL1407 + 107: LABEL1432 + 113: LABEL1471 + 114: LABEL1492 + 116: LABEL1546 + 0: LABEL1600 + 117: LABEL1637 + jump LABEL1658 +LABEL452: oload 24 oload 19 sconst ":" @@ -556,8 +553,8 @@ LABEL455: iload 4 invoke 203 istore 7 - jump LABEL1696 -LABEL479: + jump LABEL1675 +LABEL476: oload 24 oload 19 sconst ":" @@ -581,8 +578,8 @@ LABEL479: iload 4 invoke 203 istore 7 - jump LABEL1696 -LABEL503: + jump LABEL1675 +LABEL500: oload 24 sconst "From " oload 19 @@ -609,8 +606,8 @@ LABEL503: iload 4 invoke 203 istore 7 - jump LABEL1696 -LABEL528: + jump LABEL1675 +LABEL525: oload 24 oload 9 oload 21 @@ -631,8 +628,8 @@ LABEL528: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL549: + jump LABEL1675 +LABEL546: oload 24 oload 5 oload 21 @@ -655,9 +652,9 @@ LABEL549: istore 7 get_varbit 1627 iconst 0 - if_icmpeq LABEL573 - jump LABEL584 -LABEL573: + if_icmpeq LABEL570 + jump LABEL581 +LABEL570: iload 12 iconst 500 add @@ -669,9 +666,9 @@ LABEL573: sconst "i" iconst 10616832 if_setontimer -LABEL584: - jump LABEL1696 -LABEL585: +LABEL581: + jump LABEL1675 +LABEL582: oload 24 sconst "To " oload 19 @@ -698,8 +695,8 @@ LABEL585: iload 4 invoke 203 istore 7 - jump LABEL1696 -LABEL610: + jump LABEL1675 +LABEL607: oload 24 oload 10 oload 21 @@ -720,8 +717,8 @@ LABEL610: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL631: + jump LABEL1675 +LABEL628: oload 24 sconst "" oload 21 @@ -742,17 +739,16 @@ LABEL631: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL652: + jump LABEL1675 +LABEL649: oload 24 sconst "[" oload 3 oload 20 - sconst "" - sconst "] " + sconst "] " oload 19 sconst ":" - join_string 7 + join_string 6 sconst "null" invoke 4742 oload 7 @@ -772,8 +768,8 @@ LABEL652: iload 4 invoke 203 istore 7 - jump LABEL1696 -LABEL681: + jump LABEL1675 +LABEL677: oload 21 invoke 632 ostore 21 @@ -798,8 +794,8 @@ LABEL681: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL706: + jump LABEL1675 +LABEL702: oload 21 invoke 632 ostore 21 @@ -824,26 +820,26 @@ LABEL706: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL731: + jump LABEL1675 +LABEL727: iconst 1 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL736 - jump LABEL783 -LABEL736: + if_icmpeq LABEL732 + jump LABEL778 +LABEL732: iconst 1 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL741 - jump LABEL783 -LABEL741: + if_icmpeq LABEL737 + jump LABEL778 +LABEL737: oload 21 invoke 5501 iconst 1 - if_icmpeq LABEL746 - jump LABEL783 -LABEL746: + if_icmpeq LABEL742 + jump LABEL778 +LABEL742: oload 21 invoke 632 ostore 21 @@ -852,9 +848,8 @@ LABEL746: sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iconst -1 @@ -880,29 +875,29 @@ LABEL746: iload 4 invoke 4483 istore 7 - jump LABEL949 -LABEL783: + jump LABEL939 +LABEL778: iconst 0 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL788 - jump LABEL917 -LABEL788: + if_icmpeq LABEL783 + jump LABEL908 +LABEL783: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL793 - jump LABEL917 -LABEL793: + if_icmpeq LABEL788 + jump LABEL908 +LABEL788: oload 19 removetags activeclansettings_getaffinedslot istore 17 iload 17 iconst -1 - if_icmpne LABEL801 - jump LABEL880 -LABEL801: + if_icmpne LABEL796 + jump LABEL872 +LABEL796: iload 17 activeclansettings_getaffinedrank invoke 4302 @@ -910,16 +905,15 @@ LABEL801: ostore 23 iload 16 iconst -1 - if_icmpne LABEL810 - jump LABEL843 -LABEL810: + if_icmpne LABEL805 + jump LABEL837 +LABEL805: oload 24 sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iload 16 @@ -945,15 +939,14 @@ LABEL810: iload 4 invoke 4483 istore 7 - jump LABEL879 -LABEL843: + jump LABEL871 +LABEL837: oload 24 sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iconst -1 @@ -961,11 +954,10 @@ LABEL843: iconst 0 oload 2 oload 23 - sconst "" - sconst " " + sconst " " oload 19 sconst ":" - join_string 6 + join_string 5 oload 8 oload 21 sconst "" @@ -983,9 +975,9 @@ LABEL843: iload 4 invoke 4483 istore 7 -LABEL879: - jump LABEL916 -LABEL880: +LABEL871: + jump LABEL907 +LABEL872: iconst -1 invoke 4302 istore 16 @@ -994,9 +986,8 @@ LABEL880: sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iload 16 @@ -1022,16 +1013,15 @@ LABEL880: iload 4 invoke 4483 istore 7 -LABEL916: - jump LABEL949 -LABEL917: +LABEL907: + jump LABEL939 +LABEL908: oload 24 sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iconst -1 @@ -1057,28 +1047,28 @@ LABEL917: iload 4 invoke 4483 istore 7 -LABEL949: - jump LABEL1696 -LABEL950: +LABEL939: + jump LABEL1675 +LABEL940: activeclansettings_find_listened iconst 1 - if_icmpeq LABEL954 - jump LABEL1082 -LABEL954: + if_icmpeq LABEL944 + jump LABEL1068 +LABEL944: activeclanchannel_find_listened iconst 1 - if_icmpeq LABEL958 - jump LABEL1082 -LABEL958: + if_icmpeq LABEL948 + jump LABEL1068 +LABEL948: oload 19 removetags activeclansettings_getaffinedslot istore 17 iload 17 iconst -1 - if_icmpne LABEL966 - jump LABEL1045 -LABEL966: + if_icmpne LABEL956 + jump LABEL1032 +LABEL956: iload 17 activeclansettings_getaffinedrank invoke 4302 @@ -1086,16 +1076,15 @@ LABEL966: ostore 23 iload 16 iconst -1 - if_icmpne LABEL975 - jump LABEL1008 -LABEL975: + if_icmpne LABEL965 + jump LABEL997 +LABEL965: oload 24 sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iload 16 @@ -1121,15 +1110,14 @@ LABEL975: iload 4 invoke 4483 istore 7 - jump LABEL1044 -LABEL1008: + jump LABEL1031 +LABEL997: oload 24 sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iconst -1 @@ -1137,11 +1125,10 @@ LABEL1008: iconst 0 oload 2 oload 23 - sconst "" - sconst " " + sconst " " oload 19 sconst ":" - join_string 6 + join_string 5 oload 11 oload 21 sconst "" @@ -1159,9 +1146,9 @@ LABEL1008: iload 4 invoke 4483 istore 7 -LABEL1044: - jump LABEL1081 -LABEL1045: +LABEL1031: + jump LABEL1067 +LABEL1032: iconst -1 invoke 4302 istore 16 @@ -1170,9 +1157,8 @@ LABEL1045: sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iload 16 @@ -1198,16 +1184,15 @@ LABEL1045: iload 4 invoke 4483 istore 7 -LABEL1081: - jump LABEL1114 -LABEL1082: +LABEL1067: + jump LABEL1099 +LABEL1068: oload 24 sconst "[" oload 2 oload 20 - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iconst -1 @@ -1233,15 +1218,15 @@ LABEL1082: iload 4 invoke 4483 istore 7 -LABEL1114: - jump LABEL1696 -LABEL1115: +LABEL1099: + jump LABEL1675 +LABEL1100: oload 21 invoke 5309 iconst 1 - if_icmpeq LABEL1120 - jump LABEL1201 -LABEL1120: + if_icmpeq LABEL1105 + jump LABEL1185 +LABEL1105: oload 21 invoke 632 ostore 21 @@ -1249,22 +1234,22 @@ LABEL1120: oload 21 string_length iconst 0 - if_icmpgt LABEL1129 - jump LABEL1140 -LABEL1129: + if_icmpgt LABEL1114 + jump LABEL1125 +LABEL1114: oload 21 sconst "|" iconst 0 string_indexof_string iconst -1 - if_icmpne LABEL1136 - jump LABEL1140 -LABEL1136: + if_icmpne LABEL1121 + jump LABEL1125 +LABEL1121: oload 21 invoke 632 ostore 21 ostore 25 -LABEL1140: +LABEL1125: oload 21 sconst "" sconst "" @@ -1275,16 +1260,15 @@ LABEL1140: iconst 1 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL1152 - jump LABEL1179 -LABEL1152: + if_icmpeq LABEL1137 + jump LABEL1163 +LABEL1137: oload 24 sconst "[" oload 2 activeclansettings_getclanname - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 oload 14 @@ -1304,8 +1288,8 @@ LABEL1152: iload 4 invoke 203 istore 7 - jump LABEL1200 -LABEL1179: + jump LABEL1184 +LABEL1163: oload 24 sconst "" sconst "null" @@ -1327,15 +1311,15 @@ LABEL1179: iload 4 invoke 203 istore 7 -LABEL1200: - jump LABEL1342 -LABEL1201: +LABEL1184: + jump LABEL1323 +LABEL1185: oload 21 invoke 6264 iconst 1 - if_icmpeq LABEL1206 - jump LABEL1258 -LABEL1206: + if_icmpeq LABEL1190 + jump LABEL1240 +LABEL1190: oload 21 invoke 632 ostore 21 @@ -1343,16 +1327,14 @@ LABEL1206: iconst 2 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL1215 - jump LABEL1239 -LABEL1215: + if_icmpeq LABEL1199 + jump LABEL1221 +LABEL1199: oload 24 sconst "[" oload 2 - sconst "PvP Arena" - sconst "" - sconst "]" - join_string 5 + sconst "PvP Arena]" + join_string 3 sconst "null" invoke 4742 oload 21 @@ -1369,8 +1351,8 @@ LABEL1215: iload 4 invoke 203 istore 7 - jump LABEL1257 -LABEL1239: + jump LABEL1239 +LABEL1221: oload 24 sconst "" sconst "null" @@ -1389,9 +1371,9 @@ LABEL1239: iload 4 invoke 203 istore 7 -LABEL1257: - jump LABEL1342 -LABEL1258: +LABEL1239: + jump LABEL1323 +LABEL1240: oload 21 sconst "" sconst "" @@ -1402,35 +1384,34 @@ LABEL1258: oload 21 string_length iconst 0 - if_icmpgt LABEL1270 - jump LABEL1281 -LABEL1270: + if_icmpgt LABEL1252 + jump LABEL1263 +LABEL1252: oload 21 sconst "|" iconst 0 string_indexof_string iconst -1 - if_icmpne LABEL1277 - jump LABEL1281 -LABEL1277: + if_icmpne LABEL1259 + jump LABEL1263 +LABEL1259: oload 21 invoke 632 ostore 21 ostore 25 -LABEL1281: +LABEL1263: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL1286 - jump LABEL1317 -LABEL1286: + if_icmpeq LABEL1268 + jump LABEL1298 +LABEL1268: oload 24 sconst "[" oload 2 activeclanchannel_getclanname - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iconst -1 @@ -1454,8 +1435,8 @@ LABEL1286: iload 4 invoke 4483 istore 7 - jump LABEL1342 -LABEL1317: + jump LABEL1323 +LABEL1298: oload 24 sconst "" sconst "null" @@ -1481,21 +1462,20 @@ LABEL1317: iload 4 invoke 4483 istore 7 -LABEL1342: - jump LABEL1696 -LABEL1343: +LABEL1323: + jump LABEL1675 +LABEL1324: activeclanchannel_find_listened iconst 1 - if_icmpeq LABEL1347 - jump LABEL1375 -LABEL1347: + if_icmpeq LABEL1328 + jump LABEL1355 +LABEL1328: oload 24 sconst "[" oload 2 activeclanchannel_getclanname - sconst "" - sconst "]" - join_string 5 + sconst "]" + join_string 4 sconst "null" invoke 4742 iconst -1 @@ -1516,8 +1496,8 @@ LABEL1347: iload 4 invoke 4483 istore 7 - jump LABEL1397 -LABEL1375: + jump LABEL1377 +LABEL1355: oload 24 sconst "" sconst "null" @@ -1540,9 +1520,9 @@ LABEL1375: iload 4 invoke 4483 istore 7 -LABEL1397: - jump LABEL1696 -LABEL1398: +LABEL1377: + jump LABEL1675 +LABEL1378: oload 21 invoke 2066 istore 13 @@ -1550,9 +1530,8 @@ LABEL1398: ostore 21 oload 24 oload 1 - sconst "Broadcast:" - sconst "" - join_string 3 + sconst "Broadcast:" + join_string 2 sconst "null" invoke 4742 oload 18 @@ -1572,8 +1551,8 @@ LABEL1398: iload 4 invoke 203 istore 7 - jump LABEL1696 -LABEL1428: + jump LABEL1675 +LABEL1407: oload 21 invoke 632 ostore 21 @@ -1598,15 +1577,15 @@ LABEL1428: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL1453: + jump LABEL1675 +LABEL1432: clientclock iload 12 sub iconst 500 - if_icmpgt LABEL1459 - jump LABEL1474 -LABEL1459: + if_icmpgt LABEL1438 + jump LABEL1453 +LABEL1438: sconst "" iload 8 iload 9 @@ -1621,8 +1600,8 @@ LABEL1459: iload 4 invoke 199 istore 7 - jump LABEL1491 -LABEL1474: + jump LABEL1470 +LABEL1453: oload 24 oload 21 sconst "null" @@ -1640,9 +1619,9 @@ LABEL1474: iload 4 invoke 199 istore 7 -LABEL1491: - jump LABEL1696 -LABEL1492: +LABEL1470: + jump LABEL1675 +LABEL1471: oload 24 oload 16 oload 21 @@ -1663,8 +1642,8 @@ LABEL1492: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL1513: + jump LABEL1675 +LABEL1492: oload 21 invoke 632 ostore 21 @@ -1672,9 +1651,9 @@ LABEL1513: oload 19 string_length iconst 0 - if_icmpgt LABEL1522 - jump LABEL1546 -LABEL1522: + if_icmpgt LABEL1501 + jump LABEL1525 +LABEL1501: oload 24 oload 19 sconst ":" @@ -1698,8 +1677,8 @@ LABEL1522: iload 4 invoke 203 istore 7 - jump LABEL1566 -LABEL1546: + jump LABEL1545 +LABEL1525: oload 24 oload 17 oload 21 @@ -1720,9 +1699,9 @@ LABEL1546: iload 4 invoke 199 istore 7 -LABEL1566: - jump LABEL1696 -LABEL1567: +LABEL1545: + jump LABEL1675 +LABEL1546: oload 21 invoke 632 ostore 21 @@ -1730,9 +1709,9 @@ LABEL1567: oload 19 string_length iconst 0 - if_icmpgt LABEL1576 - jump LABEL1600 -LABEL1576: + if_icmpgt LABEL1555 + jump LABEL1579 +LABEL1555: oload 24 oload 19 sconst ":" @@ -1756,8 +1735,8 @@ LABEL1576: iload 4 invoke 203 istore 7 - jump LABEL1620 -LABEL1600: + jump LABEL1599 +LABEL1579: oload 24 oload 4 oload 21 @@ -1778,32 +1757,32 @@ LABEL1600: iload 4 invoke 199 istore 7 -LABEL1620: - jump LABEL1696 -LABEL1621: +LABEL1599: + jump LABEL1675 +LABEL1600: oload 21 string_length iconst 0 - if_icmpgt LABEL1626 - jump LABEL1638 -LABEL1626: + if_icmpgt LABEL1605 + jump LABEL1617 +LABEL1605: oload 21 sconst "|" iconst 0 string_indexof_string iconst -1 - if_icmpne LABEL1633 - jump LABEL1638 -LABEL1633: + if_icmpne LABEL1612 + jump LABEL1617 +LABEL1612: oload 21 invoke 632 ostore 21 ostore 25 - jump LABEL1640 -LABEL1638: + jump LABEL1619 +LABEL1617: sconst "" ostore 25 -LABEL1640: +LABEL1619: oload 24 oload 21 sconst "null" @@ -1821,8 +1800,8 @@ LABEL1640: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL1658: + jump LABEL1675 +LABEL1637: oload 24 oload 15 oload 21 @@ -1843,8 +1822,8 @@ LABEL1658: iload 4 invoke 199 istore 7 - jump LABEL1696 -LABEL1679: + jump LABEL1675 +LABEL1658: oload 24 oload 21 sconst "null" @@ -1862,35 +1841,35 @@ LABEL1679: iload 4 invoke 199 istore 7 -LABEL1696: +LABEL1675: iload 9 if_clearops iload 11 switch - 1: LABEL1701 - 2: LABEL1701 - 3: LABEL1701 - 6: LABEL1701 - 7: LABEL1701 - 9: LABEL1701 - 90: LABEL1701 - 91: LABEL1701 - 106: LABEL1701 - 41: LABEL1701 - 44: LABEL1701 - 0: LABEL1818 - 101: LABEL1926 - 103: LABEL1978 - 104: LABEL1978 - 110: LABEL1978 - 14: LABEL2021 - 118: LABEL2082 - 109: LABEL2137 - 111: LABEL2180 - 112: LABEL2223 - 43: LABEL2266 - jump LABEL2323 -LABEL1701: + 1: LABEL1680 + 2: LABEL1680 + 3: LABEL1680 + 6: LABEL1680 + 7: LABEL1680 + 9: LABEL1680 + 90: LABEL1680 + 91: LABEL1680 + 106: LABEL1680 + 41: LABEL1680 + 44: LABEL1680 + 0: LABEL1797 + 101: LABEL1902 + 103: LABEL1954 + 104: LABEL1954 + 110: LABEL1954 + 14: LABEL1997 + 118: LABEL2055 + 109: LABEL2107 + 111: LABEL2150 + 112: LABEL2193 + 43: LABEL2236 + jump LABEL2290 +LABEL1680: sconst "" oload 19 sconst "" @@ -1914,39 +1893,39 @@ LABEL1701: if_setonmouseleave iload 11 iconst 41 - if_icmpne LABEL1726 - jump LABEL1735 -LABEL1726: + if_icmpne LABEL1705 + jump LABEL1714 +LABEL1705: oload 19 invoke 2759 iconst 1 - if_icmpeq LABEL1731 - jump LABEL1735 -LABEL1731: + if_icmpeq LABEL1710 + jump LABEL1714 +LABEL1710: iconst 10 sconst "Crown Info" iload 9 if_setop -LABEL1735: +LABEL1714: oload 0 oload 19 removetags compare iconst 0 - if_icmpne LABEL1742 - jump LABEL1817 -LABEL1742: + if_icmpne LABEL1721 + jump LABEL1796 +LABEL1721: iload 15 iconst 1 - if_icmpeq LABEL1746 - jump LABEL1751 -LABEL1746: + if_icmpeq LABEL1725 + jump LABEL1730 +LABEL1725: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1759 -LABEL1751: + jump LABEL1738 +LABEL1730: iconst 6 sconst "Add friend" iload 9 @@ -1955,92 +1934,92 @@ LABEL1751: sconst "Add ignore" iload 9 if_setop -LABEL1759: +LABEL1738: iconst 8 sconst "Report" iload 9 if_setop iload 11 iconst 9 - if_icmpeq LABEL1767 - jump LABEL1780 -LABEL1767: + if_icmpeq LABEL1746 + jump LABEL1759 +LABEL1746: clan_getchatcount iconst 0 - if_icmpgt LABEL1771 - jump LABEL1779 -LABEL1771: + if_icmpgt LABEL1750 + jump LABEL1758 +LABEL1750: clan_getchatrank clan_getchatminkick - if_icmpge LABEL1775 - jump LABEL1779 -LABEL1775: + if_icmpge LABEL1754 + jump LABEL1758 +LABEL1754: iconst 9 sconst "Kick" iload 9 if_setop -LABEL1779: - jump LABEL1817 -LABEL1780: +LABEL1758: + jump LABEL1796 +LABEL1759: iload 11 iconst 41 - if_icmpeq LABEL1784 - jump LABEL1817 -LABEL1784: + if_icmpeq LABEL1763 + jump LABEL1796 +LABEL1763: iload 18 iload 19 - if_icmpge LABEL1788 - jump LABEL1817 -LABEL1788: + if_icmpge LABEL1767 + jump LABEL1796 +LABEL1767: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL1793 - jump LABEL1817 -LABEL1793: + if_icmpeq LABEL1772 + jump LABEL1796 +LABEL1772: oload 19 removetags activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpeq LABEL1805 + if_icmpeq LABEL1784 iload 17 activeclanchannel_getuserrank iconst -1 - if_icmple LABEL1805 - jump LABEL1817 -LABEL1805: + if_icmple LABEL1784 + jump LABEL1796 +LABEL1784: iconst 9 sconst "Kick" iload 9 if_setop iload 18 iload 20 - if_icmpge LABEL1813 - jump LABEL1817 -LABEL1813: + if_icmpge LABEL1792 + jump LABEL1796 +LABEL1792: iconst 10 sconst "Ban" iload 9 if_setop -LABEL1817: - jump LABEL2335 -LABEL1818: +LABEL1796: + jump LABEL2302 +LABEL1797: oload 19 string_length iconst 0 - if_icmpgt LABEL1823 - jump LABEL1856 -LABEL1823: + if_icmpgt LABEL1802 + jump LABEL1835 +LABEL1802: oload 0 oload 19 removetags compare iconst 0 - if_icmpne LABEL1830 - jump LABEL1856 -LABEL1830: + if_icmpne LABEL1809 + jump LABEL1835 +LABEL1809: iconst 8 sconst "Report" iload 9 @@ -2066,14 +2045,14 @@ LABEL1830: sconst "" iload 9 if_setonmouseleave - jump LABEL1925 -LABEL1856: + jump LABEL1901 +LABEL1835: oload 25 string_length iconst 0 - if_icmpne LABEL1861 - jump LABEL1913 -LABEL1861: + if_icmpne LABEL1840 + jump LABEL1889 +LABEL1840: oload 25 sconst "CA_ID:" iconst 0 @@ -2081,9 +2060,9 @@ LABEL1861: istore 22 iload 22 iconst -1 - if_icmpne LABEL1870 - jump LABEL1912 -LABEL1870: + if_icmpne LABEL1849 + jump LABEL1888 +LABEL1849: oload 25 iload 22 sconst "CA_ID:" @@ -2104,10 +2083,7 @@ LABEL1870: sconst "Open" iload 9 if_setop - sconst "" - sconst "Task" - sconst "" - join_string 3 + sconst "Task" iload 9 if_setopbase iconst 7821 @@ -2126,9 +2102,9 @@ LABEL1870: sconst "" iload 9 if_setonmouseleave -LABEL1912: - jump LABEL1925 -LABEL1913: +LABEL1888: + jump LABEL1901 +LABEL1889: iconst -1 sconst "" iload 9 @@ -2141,9 +2117,9 @@ LABEL1913: sconst "" iload 9 if_setonmouseleave -LABEL1925: - jump LABEL2335 -LABEL1926: +LABEL1901: + jump LABEL2302 +LABEL1902: sconst "" oload 19 sconst "" @@ -2167,31 +2143,31 @@ LABEL1926: if_setonmouseleave invoke 5548 iconst 1 - if_icmpeq LABEL1951 - jump LABEL1956 -LABEL1951: + if_icmpeq LABEL1927 + jump LABEL1932 +LABEL1927: iconst 1 sconst "Accept invitation" iload 9 if_setop - jump LABEL1960 -LABEL1956: + jump LABEL1936 +LABEL1932: iconst 1 sconst "Accept trade" iload 9 if_setop -LABEL1960: +LABEL1936: iload 15 iconst 1 - if_icmpeq LABEL1964 - jump LABEL1969 -LABEL1964: + if_icmpeq LABEL1940 + jump LABEL1945 +LABEL1940: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1977 -LABEL1969: + jump LABEL1953 +LABEL1945: iconst 6 sconst "Add friend" iload 9 @@ -2200,9 +2176,9 @@ LABEL1969: sconst "Add ignore" iload 9 if_setop -LABEL1977: - jump LABEL2335 -LABEL1978: +LABEL1953: + jump LABEL2302 +LABEL1954: sconst "" oload 19 sconst "" @@ -2230,15 +2206,15 @@ LABEL1978: if_setop iload 15 iconst 1 - if_icmpeq LABEL2007 - jump LABEL2012 -LABEL2007: + if_icmpeq LABEL1983 + jump LABEL1988 +LABEL1983: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL2020 -LABEL2012: + jump LABEL1996 +LABEL1988: iconst 6 sconst "Add friend" iload 9 @@ -2247,20 +2223,20 @@ LABEL2012: sconst "Add ignore" iload 9 if_setop -LABEL2020: - jump LABEL2335 -LABEL2021: +LABEL1996: + jump LABEL2302 +LABEL1997: oload 22 string_length iconst 0 - if_icmpgt LABEL2026 - jump LABEL2055 -LABEL2026: + if_icmpgt LABEL2002 + jump LABEL2031 +LABEL2002: iload 13 iconst -1 - if_icmpne LABEL2030 - jump LABEL2055 -LABEL2030: + if_icmpne LABEL2006 + jump LABEL2031 +LABEL2006: iconst 6 sconst "Open" iload 9 @@ -2285,8 +2261,8 @@ LABEL2030: sconst "iii" iload 9 if_setonmouseleave - jump LABEL2063 -LABEL2055: + jump LABEL2039 +LABEL2031: iconst -1 sconst "" iload 9 @@ -2295,15 +2271,12 @@ LABEL2055: sconst "" iload 9 if_setonmouseleave -LABEL2063: +LABEL2039: iconst 9 sconst "Clear history" iload 9 if_setop - sconst "" - sconst "Notification" - sconst "" - join_string 3 + sconst "Notification" iload 9 if_setopbase iconst 2064 @@ -2314,17 +2287,17 @@ LABEL2063: sconst "iisi" iload 9 if_setonop - jump LABEL2335 -LABEL2082: + jump LABEL2302 +LABEL2055: iconst 105 iconst 73 iconst 5918 iload 13 enum iconst -1 - if_icmpne LABEL2090 - jump LABEL2111 -LABEL2090: + if_icmpne LABEL2063 + jump LABEL2084 +LABEL2063: iconst 6 sconst "Open" iload 9 @@ -2345,8 +2318,8 @@ LABEL2090: sconst "iii" iload 9 if_setonmouseleave - jump LABEL2119 -LABEL2111: + jump LABEL2092 +LABEL2084: iconst -1 sconst "" iload 9 @@ -2355,15 +2328,12 @@ LABEL2111: sconst "" iload 9 if_setonmouseleave -LABEL2119: +LABEL2092: iconst 9 sconst "Clear all" iload 9 if_setop - sconst "" - sconst "Skill guide" - sconst "" - join_string 3 + sconst "Skill guide" iload 9 if_setopbase iconst 7780 @@ -2373,8 +2343,8 @@ LABEL2119: sconst "iii" iload 9 if_setonop - jump LABEL2335 -LABEL2137: + jump LABEL2302 +LABEL2107: sconst "" oload 19 sconst "" @@ -2402,15 +2372,15 @@ LABEL2137: if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL2166 - jump LABEL2171 -LABEL2166: + if_icmpeq LABEL2136 + jump LABEL2141 +LABEL2136: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL2179 -LABEL2171: + jump LABEL2149 +LABEL2141: iconst 6 sconst "Add friend" iload 9 @@ -2419,9 +2389,9 @@ LABEL2171: sconst "Add ignore" iload 9 if_setop -LABEL2179: - jump LABEL2335 -LABEL2180: +LABEL2149: + jump LABEL2302 +LABEL2150: sconst "" oload 19 sconst "" @@ -2449,15 +2419,15 @@ LABEL2180: if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL2209 - jump LABEL2214 -LABEL2209: + if_icmpeq LABEL2179 + jump LABEL2184 +LABEL2179: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL2222 -LABEL2214: + jump LABEL2192 +LABEL2184: iconst 6 sconst "Add friend" iload 9 @@ -2466,9 +2436,9 @@ LABEL2214: sconst "Add ignore" iload 9 if_setop -LABEL2222: - jump LABEL2335 -LABEL2223: +LABEL2192: + jump LABEL2302 +LABEL2193: sconst "" oload 19 sconst "" @@ -2496,15 +2466,15 @@ LABEL2223: if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL2252 - jump LABEL2257 -LABEL2252: + if_icmpeq LABEL2222 + jump LABEL2227 +LABEL2222: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL2265 -LABEL2257: + jump LABEL2235 +LABEL2227: iconst 6 sconst "Add friend" iload 9 @@ -2513,15 +2483,15 @@ LABEL2257: sconst "Add ignore" iload 9 if_setop -LABEL2265: - jump LABEL2335 -LABEL2266: +LABEL2235: + jump LABEL2302 +LABEL2236: oload 25 string_length iconst 0 - if_icmpne LABEL2271 - jump LABEL2322 -LABEL2271: + if_icmpne LABEL2241 + jump LABEL2289 +LABEL2241: oload 25 sconst "CA_ID:" iconst 0 @@ -2529,9 +2499,9 @@ LABEL2271: istore 22 iload 22 iconst -1 - if_icmpne LABEL2280 - jump LABEL2322 -LABEL2280: + if_icmpne LABEL2250 + jump LABEL2289 +LABEL2250: oload 25 iload 22 sconst "CA_ID:" @@ -2552,10 +2522,7 @@ LABEL2280: sconst "Open" iload 9 if_setop - sconst "" - sconst "Task" - sconst "" - join_string 3 + sconst "Task" iload 9 if_setopbase iconst 7821 @@ -2574,9 +2541,9 @@ LABEL2280: sconst "" iload 9 if_setonmouseleave -LABEL2322: - jump LABEL2335 -LABEL2323: +LABEL2289: + jump LABEL2302 +LABEL2290: iconst -1 sconst "" iload 9 @@ -2589,7 +2556,7 @@ LABEL2323: sconst "" iload 9 if_setonmouseleave -LABEL2335: +LABEL2302: iload 6 iload 7 sub @@ -2604,20 +2571,20 @@ LABEL2335: iload 8 enum istore 9 -LABEL2349: +LABEL2316: iload 10 chat_getprevuid istore 10 - jump LABEL411 -LABEL2353: + jump LABEL408 +LABEL2320: iload 8 istore 23 -LABEL2355: +LABEL2322: iload 9 iconst -1 - if_icmpne LABEL2359 - jump LABEL2442 -LABEL2359: + if_icmpne LABEL2326 + jump LABEL2409 +LABEL2326: iload 9 if_clearops iconst -1 @@ -2644,14 +2611,14 @@ LABEL2359: multiply cc_find iconst 1 - if_icmpeq LABEL2387 - jump LABEL2391 -LABEL2387: + if_icmpeq LABEL2354 + jump LABEL2358 +LABEL2354: sconst "" cc_settext iconst 1 cc_sethide -LABEL2391: +LABEL2358: iconst 10616890 iload 8 iconst 4 @@ -2660,14 +2627,14 @@ LABEL2391: add cc_find iconst 1 - if_icmpeq LABEL2401 - jump LABEL2405 -LABEL2401: + if_icmpeq LABEL2368 + jump LABEL2372 +LABEL2368: sconst "" cc_settext iconst 1 cc_sethide -LABEL2405: +LABEL2372: iconst 10616890 iload 8 iconst 4 @@ -2676,14 +2643,14 @@ LABEL2405: add cc_find iconst 1 - if_icmpeq LABEL2415 - jump LABEL2419 -LABEL2415: + if_icmpeq LABEL2382 + jump LABEL2386 +LABEL2382: sconst "" cc_settext iconst 1 cc_sethide -LABEL2419: +LABEL2386: iconst 10616890 iload 8 iconst 4 @@ -2692,12 +2659,12 @@ LABEL2419: add cc_find iconst 1 - if_icmpeq LABEL2429 - jump LABEL2431 -LABEL2429: + if_icmpeq LABEL2396 + jump LABEL2398 +LABEL2396: iconst 1 cc_sethide -LABEL2431: +LABEL2398: iload 8 iconst 1 add @@ -2708,8 +2675,8 @@ LABEL2431: iload 8 enum istore 9 - jump LABEL2355 -LABEL2442: + jump LABEL2322 +LABEL2409: iload 6 iconst 2 sub @@ -2723,20 +2690,20 @@ LABEL2442: istore 24 iload 6 iload 24 - if_icmpgt LABEL2457 - jump LABEL2459 -LABEL2457: + if_icmpgt LABEL2424 + jump LABEL2426 +LABEL2424: iload 6 istore 24 -LABEL2459: +LABEL2426: iload 23 istore 8 -LABEL2461: +LABEL2428: iload 8 iconst 0 - if_icmpgt LABEL2465 - jump LABEL2548 -LABEL2465: + if_icmpgt LABEL2432 + jump LABEL2515 +LABEL2432: iload 8 iconst 1 sub @@ -2767,15 +2734,15 @@ LABEL2465: multiply cc_find iconst 1 - if_icmpeq LABEL2497 - jump LABEL2502 -LABEL2497: + if_icmpeq LABEL2464 + jump LABEL2469 +LABEL2464: cc_getx iload 6 iconst 0 iconst 0 cc_setposition -LABEL2502: +LABEL2469: iconst 10616890 iload 8 iconst 4 @@ -2784,15 +2751,15 @@ LABEL2502: add cc_find iconst 1 - if_icmpeq LABEL2512 - jump LABEL2517 -LABEL2512: + if_icmpeq LABEL2479 + jump LABEL2484 +LABEL2479: cc_getx iload 6 iconst 0 iconst 0 cc_setposition -LABEL2517: +LABEL2484: iconst 10616890 iload 8 iconst 4 @@ -2801,15 +2768,15 @@ LABEL2517: add cc_find iconst 1 - if_icmpeq LABEL2527 - jump LABEL2532 -LABEL2527: + if_icmpeq LABEL2494 + jump LABEL2499 +LABEL2494: cc_getx iload 6 iconst 0 iconst 0 cc_setposition -LABEL2532: +LABEL2499: iconst 10616890 iload 8 iconst 4 @@ -2818,17 +2785,17 @@ LABEL2532: add cc_find iconst 1 - if_icmpeq LABEL2542 - jump LABEL2547 -LABEL2542: + if_icmpeq LABEL2509 + jump LABEL2514 +LABEL2509: cc_getx iload 6 iconst 0 iconst 0 cc_setposition -LABEL2547: - jump LABEL2461 -LABEL2548: +LABEL2514: + jump LABEL2428 +LABEL2515: iconst 0 iload 24 iconst 10616890 diff --git a/runelite-client/src/main/scripts/ChatSend.hash b/runelite-client/src/main/scripts/ChatSend.hash index e36a2d91bec..511f7764487 100644 --- a/runelite-client/src/main/scripts/ChatSend.hash +++ b/runelite-client/src/main/scripts/ChatSend.hash @@ -1 +1 @@ -7E4DE66F2654C0436E1904D959C3479AA36E8C732527ADFF9E6DCCBFDE1207A6 \ No newline at end of file +E79EF98BA67390169CFB92CCB22E56F121E9C7FFAEACFF29762BFA52A9DA1507 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSend.rs2asm b/runelite-client/src/main/scripts/ChatSend.rs2asm index 685257bbd71..ecf7019096c 100644 --- a/runelite-client/src/main/scripts/ChatSend.rs2asm +++ b/runelite-client/src/main/scripts/ChatSend.rs2asm @@ -5,67 +5,65 @@ get_varbit 4394 iconst 1 if_icmpeq LABEL4 - jump LABEL24 + jump LABEL22 LABEL4: iload 0 iconst 1 if_icmpeq LABEL8 - jump LABEL16 + jump LABEL15 LABEL8: chat_playername - sconst ": " - sconst "" + sconst ": " oload 0 sconst "" - join_string 5 + join_string 4 mes - jump LABEL23 -LABEL16: + jump LABEL21 +LABEL15: chat_playername - sconst ": " - sconst "" + sconst ": " oload 0 sconst "" - join_string 5 + join_string 4 mes -LABEL23: +LABEL21: return -LABEL24: +LABEL22: invoke 5262 iconst 0 - if_icmpeq LABEL28 - jump LABEL34 -LABEL28: + if_icmpeq LABEL26 + jump LABEL32 +LABEL26: iload 3 iconst 4 - if_icmpeq LABEL32 - jump LABEL34 -LABEL32: + if_icmpeq LABEL30 + jump LABEL32 +LABEL30: get_varc_int 945 istore 3 -LABEL34: +LABEL32: iload 3 iconst -1 - if_icmpne LABEL38 - jump LABEL75 -LABEL38: + if_icmpne LABEL36 + jump LABEL71 +LABEL36: iload 3 iconst 4 - if_icmple LABEL42 - jump LABEL75 -LABEL42: + if_icmple LABEL40 + jump LABEL71 +LABEL40: iload 3 get_varc_int 945 - if_icmpne LABEL46 - jump LABEL75 -LABEL46: + if_icmpne LABEL44 + jump LABEL71 +LABEL44: iload 3 set_varc_int 945 iload 3 iconst 0 - if_icmpne LABEL52 - jump LABEL66 -LABEL52: + if_icmpne LABEL50 + jump LABEL62 +LABEL50: sconst "Your chatbox mode is now set to " iconst 105 iconst 115 @@ -74,13 +72,11 @@ LABEL52: enum sconst " chat. To reset your mode, type " sconst "" - sconst "/@p" - sconst "" - sconst "." - join_string 7 + sconst "/@p." + join_string 5 mes - jump LABEL75 -LABEL66: + jump LABEL71 +LABEL62: sconst "Your chatbox mode has been reset to " iconst 105 iconst 115 @@ -90,41 +86,41 @@ LABEL66: sconst " chat." join_string 3 mes -LABEL75: +LABEL71: iload 2 iconst 1 - if_icmpeq LABEL79 - jump LABEL99 -LABEL79: + if_icmpeq LABEL75 + jump LABEL95 +LABEL75: get_varc_int 945 switch - 1: LABEL82 - 2: LABEL85 - 3: LABEL90 - 4: LABEL95 - jump LABEL99 -LABEL82: + 1: LABEL78 + 2: LABEL81 + 3: LABEL86 + 4: LABEL91 + jump LABEL95 +LABEL78: iconst 2 istore 0 - jump LABEL99 -LABEL85: + jump LABEL95 +LABEL81: iconst 3 iconst 0 istore 1 istore 0 - jump LABEL99 -LABEL90: + jump LABEL95 +LABEL86: iconst 4 iconst 0 istore 1 istore 0 - jump LABEL99 -LABEL95: + jump LABEL95 +LABEL91: iconst 3 iconst 1 istore 1 istore 0 -LABEL99: +LABEL95: oload 0 ; load input iload 0 ; load chat type iload 1 ; load clan target @@ -141,26 +137,26 @@ CONTINUE: ostore 1 iload 0 switch - 3: LABEL104 - 4: LABEL104 - jump LABEL154 -LABEL104: + 3: LABEL100 + 4: LABEL100 + jump LABEL150 +LABEL100: oload 0 invoke 5501 iconst 1 - if_icmpeq LABEL109 - jump LABEL113 -LABEL109: + if_icmpeq LABEL105 + jump LABEL109 +LABEL105: oload 0 invoke 632 ostore 0 ostore 1 -LABEL113: +LABEL109: iload 1 iconst 1 - if_icmpeq LABEL117 - jump LABEL143 -LABEL117: + if_icmpeq LABEL113 + jump LABEL139 +LABEL113: oload 0 iconst 0 iconst 1 @@ -180,40 +176,40 @@ LABEL117: oload 0 string_length iconst 80 - if_icmpgt LABEL138 - jump LABEL143 -LABEL138: + if_icmpgt LABEL134 + jump LABEL139 +LABEL134: oload 0 iconst 0 iconst 80 substring ostore 0 -LABEL143: +LABEL139: oload 0 string_length iconst 0 - if_icmple LABEL148 - jump LABEL149 -LABEL148: + if_icmple LABEL144 + jump LABEL145 +LABEL144: return -LABEL149: +LABEL145: oload 0 iload 0 iload 1 chat_sendclan - jump LABEL185 -LABEL154: + jump LABEL181 +LABEL150: iload 0 iconst 2 - if_icmpeq LABEL158 - jump LABEL176 -LABEL158: + if_icmpeq LABEL154 + jump LABEL172 +LABEL154: oload 0 string_length iconst 0 - if_icmpgt LABEL163 - jump LABEL176 -LABEL163: + if_icmpgt LABEL159 + jump LABEL172 +LABEL159: oload 0 iconst 0 iconst 1 @@ -221,26 +217,26 @@ LABEL163: sconst "/" compare iconst 0 - if_icmpne LABEL172 - jump LABEL176 -LABEL172: + if_icmpne LABEL168 + jump LABEL172 +LABEL168: sconst "/" oload 0 append ostore 0 -LABEL176: +LABEL172: oload 0 string_length iconst 0 - if_icmple LABEL181 - jump LABEL182 -LABEL181: + if_icmple LABEL177 + jump LABEL178 +LABEL177: return -LABEL182: +LABEL178: oload 0 iload 0 chat_sendpublic -LABEL185: +LABEL181: clientclock set_varc_int 61 return diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.hash b/runelite-client/src/main/scripts/ChatSplitBuilder.hash index 2689161466d..a95c2cb89e2 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.hash +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.hash @@ -1 +1 @@ -6DAD41E416F31EA41FDF389B3A4AE4CFDF0634623BABDA6B2477E1ABEDE7E60C \ No newline at end of file +A92472A08CFFC09992D8C2F0F03E0BDD04FCF442BF412F2641138C52DF645184 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm index 967a123f9ab..b5978035090 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -228,20 +228,20 @@ LABEL177: get_varc_int 55 get_varc_int 202 if_icmpge LABEL210 - jump LABEL342 + jump LABEL339 LABEL210: get_varc_int 55 clientclock iconst 3000 sub if_icmpgt LABEL216 - jump LABEL342 + jump LABEL339 LABEL216: iconst 14 chat_gethistorylength iconst 0 if_icmpgt LABEL221 - jump LABEL342 + jump LABEL339 LABEL221: iconst 14 iconst 0 @@ -257,7 +257,7 @@ LABEL221: iload 12 iconst -1 if_icmpne LABEL236 - jump LABEL342 + jump LABEL339 LABEL236: oload 0 invoke 2066 @@ -270,7 +270,7 @@ LABEL236: reboottimer iconst 0 if_icmple LABEL248 - jump LABEL342 + jump LABEL339 LABEL248: iload 7 oload 2 @@ -346,10 +346,7 @@ LABEL314: sconst "Clear history" iload 10 if_setop - sconst "" - sconst "Notification" - sconst "" - join_string 3 + sconst "Notification" iload 10 if_setopbase iconst 2064 @@ -370,7 +367,7 @@ LABEL314: iload 9 enum istore 10 -LABEL342: +LABEL339: iload 0 istore 12 iconst 0 @@ -379,39 +376,39 @@ LABEL342: istore 19 get_varp 287 iconst 1 - if_icmpeq LABEL352 - jump LABEL594 -LABEL352: + if_icmpeq LABEL349 + jump LABEL589 +LABEL349: get_varc_int 41 iconst 1337 - if_icmpne LABEL359 + if_icmpne LABEL356 get_varbit 4089 iconst 0 - if_icmpeq LABEL359 - jump LABEL594 -LABEL359: + if_icmpeq LABEL356 + jump LABEL589 +LABEL356: invoke 7831 iconst 1 - if_icmpeq LABEL363 - jump LABEL594 -LABEL363: + if_icmpeq LABEL360 + jump LABEL589 +LABEL360: iload 12 iconst -1 - if_icmpne LABEL367 - jump LABEL594 -LABEL367: + if_icmpne LABEL364 + jump LABEL589 +LABEL364: iload 10 iconst -1 - if_icmpne LABEL371 - jump LABEL594 -LABEL371: + if_icmpne LABEL368 + jump LABEL589 +LABEL368: iload 7 iload 4 sub iconst 57 - if_icmplt LABEL377 - jump LABEL594 -LABEL377: + if_icmplt LABEL374 + jump LABEL589 +LABEL374: iload 12 chat_gethistoryex_byuid istore 15 @@ -429,7 +426,7 @@ LABEL377: invoke 91 iconst 1 if_icmpeq CHAT_FILTER ; Jump to our new label instead - jump LABEL590 + jump LABEL585 CHAT_FILTER: oload 0 ; Load the message iconst 1 ; Gets changed to 0 if message is blocked @@ -441,9 +438,9 @@ CHAT_FILTER: pop_int ; Pop the messageType iconst 1 ; 2nd half of conditional ostore 0 ; Override the message with our filtered message - if_icmpeq LABEL395 ; Check if we are building this message - jump LABEL590 -LABEL395: + if_icmpeq LABEL392 ; Check if we are building this message + jump LABEL585 +LABEL392: iconst 1 ; splitpmbox iload 12 ; message uid sconst "" ; message channel @@ -460,12 +457,12 @@ LABEL395: pop_object ; message channel iload 18 switch - 3: LABEL398 - 7: LABEL398 - 6: LABEL427 - 5: LABEL456 - jump LABEL494 -LABEL398: + 3: LABEL395 + 7: LABEL395 + 6: LABEL423 + 5: LABEL451 + jump LABEL489 +LABEL395: iload 7 oload 2 oload 5 @@ -473,9 +470,8 @@ LABEL398: runelite_callback sconst "From " oload 1 - sconst ":" - sconst "" - join_string 5 + sconst ":" + join_string 4 oload 5 invoke 4742 oload 5 @@ -496,8 +492,8 @@ LABEL398: invoke 203 add istore 7 - jump LABEL513 -LABEL427: + jump LABEL508 +LABEL423: iload 7 oload 2 oload 5 @@ -505,9 +501,8 @@ LABEL427: runelite_callback sconst "To " oload 1 - sconst ":" - sconst "" - join_string 5 + sconst ":" + join_string 4 oload 5 invoke 4742 oload 5 @@ -528,8 +523,8 @@ LABEL427: invoke 203 add istore 7 - jump LABEL513 -LABEL456: + jump LABEL508 +LABEL451: iload 7 oload 2 oload 5 @@ -554,9 +549,9 @@ LABEL456: istore 7 iload 19 iconst 0 - if_icmpeq LABEL482 - jump LABEL493 -LABEL482: + if_icmpeq LABEL477 + jump LABEL488 +LABEL477: iload 13 iconst 500 add @@ -568,9 +563,9 @@ LABEL482: sconst "i" iconst 10616832 if_setontimer -LABEL493: - jump LABEL513 -LABEL494: +LABEL488: + jump LABEL508 +LABEL489: iload 7 oload 2 oload 0 @@ -590,31 +585,31 @@ LABEL494: invoke 199 add istore 7 -LABEL513: +LABEL508: iload 10 if_clearops iload 18 iconst 3 - if_icmpeq LABEL525 + if_icmpeq LABEL520 iload 18 iconst 6 - if_icmpeq LABEL525 + if_icmpeq LABEL520 iload 18 iconst 7 - if_icmpeq LABEL525 - jump LABEL568 -LABEL525: + if_icmpeq LABEL520 + jump LABEL563 +LABEL520: iload 14 iconst 1 - if_icmpeq LABEL529 - jump LABEL534 -LABEL529: + if_icmpeq LABEL524 + jump LABEL529 +LABEL524: iconst 7 sconst "Message" iload 10 if_setop - jump LABEL542 -LABEL534: + jump LABEL537 +LABEL529: iconst 7 sconst "Add friend" iload 10 @@ -623,7 +618,7 @@ LABEL534: sconst "Add ignore" iload 10 if_setop -LABEL542: +LABEL537: iconst 9 sconst "Report" iload 10 @@ -631,14 +626,14 @@ LABEL542: oload 1 invoke 2759 iconst 1 - if_icmpeq LABEL551 - jump LABEL555 -LABEL551: + if_icmpeq LABEL546 + jump LABEL550 +LABEL546: iconst 10 sconst "Crown Info" iload 10 if_setop -LABEL555: +LABEL550: sconst "" oload 1 sconst "" @@ -651,13 +646,13 @@ LABEL555: sconst "is" iload 10 if_setonop - jump LABEL572 -LABEL568: + jump LABEL567 +LABEL563: iconst -1 sconst "" iload 10 if_setonop -LABEL572: +LABEL567: iconst -1 sconst "" iload 10 @@ -676,17 +671,17 @@ LABEL572: iload 9 enum istore 10 -LABEL590: +LABEL585: iload 12 chat_getprevuid istore 12 - jump LABEL363 -LABEL594: + jump LABEL360 +LABEL589: iload 10 iconst -1 - if_icmpne LABEL598 - jump LABEL681 -LABEL598: + if_icmpne LABEL593 + jump LABEL676 +LABEL593: iload 10 if_clearops iconst -1 @@ -713,14 +708,14 @@ LABEL598: multiply cc_find iconst 1 - if_icmpeq LABEL626 - jump LABEL630 -LABEL626: + if_icmpeq LABEL621 + jump LABEL625 +LABEL621: sconst "" cc_settext iconst 1 cc_sethide -LABEL630: +LABEL625: iconst 10682368 iload 9 iconst 4 @@ -729,14 +724,14 @@ LABEL630: add cc_find iconst 1 - if_icmpeq LABEL640 - jump LABEL644 -LABEL640: + if_icmpeq LABEL635 + jump LABEL639 +LABEL635: sconst "" cc_settext iconst 1 cc_sethide -LABEL644: +LABEL639: iconst 10682368 iload 9 iconst 4 @@ -745,14 +740,14 @@ LABEL644: add cc_find iconst 1 - if_icmpeq LABEL654 - jump LABEL658 -LABEL654: + if_icmpeq LABEL649 + jump LABEL653 +LABEL649: sconst "" cc_settext iconst 1 cc_sethide -LABEL658: +LABEL653: iconst 10682368 iload 9 iconst 4 @@ -761,12 +756,12 @@ LABEL658: add cc_find iconst 1 - if_icmpeq LABEL668 - jump LABEL670 -LABEL668: + if_icmpeq LABEL663 + jump LABEL665 +LABEL663: iconst 1 cc_sethide -LABEL670: +LABEL665: iload 9 iconst 1 add @@ -777,6 +772,6 @@ LABEL670: iload 9 enum istore 10 - jump LABEL594 -LABEL681: + jump LABEL589 +LABEL676: return diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash index 28a4a31a723..83c6f06b478 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash @@ -1 +1 @@ -731D34761408EE074A436E08A1BCA605B7302243A844B2B6F3471C646C233AF1 \ No newline at end of file +5C2C8897332020947CDFBE802C958888FC54988726320D11AFA2705B3F088608 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm index aa20b5d4651..fbbb4ee4b89 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm @@ -44,7 +44,7 @@ LABEL23: get_varbit 8119 iconst 1 if_icmpeq LABEL40 - jump LABEL167 + jump LABEL165 LABEL40: invoke 3160 iconst 1 @@ -129,36 +129,34 @@ LABEL95: invoke 1353 iconst 1 if_icmpeq LABEL108 - jump LABEL120 + jump LABEL119 LABEL108: iload 2 iconst 79 if_icmplt LABEL112 - jump LABEL119 + jump LABEL118 LABEL112: oload 2 oload 0 - sconst "*" - sconst "" - join_string 3 + sconst "*" + join_string 2 append ostore 2 +LABEL118: + jump LABEL129 LABEL119: - jump LABEL131 -LABEL120: iload 2 iconst 80 - if_icmplt LABEL124 - jump LABEL131 -LABEL124: + if_icmplt LABEL123 + jump LABEL129 +LABEL123: oload 2 oload 0 - sconst "*" - sconst "" - join_string 3 + sconst "*" + join_string 2 append ostore 2 -LABEL131: +LABEL129: oload 2 iconst 2147483647 iconst 495 @@ -167,22 +165,22 @@ LABEL131: iload 3 iconst 10616889 if_getwidth - if_icmpgt LABEL141 - jump LABEL147 -LABEL141: + if_icmpgt LABEL139 + jump LABEL145 +LABEL139: iconst 2 iconst 2 iconst 0 iconst 10616889 if_settextalign - jump LABEL152 -LABEL147: + jump LABEL150 +LABEL145: iconst 0 iconst 2 iconst 0 iconst 10616889 if_settextalign -LABEL152: +LABEL150: iconst 10616889 if_clearops iconst -1 @@ -197,30 +195,30 @@ LABEL152: sconst "" iconst 10616889 if_setonop - jump LABEL226 -LABEL167: + jump LABEL221 +LABEL165: invoke 3160 iconst 1 - if_icmpeq LABEL171 - jump LABEL176 -LABEL171: + if_icmpeq LABEL169 + jump LABEL174 +LABEL169: invoke 7776 sconst " You must set a name before you can chat." join_string 2 ostore 2 - jump LABEL193 -LABEL176: + jump LABEL191 +LABEL174: invoke 5849 iconst 1 - if_icmpeq LABEL180 - jump LABEL185 -LABEL180: + if_icmpeq LABEL178 + jump LABEL183 +LABEL178: sconst "" sconst " You must set a name before you can chat." join_string 2 ostore 2 - jump LABEL193 -LABEL185: + jump LABEL191 +LABEL183: iconst 105 iconst 115 iconst 1894 @@ -229,7 +227,7 @@ LABEL185: sconst " You must set a name before you can chat." join_string 2 ostore 2 -LABEL193: +LABEL191: iconst 1 iconst 2 iconst 0 @@ -239,10 +237,7 @@ LABEL193: sconst "Configure" iconst 10616889 if_setop - sconst "" - sconst "Display name" - sconst "" - join_string 3 + sconst "Display name" iconst 10616889 if_setopbase iconst 45 @@ -263,7 +258,7 @@ LABEL193: sconst "ii" iconst 10616889 if_setonop -LABEL226: +LABEL221: oload 2 iconst 10616889 if_settext diff --git a/runelite-client/src/main/scripts/FriendUpdate.hash b/runelite-client/src/main/scripts/FriendUpdate.hash index eda02c7113f..3521b5a33b6 100644 --- a/runelite-client/src/main/scripts/FriendUpdate.hash +++ b/runelite-client/src/main/scripts/FriendUpdate.hash @@ -1 +1 @@ -B2E07C05C8E50C64230E97A899D3929C67D12D4A7B67AF113A566150F91CC79D \ No newline at end of file +8A39110C4232C6EE422B75300B9B1111FBB9D50E1C2F701BDCE7EF5C4AC2F132 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/FriendUpdate.rs2asm b/runelite-client/src/main/scripts/FriendUpdate.rs2asm index 04ecca4f7ee..f2b693a2dba 100644 --- a/runelite-client/src/main/scripts/FriendUpdate.rs2asm +++ b/runelite-client/src/main/scripts/FriendUpdate.rs2asm @@ -95,68 +95,56 @@ iload 17 iconst -2 if_icmple LABEL88 - jump LABEL109 + jump LABEL103 LABEL88: get_varbit 8119 iconst 1 if_icmpeq LABEL92 - jump LABEL99 + jump LABEL96 LABEL92: - sconst "Loading friends list" - sconst "
" - sconst "Please wait..." - join_string 3 + sconst "Loading friends list
Please wait..." iload 7 if_settext - jump LABEL105 -LABEL99: - sconst "You must set a name" - sconst "
" - sconst "before using this." - join_string 3 + jump LABEL99 +LABEL96: + sconst "You must set a name
before using this." iload 7 if_settext -LABEL105: +LABEL99: iconst 1 iload 0 if_sethide - jump LABEL509 -LABEL109: + jump LABEL494 +LABEL103: iload 17 iconst -1 - if_icmpeq LABEL113 - jump LABEL134 -LABEL113: + if_icmpeq LABEL107 + jump LABEL122 +LABEL107: get_varbit 8119 iconst 1 - if_icmpeq LABEL117 - jump LABEL124 -LABEL117: - sconst "Loading friends list" - sconst "
" - sconst "Please wait..." - join_string 3 + if_icmpeq LABEL111 + jump LABEL115 +LABEL111: + sconst "Loading friends list
Please wait..." iload 7 if_settext - jump LABEL130 -LABEL124: - sconst "You must set a name" - sconst "
" - sconst "before using this." - join_string 3 + jump LABEL118 +LABEL115: + sconst "You must set a name
before using this." iload 7 if_settext -LABEL130: +LABEL118: iconst 1 iload 0 if_sethide - jump LABEL509 -LABEL134: + jump LABEL494 +LABEL122: iload 17 iconst 0 - if_icmpeq LABEL138 - jump LABEL150 -LABEL138: + if_icmpeq LABEL126 + jump LABEL138 +LABEL126: sconst "You may add friends by using the button below, or by " sconst "right-clicking" sconst "long pressing" @@ -168,21 +156,21 @@ LABEL138: iconst 1 iload 0 if_sethide - jump LABEL509 -LABEL150: + jump LABEL494 +LABEL138: invoke 1972 istore 14 iload 14 iconst 1 - if_icmpeq LABEL156 - jump LABEL161 -LABEL156: + if_icmpeq LABEL144 + jump LABEL149 +LABEL144: iconst 8 iconst 5 iload 13 scale istore 13 -LABEL161: +LABEL149: sconst "" iload 7 if_settext @@ -192,43 +180,43 @@ LABEL161: 3628 get_varc_int 183 switch - 1: LABEL171 - 2: LABEL174 - 3: LABEL179 - 8: LABEL184 - 9: LABEL189 - 4: LABEL194 - 5: LABEL214 - jump LABEL233 -LABEL171: + 1: LABEL159 + 2: LABEL162 + 3: LABEL167 + 8: LABEL172 + 9: LABEL177 + 4: LABEL182 + 5: LABEL202 + jump LABEL221 +LABEL159: iconst 0 3629 - jump LABEL233 -LABEL174: + jump LABEL221 +LABEL162: iconst 1 3633 iconst 1 3630 - jump LABEL233 -LABEL179: + jump LABEL221 +LABEL167: iconst 1 3633 iconst 0 3630 - jump LABEL233 -LABEL184: + jump LABEL221 +LABEL172: iconst 1 3633 iconst 1 3632 - jump LABEL233 -LABEL189: + jump LABEL221 +LABEL177: iconst 1 3633 iconst 0 3632 - jump LABEL233 -LABEL194: + jump LABEL221 +LABEL182: iconst 1 3633 iconst 1 @@ -237,26 +225,26 @@ LABEL194: 3631 get_varc_int 205 switch - 3: LABEL205 - 8: LABEL208 - 9: LABEL211 + 3: LABEL193 + 8: LABEL196 + 9: LABEL199 iconst 1 3630 - jump LABEL213 -LABEL205: + jump LABEL201 +LABEL193: iconst 0 3630 - jump LABEL213 -LABEL208: + jump LABEL201 +LABEL196: iconst 1 3632 - jump LABEL213 -LABEL211: + jump LABEL201 +LABEL199: iconst 0 3632 -LABEL213: - jump LABEL233 -LABEL214: +LABEL201: + jump LABEL221 +LABEL202: iconst 1 3633 iconst 1 @@ -265,31 +253,31 @@ LABEL214: 3631 get_varc_int 205 switch - 3: LABEL225 - 8: LABEL228 - 9: LABEL231 + 3: LABEL213 + 8: LABEL216 + 9: LABEL219 iconst 1 3630 - jump LABEL233 -LABEL225: + jump LABEL221 +LABEL213: iconst 0 3630 - jump LABEL233 -LABEL228: + jump LABEL221 +LABEL216: iconst 1 3632 - jump LABEL233 -LABEL231: + jump LABEL221 +LABEL219: iconst 0 3632 -LABEL233: +LABEL221: 3639 -LABEL234: +LABEL222: iload 9 iload 17 - if_icmplt LABEL238 - jump LABEL501 -LABEL238: + if_icmplt LABEL226 + jump LABEL486 +LABEL226: iload 9 friend_getname ostore 1 @@ -337,9 +325,9 @@ LABEL238: istore 11 iload 11 iconst 0 - if_icmpne LABEL285 - jump LABEL307 -LABEL285: + if_icmpne LABEL273 + jump LABEL295 +LABEL273: iconst 1 sconst "Message" cc_setop @@ -348,32 +336,32 @@ LABEL285: cc_setop iload 15 iconst 1 - if_icmpeq LABEL295 - jump LABEL303 -LABEL295: + if_icmpeq LABEL283 + jump LABEL291 +LABEL283: iload 16 iload 11 - if_icmpne LABEL299 - jump LABEL303 -LABEL299: + if_icmpne LABEL287 + jump LABEL291 +LABEL287: iconst 4 sconst "Switch world" cc_setop - jump LABEL306 -LABEL303: + jump LABEL294 +LABEL291: iconst 4 sconst "" cc_setop -LABEL306: - jump LABEL313 -LABEL307: +LABEL294: + jump LABEL301 +LABEL295: iconst 1 sconst "" cc_setop iconst 2 sconst "Message" cc_setop -LABEL313: +LABEL301: iconst 3 sconst "Delete" cc_setop @@ -416,14 +404,14 @@ LABEL313: oload 1 string_length iconst 0 - if_icmpgt LABEL355 - jump LABEL406 -LABEL355: + if_icmpgt LABEL343 + jump LABEL393 +LABEL343: iload 14 iconst 1 - if_icmpeq LABEL359 - jump LABEL374 -LABEL359: + if_icmpeq LABEL347 + jump LABEL362 +LABEL347: iconst 10 sconst "Reveal previous name" cc_setop @@ -438,12 +426,11 @@ LABEL359: iload 11 sconst "isiiissi" cc_setonop - jump LABEL403 -LABEL374: - sconst "Previous name:" - sconst "
" + jump LABEL390 +LABEL362: + sconst "Previous name:
" oload 1 - join_string 3 + join_string 2 ostore 1 iconst 526 iconst -2147483645 @@ -469,11 +456,11 @@ LABEL374: iload 11 sconst "isiiissi" cc_setonop -LABEL403: +LABEL390: iconst 0 cc_sethide 1 - jump LABEL423 -LABEL406: + jump LABEL410 +LABEL393: iconst 40 iload 8 sconst "i" @@ -491,7 +478,7 @@ LABEL406: iload 11 sconst "isiiissi" cc_setonop -LABEL423: +LABEL410: iload 5 iconst 4 iload 10 @@ -521,20 +508,20 @@ LABEL423: cc_settextshadow iload 11 iconst 0 - if_icmpeq LABEL454 - jump LABEL459 -LABEL454: + if_icmpeq LABEL441 + jump LABEL446 +LABEL441: sconst "Offline" cc_settext iconst 16711680 cc_setcolour - jump LABEL492 -LABEL459: + jump LABEL477 +LABEL446: iload 11 map_world - if_icmpeq LABEL463 - jump LABEL471 -LABEL463: + if_icmpeq LABEL450 + jump LABEL458 +LABEL450: sconst "World " iload 11 tostring @@ -542,33 +529,31 @@ LABEL463: cc_settext iconst 901389 cc_setcolour - jump LABEL492 -LABEL471: + jump LABEL477 +LABEL458: iload 11 iconst 5000 - if_icmpgt LABEL475 - jump LABEL484 -LABEL475: - sconst "" - sconst "Classic " + if_icmpgt LABEL462 + jump LABEL470 +LABEL462: + sconst "Classic " iload 11 iconst 5000 sub tostring - join_string 3 + join_string 2 cc_settext - jump LABEL490 -LABEL484: - sconst "" - sconst "World " + jump LABEL475 +LABEL470: + sconst "World " iload 11 tostring - join_string 3 + join_string 2 cc_settext -LABEL490: +LABEL475: iconst 16776960 cc_setcolour -LABEL492: +LABEL477: iload 9 iconst 1 add @@ -577,24 +562,24 @@ LABEL492: add istore 12 istore 9 - jump LABEL234 -LABEL501: + jump LABEL222 +LABEL486: iload 17 iconst 1 - if_icmpge LABEL505 - jump LABEL509 -LABEL505: + if_icmpge LABEL490 + jump LABEL494 +LABEL490: iload 12 iconst 5 add istore 12 -LABEL509: +LABEL494: iload 12 iload 5 if_getheight - if_icmpgt LABEL514 - jump LABEL523 -LABEL514: + if_icmpgt LABEL499 + jump LABEL508 +LABEL499: iconst 0 iload 12 iload 5 @@ -603,8 +588,8 @@ LABEL514: iload 5 get_varc_int 9 invoke 72 - jump LABEL531 -LABEL523: + jump LABEL516 +LABEL508: iconst 0 iconst 0 iload 5 @@ -613,5 +598,5 @@ LABEL523: iload 5 iconst 0 invoke 72 -LABEL531: +LABEL516: return diff --git a/runelite-client/src/main/scripts/GeExamineInfoText.hash b/runelite-client/src/main/scripts/GeExamineInfoText.hash index 904daaf9aa5..5dba52ab07c 100644 --- a/runelite-client/src/main/scripts/GeExamineInfoText.hash +++ b/runelite-client/src/main/scripts/GeExamineInfoText.hash @@ -1 +1 @@ -2D501130CBECE642CD81D5FFC6931C6B9D260A7C4C2118A1DEF858FCDB676E68 \ No newline at end of file +F3FC61F873090BBACF1525EE36EE7DA16F76CE12CA51F5852F776CF8D6072D03 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/GeExamineInfoText.rs2asm b/runelite-client/src/main/scripts/GeExamineInfoText.rs2asm index 2f91edd8e52..04dd728efa9 100644 --- a/runelite-client/src/main/scripts/GeExamineInfoText.rs2asm +++ b/runelite-client/src/main/scripts/GeExamineInfoText.rs2asm @@ -22,7 +22,7 @@ string_length iconst 0 if_icmpgt LABEL15 - jump LABEL149 + jump LABEL148 LABEL15: iload 0 if_getwidth @@ -34,7 +34,7 @@ LABEL15: LABEL22: oload 0 ostore 2 - jump LABEL44 + jump LABEL43 LABEL25: oload 0 iload 2 @@ -42,22 +42,21 @@ LABEL25: paraheight iconst 2 if_icmple LABEL32 - jump LABEL39 + jump LABEL38 LABEL32: oload 0 - sconst "
" - sconst "
" + sconst "

" oload 1 - join_string 4 + join_string 3 ostore 2 - jump LABEL44 -LABEL39: + jump LABEL43 +LABEL38: oload 0 sconst "
" oload 1 join_string 3 ostore 2 -LABEL44: +LABEL43: oload 0 ; examine oload 1 ; Convenience fee @@ -116,14 +115,14 @@ LABEL44: if_setposition invoke 6811 iconst 1 - if_icmpeq LABEL94 - jump LABEL98 -LABEL94: + if_icmpeq LABEL93 + jump LABEL97 +LABEL93: iconst 1 iload 1 if_sethide - jump LABEL148 -LABEL98: + jump LABEL147 +LABEL97: iconst 0 iload 1 if_sethide @@ -174,9 +173,9 @@ LABEL98: sconst "Info" iload 1 if_setop +LABEL147: + jump LABEL169 LABEL148: - jump LABEL170 -LABEL149: oload 0 ostore 2 @@ -208,7 +207,7 @@ LABEL149: if_setonop iload 1 if_clearops -LABEL170: +LABEL169: oload 2 iload 0 if_settext diff --git a/runelite-client/src/main/scripts/IgnoreUpdate.hash b/runelite-client/src/main/scripts/IgnoreUpdate.hash index 93bc626380d..f71a41aedb9 100644 --- a/runelite-client/src/main/scripts/IgnoreUpdate.hash +++ b/runelite-client/src/main/scripts/IgnoreUpdate.hash @@ -1 +1 @@ -C4CC4E6FBAD1910AD132D4E484DCBFA269CAED7C5C32D1834660E3D2DFFA2DF7 \ No newline at end of file +10C829E6E070C469449768A8582F238D7C7E9CF9F334E27632E51F777A5EA401 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm index d57b341d4c1..d0aae59b05a 100644 --- a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm +++ b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm @@ -53,38 +53,32 @@ iload 12 iconst 0 if_icmplt LABEL46 - jump LABEL67 + jump LABEL61 LABEL46: get_varbit 8119 iconst 1 if_icmpeq LABEL50 - jump LABEL57 + jump LABEL54 LABEL50: - sconst "Loading ignore list" - sconst "
" - sconst "Please wait..." - join_string 3 + sconst "Loading ignore list
Please wait..." iload 5 if_settext - jump LABEL63 -LABEL57: - sconst "You must set a name" - sconst "
" - sconst "before using this." - join_string 3 + jump LABEL57 +LABEL54: + sconst "You must set a name
before using this." iload 5 if_settext -LABEL63: +LABEL57: iconst 1 iload 0 if_sethide - jump LABEL281 -LABEL67: + jump LABEL274 +LABEL61: iload 12 iconst 0 - if_icmpeq LABEL71 - jump LABEL83 -LABEL71: + if_icmpeq LABEL65 + jump LABEL77 +LABEL65: sconst "You may ignore users by using the button below, or by " sconst "right-clicking" sconst "long pressing" @@ -96,21 +90,21 @@ LABEL71: iconst 1 iload 0 if_sethide - jump LABEL281 -LABEL83: + jump LABEL274 +LABEL77: invoke 1972 istore 11 iload 11 iconst 1 - if_icmpeq LABEL89 - jump LABEL94 -LABEL89: + if_icmpeq LABEL83 + jump LABEL88 +LABEL83: iconst 8 iconst 5 iload 10 scale istore 10 -LABEL94: +LABEL88: sconst "" iload 5 if_settext @@ -120,29 +114,29 @@ LABEL94: 3640 get_varc_int 184 switch - 1: LABEL104 - 2: LABEL107 - 3: LABEL110 - jump LABEL112 -LABEL104: + 1: LABEL98 + 2: LABEL101 + 3: LABEL104 + jump LABEL106 +LABEL98: iconst 0 3641 - jump LABEL112 -LABEL107: + jump LABEL106 +LABEL101: iconst 1 3642 - jump LABEL112 -LABEL110: + jump LABEL106 +LABEL104: iconst 0 3642 -LABEL112: +LABEL106: 3643 -LABEL113: +LABEL107: iload 7 iload 12 - if_icmplt LABEL117 - jump LABEL273 -LABEL117: + if_icmplt LABEL111 + jump LABEL266 +LABEL111: iload 7 ignore_getname ostore 1 @@ -227,14 +221,14 @@ LABEL117: oload 1 string_length iconst 0 - if_icmpgt LABEL199 - jump LABEL248 -LABEL199: + if_icmpgt LABEL193 + jump LABEL241 +LABEL193: iload 11 iconst 1 - if_icmpeq LABEL203 - jump LABEL217 -LABEL203: + if_icmpeq LABEL197 + jump LABEL211 +LABEL197: iconst 10 sconst "Reveal previous name" cc_setop @@ -248,12 +242,11 @@ LABEL203: oload 0 sconst "isiiiss" cc_setonop - jump LABEL245 -LABEL217: - sconst "Previous name:" - sconst "
" + jump LABEL238 +LABEL211: + sconst "Previous name:
" oload 1 - join_string 3 + join_string 2 ostore 1 iconst 526 iconst -2147483645 @@ -278,11 +271,11 @@ LABEL217: sconst "null" sconst "isiiiss" cc_setonop -LABEL245: +LABEL238: iconst 0 cc_sethide 1 - jump LABEL264 -LABEL248: + jump LABEL257 +LABEL241: iconst 40 iload 6 sconst "i" @@ -299,7 +292,7 @@ LABEL248: sconst "null" sconst "isiiiss" cc_setonop -LABEL264: +LABEL257: iload 7 iconst 1 add @@ -308,24 +301,24 @@ LABEL264: add istore 9 istore 7 - jump LABEL113 -LABEL273: + jump LABEL107 +LABEL266: iload 12 iconst 1 - if_icmpge LABEL277 - jump LABEL281 -LABEL277: + if_icmpge LABEL270 + jump LABEL274 +LABEL270: iload 9 iconst 5 add istore 9 -LABEL281: +LABEL274: iload 9 iload 3 if_getheight - if_icmpgt LABEL286 - jump LABEL296 -LABEL286: + if_icmpgt LABEL279 + jump LABEL289 +LABEL279: iconst 0 iload 9 iload 3 @@ -335,8 +328,8 @@ LABEL286: iload 3 if_getscrolly invoke 72 - jump LABEL304 -LABEL296: + jump LABEL297 +LABEL289: iconst 0 iconst 0 iload 3 @@ -345,5 +338,5 @@ LABEL296: iload 3 iconst 0 invoke 72 -LABEL304: +LABEL297: return diff --git a/runelite-client/src/main/scripts/SkillTabBuilder.hash b/runelite-client/src/main/scripts/SkillTabBuilder.hash index 33e0faad01d..74c7c7f1815 100644 --- a/runelite-client/src/main/scripts/SkillTabBuilder.hash +++ b/runelite-client/src/main/scripts/SkillTabBuilder.hash @@ -1 +1 @@ -D8934D27F70A288BCEA8103E6DE30399565A0DBFF6B331AC12D60BA6228A861C \ No newline at end of file +75423D395E8A04512D55836D83B8E98B3FFAAF2114520C0935D0AE626626B614 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm index 5b4574cf007..9b9b97c2ff8 100644 --- a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm +++ b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm @@ -132,7 +132,7 @@ LABEL104: invoke 1138 iconst 0 if_icmpne LABEL116 - jump LABEL326 + jump LABEL316 LABEL116: iload 0 invoke 1936 @@ -140,7 +140,7 @@ LABEL116: iload 7 iconst -1 if_icmpne LABEL123 - jump LABEL157 + jump LABEL156 LABEL123: iload 7 iconst 10 @@ -149,16 +149,15 @@ LABEL123: iload 7 iload 5 if_icmpgt LABEL131 - jump LABEL157 + jump LABEL156 LABEL131: oload 2 sconst "|" sconst "" sconst "" invoke 6850 - sconst "XP to regain:" - sconst "" - join_string 4 + sconst "XP to regain:" + join_string 3 append ostore 2 oload 3 @@ -177,42 +176,41 @@ LABEL131: ostore 3 iconst 1 istore 8 -LABEL157: +LABEL156: iload 8 iconst 0 - if_icmpeq LABEL161 - jump LABEL326 -LABEL161: + if_icmpeq LABEL160 + jump LABEL316 +LABEL160: get_varp 1588 iconst 0 - if_icmpgt LABEL165 - jump LABEL326 -LABEL165: + if_icmpgt LABEL164 + jump LABEL316 +LABEL164: iload 0 switch - 0: LABEL168 - 2: LABEL168 - 6: LABEL168 - 4: LABEL221 - 1: LABEL274 - jump LABEL326 -LABEL168: + 0: LABEL167 + 2: LABEL167 + 6: LABEL167 + 4: LABEL217 + 1: LABEL267 + jump LABEL316 +LABEL167: iconst 20 invoke 2031 istore 10 iload 10 iconst 0 - if_icmpgt LABEL175 - jump LABEL198 -LABEL175: + if_icmpgt LABEL174 + jump LABEL196 +LABEL174: oload 2 sconst "|" sconst "" sconst "" invoke 6850 - sconst "XP permitted:" - sconst "" - join_string 4 + sconst "XP permitted:" + join_string 3 append ostore 2 oload 3 @@ -227,8 +225,8 @@ LABEL175: join_string 4 append ostore 3 - jump LABEL220 -LABEL198: + jump LABEL216 +LABEL196: iconst 1 istore 9 oload 2 @@ -236,9 +234,8 @@ LABEL198: sconst "" sconst "" invoke 6850 - sconst "XP permitted:" - sconst "" - join_string 4 + sconst "XP permitted:" + join_string 3 append ostore 2 oload 3 @@ -246,30 +243,28 @@ LABEL198: sconst "" sconst "" invoke 6850 - sconst "NONE" - sconst "" - join_string 4 + sconst "NONE" + join_string 3 append ostore 3 -LABEL220: - jump LABEL326 -LABEL221: +LABEL216: + jump LABEL316 +LABEL217: iconst 30 invoke 2031 istore 10 iload 10 iconst 0 - if_icmpgt LABEL228 - jump LABEL251 -LABEL228: + if_icmpgt LABEL224 + jump LABEL246 +LABEL224: oload 2 sconst "|" sconst "" sconst "" invoke 6850 - sconst "XP permitted:" - sconst "" - join_string 4 + sconst "XP permitted:" + join_string 3 append ostore 2 oload 3 @@ -284,8 +279,8 @@ LABEL228: join_string 4 append ostore 3 - jump LABEL273 -LABEL251: + jump LABEL266 +LABEL246: iconst 1 istore 9 oload 2 @@ -293,9 +288,8 @@ LABEL251: sconst "" sconst "" invoke 6850 - sconst "XP permitted:" - sconst "" - join_string 4 + sconst "XP permitted:" + join_string 3 append ostore 2 oload 3 @@ -303,30 +297,28 @@ LABEL251: sconst "" sconst "" invoke 6850 - sconst "NONE" - sconst "" - join_string 4 + sconst "NONE" + join_string 3 append ostore 3 -LABEL273: - jump LABEL326 -LABEL274: +LABEL266: + jump LABEL316 +LABEL267: iconst 40 invoke 2031 istore 10 iload 10 iconst 0 - if_icmpgt LABEL281 - jump LABEL304 -LABEL281: + if_icmpgt LABEL274 + jump LABEL296 +LABEL274: oload 2 sconst "|" sconst "" sconst "" invoke 6850 - sconst "XP permitted:" - sconst "" - join_string 4 + sconst "XP permitted:" + join_string 3 append ostore 2 oload 3 @@ -341,8 +333,8 @@ LABEL281: join_string 4 append ostore 3 - jump LABEL326 -LABEL304: + jump LABEL316 +LABEL296: iconst 1 istore 9 oload 2 @@ -350,9 +342,8 @@ LABEL304: sconst "" sconst "" invoke 6850 - sconst "XP permitted:" - sconst "" - join_string 4 + sconst "XP permitted:" + join_string 3 append ostore 2 oload 3 @@ -360,33 +351,32 @@ LABEL304: sconst "" sconst "" invoke 6850 - sconst "NONE" - sconst "" - join_string 4 + sconst "NONE" + join_string 3 append ostore 3 -LABEL326: +LABEL316: iload 1 iconst 6 cc_find 1 iconst 1 - if_icmpeq LABEL332 - jump LABEL342 -LABEL332: + if_icmpeq LABEL322 + jump LABEL332 +LABEL322: iload 9 iconst 1 - if_icmpeq LABEL336 - jump LABEL339 -LABEL336: + if_icmpeq LABEL326 + jump LABEL329 +LABEL326: iconst 0 cc_sethide 1 - jump LABEL341 -LABEL339: + jump LABEL331 +LABEL329: iconst 1 cc_sethide 1 -LABEL341: - jump LABEL370 -LABEL342: +LABEL331: + jump LABEL360 +LABEL332: iload 1 iconst 5 iconst 6 @@ -408,48 +398,44 @@ LABEL342: cc_setgraphicshadow 1 iload 9 iconst 1 - if_icmpeq LABEL365 - jump LABEL368 -LABEL365: + if_icmpeq LABEL355 + jump LABEL358 +LABEL355: iconst 0 cc_sethide 1 - jump LABEL370 -LABEL368: + jump LABEL360 +LABEL358: iconst 1 cc_sethide 1 -LABEL370: +LABEL360: iload 3 iconst 1 - if_icmpeq LABEL374 - jump LABEL393 -LABEL374: + if_icmpeq LABEL364 + jump LABEL379 +LABEL364: map_members iconst 0 - if_icmpeq LABEL378 - jump LABEL393 -LABEL378: + if_icmpeq LABEL368 + jump LABEL379 +LABEL368: get_varc_int 103 iconst 0 - if_icmpeq LABEL382 - jump LABEL393 -LABEL382: + if_icmpeq LABEL372 + jump LABEL379 +LABEL372: sconst "" oload 0 - sconst ":" - sconst "" - join_string 4 - ostore 2 - sconst "" - sconst "Members Only" - sconst "" + sconst ":" join_string 3 + ostore 2 + sconst "Members Only" ostore 3 -LABEL393: +LABEL379: invoke 1972 iconst 1 - if_icmpeq LABEL397 - jump LABEL424 -LABEL397: + if_icmpeq LABEL383 + jump LABEL410 +LABEL383: iconst 2367 iconst -2147483644 iconst -2147483645 @@ -463,14 +449,14 @@ LABEL397: if_setonop get_varc_int 218 iload 1 - if_icmpeq LABEL412 - jump LABEL423 -LABEL412: + if_icmpeq LABEL398 + jump LABEL409 +LABEL398: get_varc_int 217 iconst -1 - if_icmpeq LABEL416 - jump LABEL423 -LABEL416: + if_icmpeq LABEL402 + jump LABEL409 +LABEL402: iload 1 iconst -1 iload 2 @@ -478,9 +464,9 @@ LABEL416: oload 3 iconst 495 invoke 2344 -LABEL423: - jump LABEL439 -LABEL424: +LABEL409: + jump LABEL425 +LABEL410: iconst 992 iconst -2147483645 iconst -1 @@ -496,5 +482,5 @@ LABEL424: if_setonmouserepeat iconst 0 set_varc_int 2 -LABEL439: +LABEL425: return