diff --git a/gradle.properties b/gradle.properties index 813b1934873..5b8419aa6ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,10 +28,10 @@ org.gradle.parallel=true org.gradle.caching=false project.build.group=net.runelite -project.build.version=1.12.15 +project.build.version=1.12.16 glslang.path= -microbot.version=2.1.17 +microbot.version=2.1.18 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/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 4d227ec4729..8de43b4aacf 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -13015,5 +13015,8 @@ public final class NpcID public static final int ZEMOUREGAL_15564 = 15564; public static final int GUARD_15566 = 15566; public static final int GUARD_15568 = 15568; + public static final int KETZEK_15572 = 15572; + public static final int KETZEK_15573 = 15573; + public static final int TZTOKJAD_15574 = 15574; /* 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 8f456f33f43..c1b5ade3286 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -16634,5 +16634,7 @@ public final class NullItemID public static final int NULL_33073 = 33073; public static final int NULL_33075 = 33075; public static final int NULL_33076 = 33076; + public static final int NULL_33078 = 33078; + public static final int NULL_33079 = 33079; /* 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/gameval/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java index b9a1467e74d..967aca8d874 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java @@ -13715,5 +13715,6 @@ public final class AnimationID public static final int DEADMAN_2026_SOTD_SPECIAL_TOXIC_UNCHARGED = 13715; public static final int DEADMAN_2026_SOTD_SPECIAL_TOXIC_CHARGED = 13716; public static final int ZUK_SPAWN_NO_ROCK = 13717; + public static final int FEVER_SPIDER_DEATH = 13718; /* 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 9f744990840..376141b2449 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 @@ -9463,15 +9463,20 @@ public static final class SlayerTask */ public static final int COL_EXTENSION_MIN_MAX = 15; + /** + * (dbrow, integer, integer) + */ + public static final int COL_EXTENSION_ADDITIVE = 16; + /** * dbrow */ - public static final int COL_BLOCK_UNLOCK = 16; + public static final int COL_BLOCK_UNLOCK = 17; /** * integer */ - public static final int COL_RELATED_CONTENT = 17; + public static final int COL_RELATED_CONTENT = 18; public static final class Row { @@ -10033,6 +10038,11 @@ public static final class SlayerArea */ public static final int COL_AREA_NAME_IN_HELPER = 3; + /** + * string + */ + public static final int COL_AREA_HINT = 4; + /** * integer */ @@ -10262,6 +10272,7 @@ public static final class Row public static final int SLAYER_REWARDS_LONGER_WYRMS = 9419; public static final int SLAYER_REWARDS_UNLOCK_GRYPHONS = 9420; public static final int SLAYER_REWARDS_UNLOCK_HELM_HOODED = 9641; + public static final int SLAYER_REWARDS_LONGER_GRYPHONS = 9642; } } @@ -14766,6 +14777,11 @@ public static final class SailingDock */ public static final int COL_LEVEL_REQUIRED = 4; + /** + * dbrow + */ + public static final int COL_QUEST_REQUIRED = 5; + /** * graphic */ 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 b0df4d317e2..d7dd56f4ed4 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 @@ -953,6 +953,7 @@ public final class InterfaceID public static final int PATCHY = 946; public static final int MENU_NEW = 947; public static final int DEADMANSKULL_INTERFACE = 948; + public static final int QUETZALWHISTLE_MENU = 949; public static final class _100GuideEggsOverlay { @@ -30844,5 +30845,28 @@ public static final class DeadmanskullInterface public static final int RESIZE_PREVIEW = 0x03b4_000e; public static final int TOOLTIP = 0x03b4_000f; } + + public static final class QuetzalwhistleMenu + { + public static final int UNIVERSE = 0x03b5_0000; + public static final int CONTENTS = 0x03b5_0001; + public static final int BACKGROUND = 0x03b5_0002; + public static final int SCROLL = 0x03b5_0003; + public static final int MAP = 0x03b5_0004; + public static final int BACKGROUND_MODEL2 = 0x03b5_0005; + public static final int BACKGROUND_MODEL3 = 0x03b5_0006; + public static final int BACKGROUND_MODEL4 = 0x03b5_0007; + public static final int BACKGROUND_MODEL5 = 0x03b5_0008; + public static final int BACKGROUND_MODEL6 = 0x03b5_0009; + public static final int BACKGROUND_MODEL7 = 0x03b5_000a; + public static final int BACKGROUND_MODEL8 = 0x03b5_000b; + public static final int ICONS = 0x03b5_000c; + public static final int CURRENT = 0x03b5_000d; + public static final int SELECTED_BACK = 0x03b5_000e; + public static final int SELECTED_FRONT = 0x03b5_000f; + public static final int SELECTED_LOCKED = 0x03b5_0010; + public static final int SELECTED_CURRENT = 0x03b5_0011; + public static final int CLOSE = 0x03b5_0012; + } /* This file is automatically generated. Do not edit. */ } 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 fc5d9fb18d0..170f664dc4c 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 @@ -91217,6 +91217,8 @@ public static final class Cert public static final int MAGIC_ROCK_OF_FORTUITY_INACTIVE = 33048; public static final int MAGIC_ROCK_OF_FORTUITY_ACTIVE = 33051; public static final int SAILING_FACILITY_BOTTLE_EMPTY = 33075; + public static final int BREW_RED_RUM = 33078; + public static final int BREW_BLUE_RUM = 33079; } 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 e23bab2d087..9e1b1f5d4e2 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 @@ -67696,5 +67696,20 @@ public final class NpcID public static final int DEADMAN_THRALL_ZOMBIE_GREATER_ZUK = 15569; public static final int DEADMAN_THRALL_SKELETAL_GREATER_PRINCESS = 15570; public static final int DEADMAN_THRALL_GHOSTLY_GREATER_WISP = 15571; + + /** + * Ket-Zek + */ + public static final int TZHAAR_FIGHTPIT_SWARM_4A = 15572; + + /** + * Ket-Zek + */ + public static final int TZHAAR_FIGHTPIT_SWARM_4B = 15573; + + /** + * TzTok-Jad + */ + public static final int TZHAAR_FIGHTPIT_SWARM_BOSS = 15574; /* 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 77abef8d147..1d71ae1cada 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 @@ -13897,6 +13897,7 @@ public final class VarbitID public static final int DEADMAN_2026_INITIAL_SETUP_DONE = 19678; public static final int DEADMAN_2026_TUTORIAL_END = 19679; public static final int DEADMAN_2026_TUTORIAL_TELEPORT_DEST = 19680; + public static final int SETTINGS_QUETZALWHISTLE_DEFAULT_TP = 19681; public static final int DEADMAN_SKULL_TAB = 19682; public static final int SIGIL_OF_AGILE_FORTUNE_STATE = 19683; public static final int SIGIL_OF_HOARDING_STATE = 19684; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java index 60204c5495c..e1b0dd33201 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java @@ -2030,7 +2030,7 @@ public class CrypticClue extends ClueScroll implements NpcClueScroll, ObjectClue CrypticClue.builder() .itemId(ItemID.TRAIL_ELITE_RIDDLE_SAIL) .text("Their bane awaits, but don't be going in there without permission.") - .location(new WorldPoint(3120, 2424, 0)) + .location(new WorldPoint(3176, 2478, 0)) .npc("Shellbane gryphon") .solution("Kill the shellbane gryphon.") .build(), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/reflection/Rs2Reflection.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/reflection/Rs2Reflection.java index 96cf07c1dfd..36b025f4169 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/reflection/Rs2Reflection.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/reflection/Rs2Reflection.java @@ -32,7 +32,7 @@ public static void invokeMenu(int param0, int param1, int opcode, int identifier { if (menuAction == null) { - final String MENU_ACTION_DESCRIPTOR_VANILLA = "(IIIIIILjava/lang/String;Ljava/lang/String;IIB)V"; + final String MENU_ACTION_DESCRIPTOR_VANILLA = "(IIIIIILjava/lang/String;Ljava/lang/String;III)V"; final String MENU_ACTION_DESCRIPTOR_RUNELITE = "(IILnet/runelite/api/MenuAction;IILjava/lang/String;Ljava/lang/String;)V"; final Class clientClazz = Microbot.getClient().getClass(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/Ping.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/Ping.java index 8dccc36488e..8c11174ab33 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/Ping.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/Ping.java @@ -98,14 +98,10 @@ public static int ping(World world, boolean useTcpPing) catch (IOException ex) { log.debug("error during icmp ping", ex); - } - // FALLTHROUGH - default: - if (useTcpPing) - { return tcpPing(inetAddress); } - return -1; + default: + return tcpPing(inetAddress); } } catch (IOException ex) diff --git a/runelite-client/src/main/scripts/BankMainBuild.hash b/runelite-client/src/main/scripts/BankMainBuild.hash index 789662cb826..0ad6262f609 100644 --- a/runelite-client/src/main/scripts/BankMainBuild.hash +++ b/runelite-client/src/main/scripts/BankMainBuild.hash @@ -1 +1 @@ -74F5261D8C6A9EDB8BA3354B82BE354427CA6F962EC0824A0CA9658075E17C3F \ No newline at end of file +1E188C47BE23BDDA6760D0F9E0F5F718657668683D350283CD5094FCB2ECBF97 \ 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 872ac6ce191..5cefcb3fead 100644 --- a/runelite-client/src/main/scripts/BankMainBuild.rs2asm +++ b/runelite-client/src/main/scripts/BankMainBuild.rs2asm @@ -310,7 +310,7 @@ LABEL276: get_varbit 4150 iconst 15 if_icmpeq LABEL280 - jump LABEL292 + jump LABEL300 LABEL280: iconst 0 iconst 786446 @@ -324,16 +324,36 @@ LABEL287: iload 2 if_sethide LABEL290: - invoke 6080 + iconst 786551 + iconst 0 + cc_find + iconst 1 + if_icmpeq LABEL296 jump LABEL298 -LABEL292: +LABEL296: + iconst 179 + cc_setgraphic +LABEL298: + invoke 6080 + jump LABEL314 +LABEL300: iconst 1 iconst 786446 if_sethide + iconst 786551 + iconst 0 + cc_find + iconst 1 + if_icmpeq LABEL309 + jump LABEL311 +LABEL309: + iconst 170 + cc_setgraphic +LABEL311: iconst 0 iload 2 if_sethide -LABEL298: +LABEL314: iload 4 iload 3 invoke 231 @@ -345,28 +365,28 @@ LABEL298: multiply add istore 26 -LABEL309: +LABEL325: iload 25 iload 26 - if_icmple LABEL313 - jump LABEL326 -LABEL313: + if_icmple LABEL329 + jump LABEL342 +LABEL329: iload 3 iload 25 cc_find iconst 1 - if_icmpeq LABEL319 - jump LABEL321 -LABEL319: + if_icmpeq LABEL335 + jump LABEL337 +LABEL335: iconst 1 cc_sethide -LABEL321: +LABEL337: iload 25 iconst 1 add istore 25 - jump LABEL309 -LABEL326: + jump LABEL325 +LABEL342: iconst 0 istore 25 iconst 8 @@ -407,17 +427,17 @@ LABEL326: get_varc_string 359 ; Skip truncating of meslayerinput by not calling bankmain_filterstring lowercase ; instead get the var directly and lowercase it ostore 2 - jump LABEL371 ; + jump LABEL387 ; sconst "" ostore 2 iload 37 iconst 1 - if_icmpeq LABEL369 - jump LABEL371 -LABEL369: + if_icmpeq LABEL385 + jump LABEL387 +LABEL385: invoke 280 ostore 2 -LABEL371: +LABEL387: iconst 0 ; sconst "bankBuildTab" ; runelite_callback ; @@ -428,52 +448,52 @@ LABEL371: get_varbit 4150 iconst 0 - if_icmple LABEL378 + if_icmple LABEL394 get_varbit 4150 iconst 9 - if_icmpgt LABEL378 - jump LABEL856 -LABEL378: + if_icmpgt LABEL394 + jump LABEL872 +LABEL394: get_varbit 4150 iconst 15 - if_icmpne LABEL382 - jump LABEL856 -LABEL382: + if_icmpne LABEL398 + jump LABEL872 +LABEL398: iload 25 iconst 1410 - if_icmplt LABEL386 - jump LABEL411 -LABEL386: + if_icmplt LABEL402 + jump LABEL427 +LABEL402: iload 3 iload 25 cc_find iconst 1 - if_icmpeq LABEL392 - jump LABEL394 -LABEL392: + if_icmpeq LABEL408 + jump LABEL410 +LABEL408: iconst 1 cc_sethide -LABEL394: +LABEL410: iconst 95 iload 25 inv_getobj iconst -1 - if_icmpne LABEL400 - jump LABEL406 -LABEL400: + if_icmpne LABEL416 + jump LABEL422 +LABEL416: iload 34 iconst 1 add iload 25 istore 35 istore 34 -LABEL406: +LABEL422: iload 25 iconst 1 add istore 25 - jump LABEL382 -LABEL411: + jump LABEL398 +LABEL427: get_varbit 4171 get_varbit 4172 add @@ -494,14 +514,14 @@ LABEL411: istore 36 iload 36 iconst 0 - if_icmple LABEL433 - jump LABEL437 -LABEL433: + if_icmple LABEL449 + jump LABEL453 +LABEL449: iconst 1410 iconst 1 sub istore 35 -LABEL437: +LABEL453: iload 36 iload 35 iconst 1 @@ -529,9 +549,9 @@ LABEL437: istore 25 get_varbit 4171 iconst 0 - if_icmpgt LABEL466 - jump LABEL498 -LABEL466: + if_icmpgt LABEL482 + jump LABEL514 +LABEL482: iconst 1 iload 3 iload 33 @@ -564,12 +584,12 @@ LABEL466: get_varbit 4171 add istore 25 -LABEL498: +LABEL514: get_varbit 4172 iconst 0 - if_icmpgt LABEL502 - jump LABEL534 -LABEL502: + if_icmpgt LABEL518 + jump LABEL550 +LABEL518: iconst 2 iload 3 iload 33 @@ -602,12 +622,12 @@ LABEL502: get_varbit 4172 add istore 25 -LABEL534: +LABEL550: get_varbit 4173 iconst 0 - if_icmpgt LABEL538 - jump LABEL570 -LABEL538: + if_icmpgt LABEL554 + jump LABEL586 +LABEL554: iconst 3 iload 3 iload 33 @@ -640,12 +660,12 @@ LABEL538: get_varbit 4173 add istore 25 -LABEL570: +LABEL586: get_varbit 4174 iconst 0 - if_icmpgt LABEL574 - jump LABEL606 -LABEL574: + if_icmpgt LABEL590 + jump LABEL622 +LABEL590: iconst 4 iload 3 iload 33 @@ -678,12 +698,12 @@ LABEL574: get_varbit 4174 add istore 25 -LABEL606: +LABEL622: get_varbit 4175 iconst 0 - if_icmpgt LABEL610 - jump LABEL642 -LABEL610: + if_icmpgt LABEL626 + jump LABEL658 +LABEL626: iconst 5 iload 3 iload 33 @@ -716,12 +736,12 @@ LABEL610: get_varbit 4175 add istore 25 -LABEL642: +LABEL658: get_varbit 4176 iconst 0 - if_icmpgt LABEL646 - jump LABEL678 -LABEL646: + if_icmpgt LABEL662 + jump LABEL694 +LABEL662: iconst 6 iload 3 iload 33 @@ -754,12 +774,12 @@ LABEL646: get_varbit 4176 add istore 25 -LABEL678: +LABEL694: get_varbit 4177 iconst 0 - if_icmpgt LABEL682 - jump LABEL714 -LABEL682: + if_icmpgt LABEL698 + jump LABEL730 +LABEL698: iconst 7 iload 3 iload 33 @@ -792,12 +812,12 @@ LABEL682: get_varbit 4177 add istore 25 -LABEL714: +LABEL730: get_varbit 4178 iconst 0 - if_icmpgt LABEL718 - jump LABEL750 -LABEL718: + if_icmpgt LABEL734 + jump LABEL766 +LABEL734: iconst 8 iload 3 iload 33 @@ -830,12 +850,12 @@ LABEL718: get_varbit 4178 add istore 25 -LABEL750: +LABEL766: get_varbit 4179 iconst 0 - if_icmpgt LABEL754 - jump LABEL786 -LABEL754: + if_icmpgt LABEL770 + jump LABEL802 +LABEL770: iconst 9 iload 3 iload 33 @@ -868,18 +888,18 @@ LABEL754: get_varbit 4179 add istore 25 -LABEL786: +LABEL802: iload 37 iconst 1 - if_icmpeq LABEL790 - jump LABEL829 -LABEL790: + if_icmpeq LABEL806 + jump LABEL845 +LABEL806: oload 2 string_length iconst 0 - if_icmpgt LABEL795 - jump LABEL814 -LABEL795: + if_icmpgt LABEL811 + jump LABEL830 +LABEL811: sconst "Showing items: " sconst "" oload 2 @@ -889,9 +909,9 @@ LABEL795: if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL806 - jump LABEL813 -LABEL806: + if_icmpeq LABEL822 + jump LABEL829 +LABEL822: sconst "Show items whose names contain the following text: (" iload 32 tostring @@ -903,9 +923,9 @@ LABEL806: pop_int ; pop number of matches iconst 10616874 if_settext -LABEL813: - jump LABEL828 -LABEL814: +LABEL829: + jump LABEL844 +LABEL830: sconst "Showing items: " sconst "" sconst "*" @@ -915,21 +935,21 @@ LABEL814: if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL825 - jump LABEL828 -LABEL825: + if_icmpeq LABEL841 + jump LABEL844 +LABEL841: sconst "Show items whose names contain the following text:" sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback iconst 10616874 if_settext -LABEL828: - jump LABEL832 -LABEL829: +LABEL844: + jump LABEL848 +LABEL845: sconst "The Bank of Gielinor" iload 6 if_settext -LABEL832: +LABEL848: iload 0 iload 1 iload 2 @@ -976,18 +996,18 @@ singletabbuildmode: get_varbit 4179 ; add ; istore 36 ; store start to the first item in the "All items" tab -LABEL856: +LABEL872: ; if (~bankmain_searching = 1) { iload 37 iconst 1 - if_icmpeq LABEL860 - jump LABEL864 -LABEL860: + if_icmpeq LABEL876 + jump LABEL880 +LABEL876: iconst 1 iconst 1 iconst 1 invoke 299 -LABEL864: +LABEL880: ; after ~meslayer close iconst -1 istore 38 @@ -1001,12 +1021,12 @@ LABEL864: istore 40 iconst 0 istore 41 -LABEL876: +LABEL892: iload 25 iconst 1410 - if_icmplt LABEL880 - jump LABEL956 -LABEL880: + if_icmplt LABEL896 + jump LABEL972 +LABEL896: ; item index = (loop index + offset) % bank size iload 25 ; loop index iload 36 ; offset @@ -1021,9 +1041,9 @@ LOAD_ITEM_INDEX: iload 35 ; use item index instead of loop index cc_find iconst 1 - if_icmpeq LABEL886 - jump LABEL951 -LABEL886: + if_icmpeq LABEL902 + jump LABEL967 +LABEL902: iconst 95 jump LOAD_ITEM_INDEX2 iload 25 @@ -1033,34 +1053,34 @@ LOAD_ITEM_INDEX2: istore 30 iload 30 iconst -1 - if_icmpne LABEL894 - jump LABEL898 -LABEL894: + if_icmpne LABEL910 + jump LABEL914 +LABEL910: iload 34 iconst 1 add istore 34 -LABEL898: +LABEL914: iload 42 ; overriding single tab building mode? iconst 1 ; if_icmpeq filtertest ; iload 25 iload 38 - if_icmpge LABEL902 - jump LABEL949 -LABEL902: + if_icmpge LABEL918 + jump LABEL965 +LABEL918: iload 25 iload 39 - if_icmplt LABEL906 - jump LABEL949 + if_icmplt LABEL922 + jump LABEL965 filtertest: iload 30 ; obj iload 37 ; bankmain_searching oload 2 ; bankmain_filterstring invoke 279 ; ~bankmain_filteritem iconst 1 ; - if_icmpne LABEL949 ; -LABEL906: + if_icmpne LABEL965 ; +LABEL922: iconst 0 cc_sethide iload 30 @@ -1089,15 +1109,15 @@ LOAD_ITEM_INDEX3: cc_setposition iload 40 iload 27 - if_icmplt LABEL933 - jump LABEL938 -LABEL933: + if_icmplt LABEL949 + jump LABEL954 +LABEL949: iload 40 iconst 1 add istore 40 - jump LABEL948 -LABEL938: + jump LABEL964 +LABEL954: iconst 0 iload 41 iconst 1 @@ -1108,38 +1128,32 @@ LABEL938: iconst 36 multiply istore 33 -LABEL948: - jump LABEL951 -LABEL949: +LABEL964: + jump LABEL967 +LABEL965: iconst 1 cc_sethide -LABEL951: +LABEL967: iload 25 iconst 1 add istore 25 - jump LABEL876 -LABEL956: + jump LABEL892 +LABEL972: iload 33 iconst 32 add istore 33 - iconst 1 - iconst 786446 - if_sethide get_varbit 4150 iconst 15 - if_icmpeq LABEL967 - jump LABEL974 -LABEL967: + if_icmpeq LABEL980 + jump LABEL984 +LABEL980: sconst "Potion storage" iload 6 if_settext - iconst 0 - iconst 786446 - if_sethide - jump LABEL994 -LABEL974: + jump LABEL1004 +LABEL984: iload 42 ; overriding single tab building mode? iconst 1 ; if_icmpne tabtitle ; set normal "Tab" title @@ -1150,9 +1164,9 @@ LABEL974: tabtitle: ; get_varbit 4170 iconst 2 - if_icmpeq LABEL978 - jump LABEL988 -LABEL978: + if_icmpeq LABEL988 + jump LABEL998 +LABEL988: sconst "Tab " iconst 105 iconst 115 @@ -1162,8 +1176,8 @@ LABEL978: join_string 2 iload 6 if_settext - jump LABEL994 -LABEL988: + jump LABEL1004 +LABEL998: sconst "Tab " get_varbit 4150 tostring @@ -1171,7 +1185,7 @@ LABEL988: iload 6 if_settext FinishBuilding: -LABEL994: +LABEL1004: iload 0 iload 1 iload 2