diff --git a/cache/src/main/java/net/runelite/cache/WorldMapManager.java b/cache/src/main/java/net/runelite/cache/WorldMapManager.java index 59eafbd0ecf..bc3cef65b9b 100644 --- a/cache/src/main/java/net/runelite/cache/WorldMapManager.java +++ b/cache/src/main/java/net/runelite/cache/WorldMapManager.java @@ -46,6 +46,9 @@ public class WorldMapManager { + public static final int DETAILS_ID = 0; + public static final int COMPOSITEMAP_ID = 1; + private final Store store; private final List worldMapCompositeDefinitions = new ArrayList<>(); private final List elements = new ArrayList<>(); @@ -60,7 +63,7 @@ public void load() throws IOException { Storage storage = store.getStorage(); Index index = store.getIndex(IndexType.WORLDMAP); - Archive compositeMapArchive = index.findArchiveByName("compositemap"); + Archive compositeMapArchive = index.isNamed() ? index.findArchiveByName("compositemap") : index.getArchive(COMPOSITEMAP_ID); WorldMapCompositeLoader worldMapCompositeLoader = new WorldMapCompositeLoader(); worldMapCompositeLoader.configureForRevision(index.getRevision()); diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java index d66b0ea60f9..8fc797d18e1 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java @@ -359,6 +359,10 @@ else if (opcode == 149) { def.placeholderTemplateId = stream.readUnsignedShort(); } + else if (opcode == 160) + { + def.stackable = 2; + } else if (opcode == 200) { entityOpsLoader.decodeSubOp(def.groundOps, stream); diff --git a/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java b/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java index a3f25a3e614..2d9bcbcf393 100644 --- a/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java +++ b/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java @@ -69,7 +69,7 @@ public void extract() throws IOException Storage storage = store.getStorage(); Index index = store.getIndex(IndexType.WORLDMAP); - Archive archive = index.findArchiveByName("details"); + Archive archive = index.isNamed() ? index.findArchiveByName("details") : index.getArchive(WorldMapManager.DETAILS_ID); byte[] archiveData = storage.loadArchive(archive); ArchiveFiles files = archive.getFiles(archiveData); diff --git a/gradle.properties b/gradle.properties index 376c7679a27..d730b8a5797 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,7 @@ org.gradle.parallel=true org.gradle.caching=false project.build.group=net.runelite -project.build.version=1.12.30 -runelite.injected-client.version=1.12.30 +project.build.version=1.12.31-SNAPSHOT glslang.path= microbot.version=2.6.8 diff --git a/runelite-api/src/main/interfaces/interfaces.toml b/runelite-api/src/main/interfaces/interfaces.toml index 31001049613..b80d37d6d6a 100644 --- a/runelite-api/src/main/interfaces/interfaces.toml +++ b/runelite-api/src/main/interfaces/interfaces.toml @@ -62,19 +62,19 @@ content_container=9 tab_container=10 item_container=12 scrollbar=13 -search_button_background=41 -deposit_inventory=43 -deposit_equipment=45 -potion_store=119 -incinerator=48 -incinerator_confirm=49 -potionstore_content=51 -equipment_parent=54 -equipment_set_bonus=95 -settings_button=99 -equipment_button=100 -popup=102 -equipment_stat_bonus=108 +search_button_background=47 +deposit_inventory=49 +deposit_equipment=51 +potion_store=126 +incinerator=54 +incinerator_confirm=55 +potionstore_content=58 +equipment_parent=61 +equipment_set_bonus=102 +settings_button=106 +equipment_button=107 +popup=109 +equipment_stat_bonus=115 [bank_inventory] id=15 diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index d640ca0b053..ee0feee75cf 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -275,8 +275,8 @@ public interface Client extends OAuthApi, GameEngine /** * Gets the pitch of the camera. *

- * The value returned by this method is measured in JAU, or Jagex - * Angle Unit, which is 1/1024 of a revolution. + * The value returned by this method is measured in JAU14, or Jagex + * Angle Unit (14 bit), where each unit is equivalent to 2π/(2^14) radians. * * @return the camera pitch */ @@ -291,6 +291,9 @@ public interface Client extends OAuthApi, GameEngine /** * Gets the yaw of the camera. + *

+ * The value returned by this method is measured in JAU14, or Jagex + * Angle Unit (14 bit), where each unit is equivalent to 2π/(2^14) radians. * * @return the camera yaw */ @@ -683,15 +686,6 @@ public interface Client extends OAuthApi, GameEngine @Deprecated int getMenuWidth(); - /** - * Gets the angle of the map, or target camera yaw. - * - * @return the map angle - * @see #getCameraYawTarget() - */ - @Deprecated - int getMapAngle(); - /** * Checks whether the client window is currently resized. * @@ -1728,39 +1722,39 @@ public interface Client extends OAuthApi, GameEngine * Typically this is the player position, but can be other points in cutscenes or in free camera mode. * @return */ - double getCameraFocalPointX(); + float getCameraFocalPointX(); /** * Sets the camera focus point x. Requires the {@link #getCameraMode()} to be free camera. * @param x */ - void setCameraFocalPointX(double x); + void setCameraFocalPointX(float x); /** * Get the camera focus point y * Typically this is the player position, but can be other points in cutscenes or in free camera mode. * @return */ - double getCameraFocalPointY(); + float getCameraFocalPointY(); /** * Sets the camera focus point y. Requires the {@link #getCameraMode()} to be free camera. * @param y */ - void setCameraFocalPointY(double y); + void setCameraFocalPointY(float y); /** * Get the camera focus point z * Typically this is the player position, but can be other points in cutscenes or in free camera mode. * @return */ - double getCameraFocalPointZ(); + float getCameraFocalPointZ(); /** * Sets the camera focus point z. Requires the {@link #getCameraMode()} to be free camera. * @param z */ - void setCameraFocalPointZ(double z); + void setCameraFocalPointZ(float z); /** * Sets the normal moving speed when using oculus orb (default value is 12) diff --git a/runelite-api/src/main/java/net/runelite/api/EntityOps.java b/runelite-api/src/main/java/net/runelite/api/EntityOps.java index 0274b2c2d3b..756aa960242 100644 --- a/runelite-api/src/main/java/net/runelite/api/EntityOps.java +++ b/runelite-api/src/main/java/net/runelite/api/EntityOps.java @@ -33,13 +33,10 @@ public interface EntityOps { int MAX_OPS = 5; + int getNumOps(); + @Nullable String getOp(int idx); - int getNumSubOps(int idx); - - int getSubID(int idx, int subIdx); - - @Nullable - String getSubOp(int idx, int subIdx); + EntityOps getSubOps(int idx); } 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 da610b507ad..2cbaa66e07d 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -10782,7 +10782,7 @@ public final class ItemID public static final int STAMINA_POTION1_23589 = 23589; public static final int HELM_OF_NEITIZNOT_23591 = 23591; public static final int BARROWS_GLOVES_23593 = 23593; - public static final int BERSERKER_RING_23595 = 23595; + public static final int BERSERKER_RING_I_23595 = 23595; public static final int DRAGON_DEFENDER_23597 = 23597; public static final int SPIRIT_SHIELD_23599 = 23599; public static final int RUNE_CROSSBOW_23601 = 23601; @@ -13771,7 +13771,7 @@ public final class ItemID public static final int ECHO_CRYSTAL = 28942; public static final int ECHO_BOOTS = 28945; public static final int DIZANAS_QUIVER_UNCHARGED = 28947; - public static final int DIZANAS_QUIVER_UNCHARGED_L = 28949; + public static final int DIZANAS_QUIVER_L_UNCHARGED = 28949; public static final int DIZANAS_QUIVER = 28951; public static final int DIZANAS_QUIVER_L = 28953; public static final int BLESSED_DIZANAS_QUIVER = 28955; @@ -16255,7 +16255,7 @@ public final class ItemID public static final int UNCHARGED_TRIDENT_E_O = 33328; public static final int IBANS_STAFF_O = 33330; public static final int IBANS_STAFF_U_O = 33332; - public static final int IBANS_STAFF_BO = 33333; + public static final int IBANS_STAFF_O_33333 = 33333; public static final int SOULREAPER_AXE_O = 33335; public static final int OATHPLATE_SLAYER_HELMET = 33338; public static final int RADIANT_SLAYER_HELMET = 33340; @@ -16304,5 +16304,43 @@ public final class ItemID public static final int DEMONIC_PACTS_RELIC_HUNTER_T1_ARMOUR_SET = 33451; public static final int DEMONIC_PACTS_RELIC_HUNTER_T2_ARMOUR_SET = 33454; public static final int DEMONIC_PACTS_RELIC_HUNTER_T3_ARMOUR_SET = 33457; + public static final int DRAGON_CROSSBOW_33460 = 33460; + public static final int OATHPLATE_HELM_33462 = 33462; + public static final int VOID_MELEE_HELM_L_BROKEN = 33464; + public static final int VOID_MELEE_HELM_L_MANGLED = 33466; + public static final int VOID_MAGE_HELM_L_BROKEN = 33468; + public static final int VOID_MAGE_HELM_L_MANGLED = 33470; + public static final int VOID_RANGER_HELM_L_BROKEN = 33472; + public static final int VOID_RANGER_HELM_L_MANGLED = 33474; + public static final int VOID_KNIGHT_TOP_L_BROKEN = 33476; + public static final int VOID_KNIGHT_TOP_L_MANGLED = 33478; + public static final int ELITE_VOID_TOP_L_BROKEN = 33480; + public static final int ELITE_VOID_TOP_L_MANGLED = 33482; + public static final int VOID_KNIGHT_ROBE_L_BROKEN = 33484; + public static final int VOID_KNIGHT_ROBE_L_MANGLED = 33486; + public static final int ELITE_VOID_ROBE_L_BROKEN = 33488; + public static final int ELITE_VOID_ROBE_L_MANGLED = 33490; + public static final int VOID_KNIGHT_GLOVES_L_BROKEN = 33492; + public static final int VOID_KNIGHT_GLOVES_L_MANGLED = 33494; + public static final int INFERNAL_MAX_CAPE_L_BROKEN = 33496; + public static final int INFERNAL_MAX_CAPE_L_MANGLED = 33498; + public static final int INFERNAL_CAPE_L_BROKEN = 33500; + public static final int INFERNAL_CAPE_L_MANGLED = 33502; + public static final int BLOOD_ANCIENT_SCEPTRE_L_BROKEN = 33504; + public static final int BLOOD_ANCIENT_SCEPTRE_L_MANGLED = 33506; + public static final int ICE_ANCIENT_SCEPTRE_L_BROKEN = 33508; + public static final int ICE_ANCIENT_SCEPTRE_L_MANGLED = 33510; + public static final int SMOKE_ANCIENT_SCEPTRE_L_BROKEN = 33512; + public static final int SMOKE_ANCIENT_SCEPTRE_L_MANGLED = 33514; + public static final int SHADOW_ANCIENT_SCEPTRE_L_BROKEN = 33516; + public static final int SHADOW_ANCIENT_SCEPTRE_L_MANGLED = 33518; + public static final int FIGHTER_TORSO_L_BROKEN = 33520; + public static final int FIGHTER_TORSO_L_MANGLED = 33522; + public static final int DIZANAS_QUIVER_L_BROKEN = 33524; + public static final int DIZANAS_QUIVER_L_MANGLED = 33526; + public static final int BLESSED_DIZANAS_QUIVER_L_BROKEN = 33528; + public static final int BLESSED_DIZANAS_QUIVER_L_MANGLED = 33530; + public static final int DIZANAS_MAX_CAPE_L_BROKEN = 33532; + public static final int DIZANAS_MAX_CAPE_L_MANGLED = 33533; /* 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 3b3b292b92e..4e2180b6d44 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -227,6 +227,7 @@ public final class NpcID public static final int MAID = 223; public static final int COOK = 225; public static final int BUTLER = 227; + public static final int DEMON_BUTLER = 229; public static final int WOLF_231 = 231; public static final int JUNGLE_WOLF = 232; public static final int MACARONI_PENGUIN = 233; @@ -6558,7 +6559,7 @@ public final class NpcID public static final int MAID_7328 = 7328; public static final int COOK_7329 = 7329; public static final int BUTLER_7330 = 7330; - public static final int DEMON_BUTLER = 7331; + public static final int DEMON_BUTLER_7331 = 7331; public static final int FAIRY_FIXIT = 7332; public static final int FAIRY_FIXIT_7333 = 7333; public static final int GIANT_SQUIRREL = 7334; @@ -13132,7 +13133,6 @@ public final class NpcID public static final int ELIDINIS_WARDEN_15698 = 15698; public static final int TZTOKJAD_15699 = 15699; public static final int YAMA_15700 = 15700; - public static final int DEMON_BUTLER_15710 = 15710; public static final int DEMON_BUTLER_15711 = 15711; /* 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 044b11a9b8e..53be69deb2f 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -16841,5 +16841,41 @@ public final class NullItemID public static final int NULL_33456 = 33456; public static final int NULL_33458 = 33458; public static final int NULL_33459 = 33459; + public static final int NULL_33461 = 33461; + public static final int NULL_33463 = 33463; + public static final int NULL_33465 = 33465; + public static final int NULL_33467 = 33467; + public static final int NULL_33469 = 33469; + public static final int NULL_33471 = 33471; + public static final int NULL_33473 = 33473; + public static final int NULL_33475 = 33475; + public static final int NULL_33477 = 33477; + public static final int NULL_33479 = 33479; + public static final int NULL_33481 = 33481; + public static final int NULL_33483 = 33483; + public static final int NULL_33485 = 33485; + public static final int NULL_33487 = 33487; + public static final int NULL_33489 = 33489; + public static final int NULL_33491 = 33491; + public static final int NULL_33493 = 33493; + public static final int NULL_33495 = 33495; + public static final int NULL_33497 = 33497; + public static final int NULL_33499 = 33499; + public static final int NULL_33501 = 33501; + public static final int NULL_33503 = 33503; + public static final int NULL_33505 = 33505; + public static final int NULL_33507 = 33507; + public static final int NULL_33509 = 33509; + public static final int NULL_33511 = 33511; + public static final int NULL_33513 = 33513; + public static final int NULL_33515 = 33515; + public static final int NULL_33517 = 33517; + public static final int NULL_33519 = 33519; + public static final int NULL_33521 = 33521; + public static final int NULL_33523 = 33523; + public static final int NULL_33525 = 33525; + public static final int NULL_33527 = 33527; + public static final int NULL_33529 = 33529; + public static final int NULL_33531 = 33531; /* 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/NullNpcID.java b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java index 830c5bfa0ea..a03cf8a81f6 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -18,7 +18,6 @@ public final class NullNpcID public static final int NULL_224 = 224; public static final int NULL_226 = 226; public static final int NULL_228 = 228; - public static final int NULL_229 = 229; public static final int NULL_230 = 230; public static final int NULL_317 = 317; public static final int NULL_324 = 324; 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 da790ae2d21..e6245bf16f5 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -20022,76 +20022,76 @@ public final class ObjectID public static final int SNAPDRAGON_39809 = 39809; public static final int SNAPDRAGON_39810 = 39810; public static final int SNAPDRAGON_39811 = 39811; - public static final int HERB_PATCH_39812 = 39812; - public static final int HERB_PATCH_39813 = 39813; - public static final int HERBS_39814 = 39814; - public static final int HERBS_39815 = 39815; - public static final int HERBS_39816 = 39816; - public static final int HERB_PATCH_39817 = 39817; - public static final int HERB_PATCH_39818 = 39818; - public static final int HERBS_39819 = 39819; - public static final int HERBS_39820 = 39820; - public static final int HERBS_39821 = 39821; - public static final int HERB_PATCH_39822 = 39822; - public static final int HERB_PATCH_39823 = 39823; - public static final int HERBS_39824 = 39824; - public static final int HERBS_39825 = 39825; - public static final int HERBS_39826 = 39826; - public static final int HERB_PATCH_39827 = 39827; - public static final int HERB_PATCH_39828 = 39828; - public static final int HERBS_39829 = 39829; - public static final int HERBS_39830 = 39830; - public static final int HERBS_39831 = 39831; - public static final int HERB_PATCH_39832 = 39832; - public static final int HERB_PATCH_39833 = 39833; - public static final int HERBS_39834 = 39834; - public static final int HERBS_39835 = 39835; - public static final int HERBS_39836 = 39836; - public static final int HERB_PATCH_39837 = 39837; - public static final int HERB_PATCH_39838 = 39838; - public static final int HERBS_39839 = 39839; - public static final int HERBS_39840 = 39840; - public static final int HERBS_39841 = 39841; - public static final int HERB_PATCH_39842 = 39842; - public static final int HERB_PATCH_39843 = 39843; - public static final int HERBS_39844 = 39844; - public static final int HERBS_39845 = 39845; - public static final int HERBS_39846 = 39846; - public static final int HERB_PATCH_39847 = 39847; - public static final int HERB_PATCH_39848 = 39848; - public static final int HERBS_39849 = 39849; - public static final int HERBS_39850 = 39850; - public static final int HERBS_39851 = 39851; - public static final int HERB_PATCH_39852 = 39852; - public static final int HERB_PATCH_39853 = 39853; - public static final int HERBS_39854 = 39854; - public static final int HERBS_39855 = 39855; - public static final int HERBS_39856 = 39856; - public static final int HERB_PATCH_39857 = 39857; - public static final int HERB_PATCH_39858 = 39858; - public static final int HERBS_39859 = 39859; - public static final int HERBS_39860 = 39860; - public static final int HERBS_39861 = 39861; - public static final int HERB_PATCH_39862 = 39862; - public static final int HERB_PATCH_39863 = 39863; - public static final int HERBS_39864 = 39864; - public static final int HERBS_39865 = 39865; - public static final int HERBS_39866 = 39866; - public static final int HERB_PATCH_39867 = 39867; - public static final int HERB_PATCH_39868 = 39868; - public static final int HERBS_39869 = 39869; - public static final int HERBS_39870 = 39870; - public static final int HERBS_39871 = 39871; - public static final int HERB_PATCH_39872 = 39872; - public static final int HERB_PATCH_39873 = 39873; - public static final int HERBS_39874 = 39874; - public static final int HERBS_39875 = 39875; - public static final int HERBS_39876 = 39876; - public static final int HERB_PATCH_39877 = 39877; - public static final int HERB_PATCH_39878 = 39878; - public static final int HERBS_39879 = 39879; - public static final int HERBS_39880 = 39880; - public static final int HERBS_39881 = 39881; + public static final int GUAM_LEAF_39812 = 39812; + public static final int GUAM_LEAF_39813 = 39813; + public static final int GUAM_LEAF_39814 = 39814; + public static final int GUAM_LEAF_39815 = 39815; + public static final int GUAM_LEAF_39816 = 39816; + public static final int MARRENTILL_39817 = 39817; + public static final int MARRENTILL_39818 = 39818; + public static final int MARRENTILL_39819 = 39819; + public static final int MARRENTILL_39820 = 39820; + public static final int MARRENTILL_39821 = 39821; + public static final int TARROMIN_39822 = 39822; + public static final int TARROMIN_39823 = 39823; + public static final int TARROMIN_39824 = 39824; + public static final int TARROMIN_39825 = 39825; + public static final int TARROMIN_39826 = 39826; + public static final int HARRALANDER_39827 = 39827; + public static final int HARRALANDER_39828 = 39828; + public static final int HARRALANDER_39829 = 39829; + public static final int HARRALANDER_39830 = 39830; + public static final int HARRALANDER_39831 = 39831; + public static final int RANARR_WEED_39832 = 39832; + public static final int RANARR_WEED_39833 = 39833; + public static final int RANARR_WEED_39834 = 39834; + public static final int RANARR_WEED_39835 = 39835; + public static final int RANARR_WEED_39836 = 39836; + public static final int IRIT_LEAF_39837 = 39837; + public static final int IRIT_LEAF_39838 = 39838; + public static final int IRIT_LEAF_39839 = 39839; + public static final int IRIT_LEAF_39840 = 39840; + public static final int IRIT_LEAF_39841 = 39841; + public static final int AVANTOE_39842 = 39842; + public static final int AVANTOE_39843 = 39843; + public static final int AVANTOE_39844 = 39844; + public static final int AVANTOE_39845 = 39845; + public static final int AVANTOE_39846 = 39846; + public static final int TOADFLAX_39847 = 39847; + public static final int TOADFLAX_39848 = 39848; + public static final int TOADFLAX_39849 = 39849; + public static final int TOADFLAX_39850 = 39850; + public static final int TOADFLAX_39851 = 39851; + public static final int KWUARM_39852 = 39852; + public static final int KWUARM_39853 = 39853; + public static final int KWUARM_39854 = 39854; + public static final int KWUARM_39855 = 39855; + public static final int KWUARM_39856 = 39856; + public static final int CADANTINE_39857 = 39857; + public static final int CADANTINE_39858 = 39858; + public static final int CADANTINE_39859 = 39859; + public static final int CADANTINE_39860 = 39860; + public static final int CADANTINE_39861 = 39861; + public static final int LANTADYME_39862 = 39862; + public static final int LANTADYME_39863 = 39863; + public static final int LANTADYME_39864 = 39864; + public static final int LANTADYME_39865 = 39865; + public static final int LANTADYME_39866 = 39866; + public static final int DWARF_WEED_39867 = 39867; + public static final int DWARF_WEED_39868 = 39868; + public static final int DWARF_WEED_39869 = 39869; + public static final int DWARF_WEED_39870 = 39870; + public static final int DWARF_WEED_39871 = 39871; + public static final int TORSTOL_39872 = 39872; + public static final int TORSTOL_39873 = 39873; + public static final int TORSTOL_39874 = 39874; + public static final int TORSTOL_39875 = 39875; + public static final int TORSTOL_39876 = 39876; + public static final int SNAPDRAGON_39877 = 39877; + public static final int SNAPDRAGON_39878 = 39878; + public static final int SNAPDRAGON_39879 = 39879; + public static final int SNAPDRAGON_39880 = 39880; + public static final int SNAPDRAGON_39881 = 39881; public static final int DOOR_39882 = 39882; public static final int BROKEN_TABLE_39891 = 39891; public static final int TEAK_TABLE_39892 = 39892; @@ -26314,12 +26314,12 @@ public final class ObjectID public static final int GANGPLANK_55336 = 55336; public static final int GANGPLANK_55337 = 55337; public static final int VALVE_55339 = 55339; - public static final int HERB_PATCH_55342 = 55342; - public static final int HERB_PATCH_55343 = 55343; - public static final int HERBS_55344 = 55344; - public static final int HERBS_55345 = 55345; - public static final int HERBS_55346 = 55346; - public static final int HUASCA = 55347; + public static final int HUASCA = 55342; + public static final int HUASCA_55343 = 55343; + public static final int HUASCA_55344 = 55344; + public static final int HUASCA_55345 = 55345; + public static final int HUASCA_55346 = 55346; + public static final int HUASCA_55347 = 55347; public static final int HUASCA_55348 = 55348; public static final int HUASCA_55349 = 55349; public static final int HUASCA_55350 = 55350; diff --git a/runelite-api/src/main/java/net/runelite/api/Perspective.java b/runelite-api/src/main/java/net/runelite/api/Perspective.java index bc010a10e26..648a593690b 100644 --- a/runelite-api/src/main/java/net/runelite/api/Perspective.java +++ b/runelite-api/src/main/java/net/runelite/api/Perspective.java @@ -254,7 +254,7 @@ private static Point localToCanvasGpu(Client client, int x, int y, int z) if (x >= -ESCENE_OFFSET << LOCAL_COORD_BITS && y >= -ESCENE_OFFSET << LOCAL_COORD_BITS && x <= SCENE_SIZE + ESCENE_OFFSET << LOCAL_COORD_BITS && y <= SCENE_SIZE + ESCENE_OFFSET << LOCAL_COORD_BITS) { - final double + final float cameraPitch = client.getCameraFpPitch(), cameraYaw = client.getCameraFpYaw(); @@ -376,7 +376,7 @@ private static void modelToCanvasProjection(Client client, WorldView wv, int end private static void modelToCanvasGpu(Client client, int end, int x3dCenter, int y3dCenter, int z3dCenter, int rotate, float[] x3d, float[] y3d, float[] z3d, int[] x2d, int[] y2d) { - final double + final float cameraPitch = client.getCameraFpPitch(), cameraYaw = client.getCameraFpYaw(); final float 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 834e2e5431b..d0740a46b29 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 @@ -7952,6 +7952,66 @@ public static final class Row public static final int SYNTH_WEAPONS = 4978; public static final int SYNTH_WILDERNESSBOSSREWORK = 4979; public static final int SYNTH_VETION = 4980; + public static final int SYNTH_VARLAMOREPART3 = 16326; + public static final int SYNTH_ARKANBLADE = 16327; + public static final int SYNTH_CUSTODIANSTALKERS = 16328; + public static final int SYNTH_DELVEBOSS = 16329; + public static final int SYNTH_REWARDS = 16330; + public static final int SYNTH_DUOCULTISTSCOMBAT = 16331; + public static final int SYNTH_EARTHNAGUA = 16332; + public static final int SYNTH_ENNIUSCOMBAT = 16333; + public static final int SYNTH_ENVIRONMENTS = 16334; + public static final int SYNTH_MOKHAIOTLDUNGEON = 16335; + public static final int SYNTH_FINALDAWN = 16336; + public static final int SYNTH_FLETCHINGACTIVITY = 16337; + public static final int SYNTH_GEMSTONECRAB = 16338; + public static final int SYNTH_GUARDCOMBAT = 16339; + public static final int SYNTH_METZLICOMBAT = 16340; + public static final int SYNTH_SCRAMBLEDQUEST = 16341; + public static final int SYNTH_ANIMALS_DUPE1 = 16342; + public static final int SYNTH_BRUTUSCOWBOSS = 16343; + public static final int SYNTH_YAMA = 16344; + public static final int SYNTH_DEADMAN2026 = 16345; + public static final int SYNTH_EASTER2025 = 16346; + public static final int SYNTH_HALLOWEEN2025 = 16347; + public static final int SYNTH_LEAGUES6 = 16348; + public static final int SYNTH_REDREEF = 16349; + public static final int SYNTH_TCS = 16350; + public static final int SYNTH_ANCHOR = 16351; + public static final int SYNTH_BARRACUDATRAILS = 16352; + public static final int SYNTH_CANNONS = 16353; + public static final int SYNTH_CREATURESMISC = 16354; + public static final int SYNTH_CUSTOMISING = 16355; + public static final int SYNTH_DEEPSEATRAWLING = 16356; + public static final int SYNTH_GRYPHON = 16357; + public static final int SYNTH_HORNOFPLENTY = 16358; + public static final int SYNTH_KANDARINRAFT = 16359; + public static final int SYNTH_LOOTNET = 16360; + public static final int SYNTH_MERMAID = 16361; + public static final int SYNTH_MOGRE_DUPE1 = 16362; + public static final int SYNTH_MONODON = 16363; + public static final int SYNTH_OCEANAMBIENCES = 16364; + public static final int SYNTH_ARDENTOCEAN = 16365; + public static final int SYNTH_HAZARDS = 16366; + public static final int SYNTH_HAZARDFETIDWATERS = 16367; + public static final int SYNTH_HAZARDFLECKEDWATERS = 16368; + public static final int SYNTH_HAZARDPROFANEWATERS = 16369; + public static final int SYNTH_HAZARDSTORMYSEAS = 16370; + public static final int SYNTH_HAZARDSUNBAKEDSEAS = 16371; + public static final int SYNTH_HAZARDTANGLEDKELP = 16372; + public static final int SYNTH_NORTHERNOCEAN = 16373; + public static final int SYNTH_SUNSETOCEAN = 16374; + public static final int SYNTH_UNQUIETOCEAN = 16375; + public static final int SYNTH_SAILINGCOMBATREBALANCE = 16376; + public static final int SYNTH_SAILMOVEMENT = 16377; + public static final int SYNTH_SHARK_DUPE1 = 16378; + public static final int SYNTH_SHIPWRECK = 16379; + public static final int SYNTH_SKILLCAPEEMOTE = 16380; + public static final int SYNTH_TORTUGAN = 16381; + public static final int SYNTH_TRAWLING = 16382; + public static final int SYNTH_WINDCATCHER = 16383; + public static final int SYNTH_AQUANITES = 16384; + public static final int SYNTH_STRYKEWYRMS = 16385; } } @@ -9524,15 +9584,20 @@ public static final class SlayerTask */ public static final int COL_EXTENSION_ADDITIVE = 16; + /** + * (dbrow, integer) + */ + public static final int COL_UNLOCK_WEIGHTING = 17; + /** * dbrow */ - public static final int COL_BLOCK_UNLOCK = 17; + public static final int COL_BLOCK_UNLOCK = 18; /** * integer */ - public static final int COL_RELATED_CONTENT = 18; + public static final int COL_RELATED_CONTENT = 19; public static final class Row { @@ -10332,6 +10397,8 @@ public static final class Row public static final int SLAYER_REWARDS_UNLOCK_HELM_HOODED = 9641; public static final int SLAYER_REWARDS_LONGER_GRYPHONS = 9642; public static final int SLAYER_REWARDS_UNLOCK_HELM_LEAGUE_6 = 16325; + public static final int SLAYER_REWARDS_WEIGHTED_FROST_DRAGONS = 16387; + public static final int SLAYER_REWARDS_LONGER_FROST_DRAGONS = 16388; } } @@ -21433,7 +21500,6 @@ public static final class Row public static final int SKILL_FEATURE_MAGIC_82_TELEOTHER_FALADOR = 11938; public static final int SKILL_FEATURE_MAGIC_85_WATER_SURGE = 11939; public static final int SKILL_FEATURE_MAGIC_85_TELEPORT_BLOCK = 11940; - public static final int SKILL_FEATURE_MAGIC_BOUNTY_TELEPORT_SPELL_1 = 11941; public static final int SKILL_FEATURE_MAGIC_87_ENCHANT_AMULET_LVL6 = 11942; public static final int SKILL_FEATURE_MAGIC_90_EARTH_SURGE = 11943; public static final int SKILL_FEATURE_MAGIC_90_TELEOTHER_CAMELOT = 11944; @@ -21460,7 +21526,6 @@ public static final class Row public static final int SKILL_FEATURE_MAGIC_ANCIENT_80_BLOOD_BLITZ = 11965; public static final int SKILL_FEATURE_MAGIC_ANCIENT_82_ICE_BLITZ = 11966; public static final int SKILL_FEATURE_MAGIC_ANCIENT_84_CARRALLAGAR_TELEPORT = 11967; - public static final int SKILL_FEATURE_MAGIC_BOUNTY_TELEPORT_SPELL_2 = 11968; public static final int SKILL_FEATURE_MAGIC_ANCIENT_86_SMOKE_BARRAGE = 11969; public static final int SKILL_FEATURE_MAGIC_ANCIENT_88_SHADOW_BARRAGE = 11970; public static final int SKILL_FEATURE_MAGIC_ANCIENT_90_ANNAKARL_TELEPORT = 11971; @@ -21500,7 +21565,6 @@ public static final class Row public static final int SKILL_FEATURE_MAGIC_LUNAR_83_TREAT_SOIL = 12005; public static final int SKILL_FEATURE_MAGIC_LUNAR_84_STATBOOST_POT_SHARE = 12006; public static final int SKILL_FEATURE_MAGIC_LUNAR_85_TELE_FISH_GUILD = 12007; - public static final int SKILL_FEATURE_MAGIC_BOUNTY_TELEPORT_SPELL_3 = 12008; public static final int SKILL_FEATURE_MAGIC_LUNAR_86_TELE_FISH_GUILD_GROUP = 12009; public static final int SKILL_FEATURE_MAGIC_LUNAR_86_PLANK_MAKE = 12010; public static final int SKILL_FEATURE_MAGIC_LUNAR_87_TELE_CATHERBY = 12011; @@ -21557,7 +21621,6 @@ public static final class Row public static final int SKILL_FEATURE_MAGIC_ARCEUUS_83_TELEPORT_BARROWS = 12062; public static final int SKILL_FEATURE_MAGIC_ARCEUUS_84_DEMONIC_OFFERING = 12063; public static final int SKILL_FEATURE_MAGIC_ARCEUUS_85_GREATER_CORRUPTION = 12064; - public static final int SKILL_FEATURE_MAGIC_BOUNTY_TELEPORT_SPELL_4 = 12065; public static final int SKILL_FEATURE_MAGIC_ARCEUUS_90_TELEPORT_APE = 12066; public static final int SKILL_FEATURE_MAGIC_ARCEUUS_16_REANIMATE_MASTER = 12067; public static final int SKILL_FEATURE_MAGIC_ARCEUUS_92_SINISTER_OFFERING = 12068; @@ -22716,6 +22779,7 @@ public static final class Row public static final int SKILL_FEATURE_MAGIC_LUNAR_LEAGUES_6_HOME_TELEPORT = 16263; public static final int SKILL_FEATURE_MAGIC_ARCEUUS_LEAGUES_6_HOME_TELEPORT = 16264; public static final int SKILL_FEATURE_FARMING_SULPHUROUS_FERTILISER = 16323; + public static final int SKILL_FEATURE_MAGIC_BOUNTY_TELEPORT_SPELL = 16386; } } 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 06bfef774a4..2516ea460a4 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 @@ -1233,139 +1233,150 @@ public static final class Bankmain public static final int TABS_LINE0 = 0x000c_000b; public static final int ITEMS = 0x000c_000c; public static final int SCROLLBAR = 0x000c_000d; - public static final int POTIONSTORE_CONTAINER = 0x000c_000e; - public static final int POTIONSTORE_BACKGROUND = 0x000c_000f; - public static final int BOTTOM = 0x000c_0010; - public static final int SWAP_INSERT = 0x000c_0011; - public static final int SWAP_INSERT_GRAPHIC = 0x000c_0012; - public static final int NOTE = 0x000c_0013; - public static final int NOTE_GRAPHIC = 0x000c_0014; - public static final int BOTTOM_LINE4 = 0x000c_0015; - public static final int QUANTITY_LAYER = 0x000c_0016; - public static final int QUANTITY1 = 0x000c_0017; - public static final int QUANTITY1_TEXT = 0x000c_0018; - public static final int QUANTITY5 = 0x000c_0019; - public static final int QUANTITY5_TEXT = 0x000c_001a; - public static final int QUANTITY10 = 0x000c_001b; - public static final int QUANTITY10_TEXT = 0x000c_001c; - public static final int QUANTITYX = 0x000c_001d; - public static final int QUANTITYX_TEXT = 0x000c_001e; - public static final int QUANTITYALL = 0x000c_001f; - public static final int QUANTITYALL_TEXT = 0x000c_0020; - public static final int BOTTOM_LINE6 = 0x000c_0021; - public static final int PLACEHOLDER = 0x000c_0022; - public static final int PLACEHOLDER_GRAPHIC = 0x000c_0023; - public static final int SEARCH = 0x000c_0024; - public static final int SEARCH_GRAPHIC = 0x000c_0025; - public static final int DEPOSIT_LINE = 0x000c_0026; - public static final int DEPOSITCONTAINERS = 0x000c_0027; - public static final int DEPOSITCONTAINERS_GRAPHIC = 0x000c_0028; - public static final int DEPOSITINV = 0x000c_0029; - public static final int DEPOSITINV_GRAPHIC = 0x000c_002a; - public static final int DEPOSITWORN = 0x000c_002b; - public static final int DEPOSITWORN_GRAPHIC = 0x000c_002c; - public static final int HORIZONTAL_LINE = 0x000c_002d; - public static final int POPUP_BUTTON_OUT = 0x000c_002e; - public static final int STORAGE_POPUP_TAB = 0x000c_002f; - public static final int INCINERATOR_TARGET = 0x000c_0030; - public static final int INCINERATOR_CONFIRM = 0x000c_0031; - public static final int INCINERATOR_CONFIRM_GRAPHIC0 = 0x000c_0032; - public static final int POTIONSTORE_ITEMS = 0x000c_0033; - public static final int POTIONSTORE_SCROLLBAR = 0x000c_0034; - public static final int MENU_CONTAINER = 0x000c_0035; - public static final int WORNITEMS_CONTAINER = 0x000c_0036; - public static final int WORNITEMS_CONTAINER_MODEL0 = 0x000c_0037; - public static final int WORNITEMS_CONTAINER_GRAPHIC1 = 0x000c_0038; - public static final int WORNITEMS_CONTAINER_GRAPHIC2 = 0x000c_0039; - public static final int WORNITEMS_CONTAINER_GRAPHIC3 = 0x000c_003a; - public static final int WORNITEMS_CONTAINER_GRAPHIC4 = 0x000c_003b; - public static final int WORNITEMS_CONTAINER_GRAPHIC5 = 0x000c_003c; - public static final int WORNSLOT0 = 0x000c_003d; - public static final int WORNSLOT1 = 0x000c_003e; - public static final int WORNSLOT2 = 0x000c_003f; - public static final int WORNSLOT3 = 0x000c_0040; - public static final int WORNSLOT4 = 0x000c_0041; - public static final int WORNSLOT5 = 0x000c_0042; - public static final int WORNSLOT7 = 0x000c_0043; - public static final int WORNSLOT9 = 0x000c_0044; - public static final int WORNSLOT10 = 0x000c_0045; - public static final int WORNSLOT12 = 0x000c_0046; - public static final int WORNSLOT13 = 0x000c_0047; - public static final int EXTRA_QUIVER_SLOT = 0x000c_0048; - public static final int STAT_GROUP = 0x000c_0049; - public static final int STAT_GROUP_TEXT0 = 0x000c_004a; - public static final int STABATT = 0x000c_004b; - public static final int SLASHATT = 0x000c_004c; - public static final int CRUSHATT = 0x000c_004d; - public static final int MAGICATT = 0x000c_004e; - public static final int RANGEATT = 0x000c_004f; - public static final int STAT_GROUP_TEXT6 = 0x000c_0050; - public static final int STABDEF = 0x000c_0051; - public static final int SLASHDEF = 0x000c_0052; - public static final int CRUSHDEF = 0x000c_0053; - public static final int MAGICDEF = 0x000c_0054; - public static final int RANGEDEF = 0x000c_0055; - public static final int STAT_GROUP_TEXT12 = 0x000c_0056; - public static final int MELEESTRENGTH = 0x000c_0057; - public static final int RANGESTRENGTH = 0x000c_0058; - public static final int MAGICDAMAGE = 0x000c_0059; - public static final int PRAYER = 0x000c_005a; - public static final int STAT_GROUP_TEXT17 = 0x000c_005b; - public static final int TYPEMULTIPLIER = 0x000c_005c; - public static final int SLAYERMULTIPLIER = 0x000c_005d; - public static final int STAT_GROUP_TEXT20 = 0x000c_005e; - public static final int NEXT_PAGE = 0x000c_005f; - public static final int SET_BONUS = 0x000c_0060; - public static final int WORNITEMS_CONTAINER_GRAPHIC21 = 0x000c_0061; - public static final int WORNITEMS_CONTAINER_TEXT22 = 0x000c_0062; - public static final int MENU_BUTTON = 0x000c_0063; - public static final int WORNITEMS_BUTTON = 0x000c_0064; - public static final int BANK_HIGHLIGHT = 0x000c_0065; - public static final int POPUP = 0x000c_0066; - public static final int DROPDOWN_CONTAINER = 0x000c_0067; - public static final int TOOLTIP = 0x000c_0068; - public static final int SET_BONUS_TEXT0 = 0x000c_0069; - public static final int SET_EFFECT = 0x000c_006a; - public static final int SCROLLBAR_1 = 0x000c_006b; - public static final int PREVIOUS_PAGE = 0x000c_006c; - public static final int ATTACKSPEEDBASE = 0x000c_006d; - public static final int ATTACKSPEEDACTUAL = 0x000c_006e; - public static final int EXTRA_QUIVER_AMMO_GRAPHIC = 0x000c_006f; - public static final int EXTRA_QUIVER_AMMO = 0x000c_0070; - public static final int DROPDOWN = 0x000c_0071; - public static final int DROPDOWN_CONTENT = 0x000c_0072; - public static final int DROPDOWN_SCROLLER = 0x000c_0073; - public static final int STORAGE_POPUP_TAB_FRAME = 0x000c_0074; - public static final int POPUP_BUTTON_IN = 0x000c_0075; - public static final int GIM_STORAGE = 0x000c_0076; - public static final int POTIONSTORE_BUTTON = 0x000c_0077; - public static final int TABDISPLAY = 0x000c_0078; - public static final int TABDISPLAY_TEXT0 = 0x000c_0079; - public static final int TABDISPLAY_SELECT_1 = 0x000c_007a; - public static final int INCINERATOR_TOGGLE = 0x000c_007b; - public static final int BANKTUT_TOGGLE = 0x000c_007c; - public static final int SIDEOPS_TOGGLE = 0x000c_007d; - public static final int BANKOPS_TOGGLE = 0x000c_007e; - public static final int DEPOSITINV_TOGGLE = 0x000c_007f; - public static final int DEPOSITWORN_TOGGLE = 0x000c_0080; - public static final int DEPOSITCONTAINERS_TOGGLE = 0x000c_0081; - public static final int POPUP_TAB_FORGETPOS = 0x000c_0082; - public static final int DEPOSITPOTION_TOGGLE = 0x000c_0083; - public static final int CHUGGINGBARREL_TOGGLE = 0x000c_0084; - public static final int RELEASE_PLACEHOLDERS = 0x000c_0085; - public static final int LOCKS = 0x000c_0086; - public static final int BANK_FILLERS = 0x000c_0087; - public static final int BANK_FILLER_1 = 0x000c_0088; - public static final int BANK_FILLER_1_TEXT = 0x000c_0089; - public static final int BANK_FILLER_10 = 0x000c_008a; - public static final int BANK_FILLER_10_TEXT = 0x000c_008b; - public static final int BANK_FILLER_50 = 0x000c_008c; - public static final int BANK_FILLER_50_TEXT = 0x000c_008d; - public static final int BANK_FILLER_X = 0x000c_008e; - public static final int BANK_FILLER_X_TEXT = 0x000c_008f; - public static final int BANK_FILLER_ALL = 0x000c_0090; - public static final int BANK_FILLER_ALL_TEXT = 0x000c_0091; - public static final int BANK_FILLER_CONFIRM = 0x000c_0092; + public static final int BANKTAGS_DISPLAY_CONTAINER = 0x000c_000e; + public static final int BANKTAGS_DISPLAY_DRAGLAYER = 0x000c_000f; + public static final int BANKTAGS_DISPLAY_ITEMS = 0x000c_0010; + public static final int BANKTAGS_DISPLAY_SCROLLBAR = 0x000c_0011; + public static final int BANKTAGS_HEADERS = 0x000c_0012; + public static final int POTIONSTORE_CONTAINER = 0x000c_0013; + public static final int POTIONSTORE_BACKGROUND = 0x000c_0014; + public static final int BANKTAGS_HEADER_SEPARATOR = 0x000c_0015; + public static final int BOTTOM = 0x000c_0016; + public static final int SWAP_INSERT = 0x000c_0017; + public static final int SWAP_INSERT_GRAPHIC = 0x000c_0018; + public static final int NOTE = 0x000c_0019; + public static final int NOTE_GRAPHIC = 0x000c_001a; + public static final int BOTTOM_LINE4 = 0x000c_001b; + public static final int QUANTITY_LAYER = 0x000c_001c; + public static final int QUANTITY1 = 0x000c_001d; + public static final int QUANTITY1_TEXT = 0x000c_001e; + public static final int QUANTITY5 = 0x000c_001f; + public static final int QUANTITY5_TEXT = 0x000c_0020; + public static final int QUANTITY10 = 0x000c_0021; + public static final int QUANTITY10_TEXT = 0x000c_0022; + public static final int QUANTITYX = 0x000c_0023; + public static final int QUANTITYX_TEXT = 0x000c_0024; + public static final int QUANTITYALL = 0x000c_0025; + public static final int QUANTITYALL_TEXT = 0x000c_0026; + public static final int BOTTOM_LINE6 = 0x000c_0027; + public static final int PLACEHOLDER = 0x000c_0028; + public static final int PLACEHOLDER_GRAPHIC = 0x000c_0029; + public static final int SEARCH = 0x000c_002a; + public static final int SEARCH_GRAPHIC = 0x000c_002b; + public static final int DEPOSIT_LINE = 0x000c_002c; + public static final int DEPOSITCONTAINERS = 0x000c_002d; + public static final int DEPOSITCONTAINERS_GRAPHIC = 0x000c_002e; + public static final int DEPOSITINV = 0x000c_002f; + public static final int DEPOSITINV_GRAPHIC = 0x000c_0030; + public static final int DEPOSITWORN = 0x000c_0031; + public static final int DEPOSITWORN_GRAPHIC = 0x000c_0032; + public static final int HORIZONTAL_LINE = 0x000c_0033; + public static final int POPUP_BUTTON_OUT = 0x000c_0034; + public static final int STORAGE_POPUP_TAB = 0x000c_0035; + public static final int INCINERATOR_TARGET = 0x000c_0036; + public static final int INCINERATOR_CONFIRM = 0x000c_0037; + public static final int BANKTAGS_POPUP_STRINGEXPORT_CONTAINER = 0x000c_0038; + public static final int INCINERATOR_CONFIRM_GRAPHIC0 = 0x000c_0039; + public static final int POTIONSTORE_ITEMS = 0x000c_003a; + public static final int POTIONSTORE_SCROLLBAR = 0x000c_003b; + public static final int MENU_CONTAINER = 0x000c_003c; + public static final int WORNITEMS_CONTAINER = 0x000c_003d; + public static final int WORNITEMS_CONTAINER_MODEL0 = 0x000c_003e; + public static final int WORNITEMS_CONTAINER_GRAPHIC1 = 0x000c_003f; + public static final int WORNITEMS_CONTAINER_GRAPHIC2 = 0x000c_0040; + public static final int WORNITEMS_CONTAINER_GRAPHIC3 = 0x000c_0041; + public static final int WORNITEMS_CONTAINER_GRAPHIC4 = 0x000c_0042; + public static final int WORNITEMS_CONTAINER_GRAPHIC5 = 0x000c_0043; + public static final int WORNSLOT0 = 0x000c_0044; + public static final int WORNSLOT1 = 0x000c_0045; + public static final int WORNSLOT2 = 0x000c_0046; + public static final int WORNSLOT3 = 0x000c_0047; + public static final int WORNSLOT4 = 0x000c_0048; + public static final int WORNSLOT5 = 0x000c_0049; + public static final int WORNSLOT7 = 0x000c_004a; + public static final int WORNSLOT9 = 0x000c_004b; + public static final int WORNSLOT10 = 0x000c_004c; + public static final int WORNSLOT12 = 0x000c_004d; + public static final int WORNSLOT13 = 0x000c_004e; + public static final int EXTRA_QUIVER_SLOT = 0x000c_004f; + public static final int STAT_GROUP = 0x000c_0050; + public static final int STAT_GROUP_TEXT0 = 0x000c_0051; + public static final int STABATT = 0x000c_0052; + public static final int SLASHATT = 0x000c_0053; + public static final int CRUSHATT = 0x000c_0054; + public static final int MAGICATT = 0x000c_0055; + public static final int RANGEATT = 0x000c_0056; + public static final int STAT_GROUP_TEXT6 = 0x000c_0057; + public static final int STABDEF = 0x000c_0058; + public static final int SLASHDEF = 0x000c_0059; + public static final int CRUSHDEF = 0x000c_005a; + public static final int MAGICDEF = 0x000c_005b; + public static final int RANGEDEF = 0x000c_005c; + public static final int STAT_GROUP_TEXT12 = 0x000c_005d; + public static final int MELEESTRENGTH = 0x000c_005e; + public static final int RANGESTRENGTH = 0x000c_005f; + public static final int MAGICDAMAGE = 0x000c_0060; + public static final int PRAYER = 0x000c_0061; + public static final int STAT_GROUP_TEXT17 = 0x000c_0062; + public static final int TYPEMULTIPLIER = 0x000c_0063; + public static final int SLAYERMULTIPLIER = 0x000c_0064; + public static final int STAT_GROUP_TEXT20 = 0x000c_0065; + public static final int NEXT_PAGE = 0x000c_0066; + public static final int SET_BONUS = 0x000c_0067; + public static final int WORNITEMS_CONTAINER_GRAPHIC21 = 0x000c_0068; + public static final int WORNITEMS_CONTAINER_TEXT22 = 0x000c_0069; + public static final int MENU_BUTTON = 0x000c_006a; + public static final int WORNITEMS_BUTTON = 0x000c_006b; + public static final int BANK_HIGHLIGHT = 0x000c_006c; + public static final int POPUP = 0x000c_006d; + public static final int DROPDOWN_CONTAINER = 0x000c_006e; + public static final int TOOLTIP = 0x000c_006f; + public static final int SET_BONUS_TEXT0 = 0x000c_0070; + public static final int SET_EFFECT = 0x000c_0071; + public static final int SCROLLBAR_1 = 0x000c_0072; + public static final int PREVIOUS_PAGE = 0x000c_0073; + public static final int ATTACKSPEEDBASE = 0x000c_0074; + public static final int ATTACKSPEEDACTUAL = 0x000c_0075; + public static final int EXTRA_QUIVER_AMMO_GRAPHIC = 0x000c_0076; + public static final int EXTRA_QUIVER_AMMO = 0x000c_0077; + public static final int DROPDOWN = 0x000c_0078; + public static final int DROPDOWN_CONTENT = 0x000c_0079; + public static final int DROPDOWN_SCROLLER = 0x000c_007a; + public static final int STORAGE_POPUP_TAB_FRAME = 0x000c_007b; + public static final int POPUP_BUTTON_IN = 0x000c_007c; + public static final int GIM_STORAGE = 0x000c_007d; + public static final int POTIONSTORE_BUTTON = 0x000c_007e; + public static final int TABDISPLAY = 0x000c_007f; + public static final int TABDISPLAY_TEXT0 = 0x000c_0080; + public static final int TABDISPLAY_SELECT_1 = 0x000c_0081; + public static final int INCINERATOR_TOGGLE = 0x000c_0082; + public static final int BANKTUT_TOGGLE = 0x000c_0083; + public static final int SIDEOPS_TOGGLE = 0x000c_0084; + public static final int BANKOPS_TOGGLE = 0x000c_0085; + public static final int DEPOSITINV_TOGGLE = 0x000c_0086; + public static final int DEPOSITWORN_TOGGLE = 0x000c_0087; + public static final int DEPOSITCONTAINERS_TOGGLE = 0x000c_0088; + public static final int POPUP_TAB_FORGETPOS = 0x000c_0089; + public static final int DEPOSITPOTION_TOGGLE = 0x000c_008a; + public static final int CHUGGINGBARREL_TOGGLE = 0x000c_008b; + public static final int RELEASE_PLACEHOLDERS = 0x000c_008c; + public static final int LOCKS = 0x000c_008d; + public static final int BANK_FILLERS = 0x000c_008e; + public static final int BANK_FILLER_1 = 0x000c_008f; + public static final int BANK_FILLER_1_TEXT = 0x000c_0090; + public static final int BANK_FILLER_10 = 0x000c_0091; + public static final int BANK_FILLER_10_TEXT = 0x000c_0092; + public static final int BANK_FILLER_50 = 0x000c_0093; + public static final int BANK_FILLER_50_TEXT = 0x000c_0094; + public static final int BANK_FILLER_X = 0x000c_0095; + public static final int BANK_FILLER_X_TEXT = 0x000c_0096; + public static final int BANK_FILLER_ALL = 0x000c_0097; + public static final int BANK_FILLER_ALL_TEXT = 0x000c_0098; + public static final int BANK_FILLER_CONFIRM = 0x000c_0099; + public static final int BANKTAGS_POPUP_STRINGEXPORT_CONTAINER_GRAPHIC0 = 0x000c_009a; + public static final int BANKTAGS_POPUP_STRINGEXPORT_OUTER = 0x000c_009b; + public static final int BANKTAGS_POPUP_STRINGEXPORT_WINDOW = 0x000c_009c; + public static final int BANKTAGS_POPUP_STRINGEXPORT_INPUTFIELD = 0x000c_009d; } public static final class CorpBeast @@ -1612,45 +1623,50 @@ public static final class Telenexus public static final int UNIVERSE = 0x0013_0000; public static final int FRAME = 0x0013_0001; public static final int CONTENTS = 0x0013_0002; - public static final int LEFT_CLICK_LAYER = 0x0013_0003; - public static final int LEFT_CLICK_TICK = 0x0013_0004; - public static final int PORTAL_MODEL = 0x0013_0005; - public static final int LEFT_TEXT = 0x0013_0006; - public static final int LEFT_CLICK_SET = 0x0013_0007; - public static final int LEFT_CLICK_OPTIONS = 0x0013_0008; - public static final int TELENEXUS_DONEBUTTON = 0x0013_0009; - public static final int ARROW1 = 0x0013_000a; - public static final int ARROW2 = 0x0013_000b; - public static final int BUTTON_GFX = 0x0013_000c; - public static final int BUTTON_TEXT = 0x0013_000d; - public static final int AVAILABLE_TEXT = 0x0013_000e; - public static final int LIST1 = 0x0013_000f; - public static final int LIST1_RECT0 = 0x0013_0010; - public static final int SLOTS_TEXT = 0x0013_0011; - public static final int LIST2 = 0x0013_0012; - public static final int LIST2_RECT0 = 0x0013_0013; - public static final int SCROLLING1 = 0x0013_0014; - public static final int ROWS1 = 0x0013_0015; - public static final int NON_SLOTTED_LIST = 0x0013_0016; - public static final int DRAG_HANDLES1 = 0x0013_0017; - public static final int SCROLLBAR1 = 0x0013_0018; - public static final int COST_BOUNDS = 0x0013_0019; - public static final int CONFIRM = 0x0013_001a; - public static final int CONFIRM_RECT0 = 0x0013_001b; - public static final int CONFIRM_DETAILS_TEXT = 0x0013_001c; - public static final int CONFIRM_DETAILS = 0x0013_001d; - public static final int TELENEXUS_CONFIRM = 0x0013_001e; - public static final int TELENEXUS_CANCEL = 0x0013_001f; - public static final int CONFIRM_GFX = 0x0013_0020; - public static final int CONFIRM_TEXT = 0x0013_0021; - public static final int COST_CONTAINER = 0x0013_0022; - public static final int CANCEL_GFX = 0x0013_0023; - public static final int CANCEL_TEXT = 0x0013_0024; - public static final int SCROLLING2 = 0x0013_0025; - public static final int ROWS2 = 0x0013_0026; - public static final int SLOTTED_LIST = 0x0013_0027; - public static final int DRAG_HANDLES2 = 0x0013_0028; - public static final int SCROLLBAR2 = 0x0013_0029; + public static final int LEFT_SIDE = 0x0013_0003; + public static final int AVAILABLE_TEXT = 0x0013_0004; + public static final int LIST1 = 0x0013_0005; + public static final int ARROW1 = 0x0013_0006; + public static final int MIDDLE = 0x0013_0007; + public static final int SLOTS_TEXT = 0x0013_0008; + public static final int LIST2 = 0x0013_0009; + public static final int ARROW2 = 0x0013_000a; + public static final int RIGHT_SIDE = 0x0013_000b; + public static final int RIGHT_SIDE_RECT0 = 0x0013_000c; + public static final int RIGHT_SIDE_RECT1 = 0x0013_000d; + public static final int CLICK_LAYER = 0x0013_000e; + public static final int TELENEXUS_DONEBUTTON = 0x0013_000f; + public static final int RADIO_BUTTON = 0x0013_0010; + public static final int CLICK_TEXT = 0x0013_0011; + public static final int CLICK_SET = 0x0013_0012; + public static final int PORTAL_MODEL = 0x0013_0013; + public static final int RADIO_BUTTON_OPTIONS = 0x0013_0014; + public static final int BUTTON_GFX = 0x0013_0015; + public static final int BUTTON_TEXT = 0x0013_0016; + public static final int LIST1_RECT0 = 0x0013_0017; + public static final int LIST2_RECT0 = 0x0013_0018; + public static final int SCROLLING1 = 0x0013_0019; + public static final int ROWS1 = 0x0013_001a; + public static final int NON_SLOTTED_LIST = 0x0013_001b; + public static final int DRAG_HANDLES1 = 0x0013_001c; + public static final int SCROLLBAR1 = 0x0013_001d; + public static final int COST_BOUNDS = 0x0013_001e; + public static final int CONFIRM = 0x0013_001f; + public static final int CONFIRM_RECT0 = 0x0013_0020; + public static final int CONFIRM_DETAILS_TEXT = 0x0013_0021; + public static final int CONFIRM_DETAILS = 0x0013_0022; + public static final int TELENEXUS_CONFIRM = 0x0013_0023; + public static final int TELENEXUS_CANCEL = 0x0013_0024; + public static final int CONFIRM_GFX = 0x0013_0025; + public static final int CONFIRM_TEXT = 0x0013_0026; + public static final int COST_CONTAINER = 0x0013_0027; + public static final int CANCEL_GFX = 0x0013_0028; + public static final int CANCEL_TEXT = 0x0013_0029; + public static final int SCROLLING2 = 0x0013_002a; + public static final int ROWS2 = 0x0013_002b; + public static final int SLOTTED_LIST = 0x0013_002c; + public static final int DRAG_HANDLES2 = 0x0013_002d; + public static final int SCROLLBAR2 = 0x0013_002e; } public static final class BondPrompt 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 36cb0504e9b..d255bedb916 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 @@ -58327,7 +58327,7 @@ public final class ItemID public static final int BR_HUNDRED_GAUNTLETS_LEVEL_10 = 23593; /** - * Berserker ring + * Berserker ring (i) */ public static final int BR_BERZERKER_RING = 23595; @@ -74000,7 +74000,7 @@ public final class ItemID public static final int DIZANAS_QUIVER_UNCHARGED = 28947; /** - * Dizana's quiver (uncharged) (l) + * Dizana's quiver (l) (uncharged) */ public static final int DIZANAS_QUIVER_UNCHARGED_TROUVER = 28949; @@ -87260,7 +87260,7 @@ public final class ItemID public static final int IBAN_STAFF_UPGRADED_ORN = 33332; /** - * Iban's staff (b)(o) + * Iban's staff (o) */ public static final int BROKEN_IBAN_STAFF_ORN = 33333; @@ -87483,6 +87483,11 @@ public final class ItemID * Uncharged trident (o) */ public static final int TOTS_UNCHARGED_ORN = 33434; + + /** + * Null + */ + public static final int PLACEHOLDER_TOTS_UNCHARGED_ORN = 33435; public static final int POH_DUMMY_THRONE_8 = 33436; /** @@ -87535,6 +87540,196 @@ public final class ItemID */ public static final int SET_LEAGUE_6_RELICHUNTER_T3 = 33457; + /** + * Dragon crossbow + */ + public static final int BR_XBOWS_CROSSBOW_DRAGON = 33460; + + /** + * Oathplate helm + */ + public static final int BR_OATHPLATE_HELM = 33462; + + /** + * Void melee helm (l) (broken) + */ + public static final int GAME_PEST_MELEE_HELM_TROUVER_BROKEN = 33464; + + /** + * Void melee helm (l) (mangled) + */ + public static final int GAME_PEST_MELEE_HELM_TROUVER_MANGLED = 33466; + + /** + * Void mage helm (l) (broken) + */ + public static final int GAME_PEST_MAGE_HELM_TROUVER_BROKEN = 33468; + + /** + * Void mage helm (l) (mangled) + */ + public static final int GAME_PEST_MAGE_HELM_TROUVER_MANGLED = 33470; + + /** + * Void ranger helm (l) (broken) + */ + public static final int GAME_PEST_ARCHER_HELM_TROUVER_BROKEN = 33472; + + /** + * Void ranger helm (l) (mangled) + */ + public static final int GAME_PEST_ARCHER_HELM_TROUVER_MANGLED = 33474; + + /** + * Void knight top (l) (broken) + */ + public static final int PEST_VOID_KNIGHT_TOP_TROUVER_BROKEN = 33476; + + /** + * Void knight top (l) (mangled) + */ + public static final int PEST_VOID_KNIGHT_TOP_TROUVER_MANGLED = 33478; + + /** + * Elite void top (l) (broken) + */ + public static final int ELITE_VOID_KNIGHT_TOP_TROUVER_BROKEN = 33480; + + /** + * Elite void top (l) (mangled) + */ + public static final int ELITE_VOID_KNIGHT_TOP_TROUVER_MANGLED = 33482; + + /** + * Void knight robe (l) (broken) + */ + public static final int PEST_VOID_KNIGHT_ROBES_TROUVER_BROKEN = 33484; + + /** + * Void knight robe (l) (mangled) + */ + public static final int PEST_VOID_KNIGHT_ROBES_TROUVER_MANGLED = 33486; + + /** + * Elite void robe (l) (broken) + */ + public static final int ELITE_VOID_KNIGHT_ROBES_TROUVER_BROKEN = 33488; + + /** + * Elite void robe (l) (mangled) + */ + public static final int ELITE_VOID_KNIGHT_ROBES_TROUVER_MANGLED = 33490; + + /** + * Void knight gloves (l) (broken) + */ + public static final int PEST_VOID_KNIGHT_GLOVES_TROUVER_BROKEN = 33492; + + /** + * Void knight gloves (l) (mangled) + */ + public static final int PEST_VOID_KNIGHT_GLOVES_TROUVER_MANGLED = 33494; + + /** + * Infernal max cape (l) (broken) + */ + public static final int SKILLCAPE_MAX_INFERNALCAPE_TROUVER_BROKEN = 33496; + + /** + * Infernal max cape (l) (mangled) + */ + public static final int SKILLCAPE_MAX_INFERNALCAPE_TROUVER_MANGLED = 33498; + + /** + * Infernal cape (l) (broken) + */ + public static final int INFERNAL_CAPE_TROUVER_BROKEN = 33500; + + /** + * Infernal cape (l) (mangled) + */ + public static final int INFERNAL_CAPE_TROUVER_MANGLED = 33502; + + /** + * Blood ancient sceptre (l) (broken) + */ + public static final int ANCIENT_SCEPTRE_BLOOD_TROUVER_BROKEN = 33504; + + /** + * Blood ancient sceptre (l) (mangled) + */ + public static final int ANCIENT_SCEPTRE_BLOOD_TROUVER_MANGLED = 33506; + + /** + * Ice ancient sceptre (l) (broken) + */ + public static final int ANCIENT_SCEPTRE_ICE_TROUVER_BROKEN = 33508; + + /** + * Ice ancient sceptre (l) (mangled) + */ + public static final int ANCIENT_SCEPTRE_ICE_TROUVER_MANGLED = 33510; + + /** + * Smoke ancient sceptre (l) (broken) + */ + public static final int ANCIENT_SCEPTRE_SMOKE_TROUVER_BROKEN = 33512; + + /** + * Smoke ancient sceptre (l) (mangled) + */ + public static final int ANCIENT_SCEPTRE_SMOKE_TROUVER_MANGLED = 33514; + + /** + * Shadow ancient sceptre (l) (broken) + */ + public static final int ANCIENT_SCEPTRE_SHADOW_TROUVER_BROKEN = 33516; + + /** + * Shadow ancient sceptre (l) (mangled) + */ + public static final int ANCIENT_SCEPTRE_SHADOW_TROUVER_MANGLED = 33518; + + /** + * Fighter torso (l) (broken) + */ + public static final int BARBASSAULT_PENANCE_FIGHTER_TORSO_TROUVER_BROKEN = 33520; + + /** + * Fighter torso (l) (mangled) + */ + public static final int BARBASSAULT_PENANCE_FIGHTER_TORSO_TROUVER_MANGLED = 33522; + + /** + * Dizana's quiver (l) (broken) + */ + public static final int DIZANAS_QUIVER_TROUVER_BROKEN = 33524; + + /** + * Dizana's quiver (l) (mangled) + */ + public static final int DIZANAS_QUIVER_TROUVER_MANGLED = 33526; + + /** + * Blessed dizana's quiver (l) (broken) + */ + public static final int DIZANAS_QUIVER_INFINITE_TROUVER_BROKEN = 33528; + + /** + * Blessed dizana's quiver (l) (mangled) + */ + public static final int DIZANAS_QUIVER_INFINITE_TROUVER_MANGLED = 33530; + + /** + * Dizana's max cape (l) (broken) + */ + public static final int SKILLCAPE_MAX_DIZANAS_TROUVER_BROKEN = 33532; + + /** + * Dizana's max cape (l) (mangled) + */ + public static final int SKILLCAPE_MAX_DIZANAS_TROUVER_MANGLED = 33533; + public static final class Cert { public static final int TWPART1 = 7; @@ -92171,6 +92366,8 @@ public static final class Cert public static final int SET_LEAGUE_6_RELICHUNTER_T1 = 33452; public static final int SET_LEAGUE_6_RELICHUNTER_T2 = 33455; public static final int SET_LEAGUE_6_RELICHUNTER_T3 = 33458; + public static final int BR_XBOWS_CROSSBOW_DRAGON = 33461; + public static final int BR_OATHPLATE_HELM = 33463; } public static final class Placeholder @@ -101724,7 +101921,6 @@ public static final class Placeholder public static final int DEADMAN_ALL_STAR_MISSION_TOTEM = 33426; public static final int MAGIC_ROCK_OF_VENGEANCE_2_USE = 33430; public static final int MAGIC_ROCK_OF_VENGEANCE_1_USE = 33433; - public static final int TOTS_UNCHARGED_ORN = 33435; public static final int BUCKET_SULPHUROUS_FERTILISER = 33438; public static final int LEAGUE_6_SLAYER_HELM1_I = 33440; public static final int SW_LEAGUE_6_SLAYER_HELM1_I = 33442; @@ -101735,6 +101931,40 @@ public static final class Placeholder public static final int SET_LEAGUE_6_RELICHUNTER_T1 = 33453; public static final int SET_LEAGUE_6_RELICHUNTER_T2 = 33456; public static final int SET_LEAGUE_6_RELICHUNTER_T3 = 33459; + public static final int GAME_PEST_MELEE_HELM_TROUVER_BROKEN = 33465; + public static final int GAME_PEST_MELEE_HELM_TROUVER_MANGLED = 33467; + public static final int GAME_PEST_MAGE_HELM_TROUVER_BROKEN = 33469; + public static final int GAME_PEST_MAGE_HELM_TROUVER_MANGLED = 33471; + public static final int GAME_PEST_ARCHER_HELM_TROUVER_BROKEN = 33473; + public static final int GAME_PEST_ARCHER_HELM_TROUVER_MANGLED = 33475; + public static final int PEST_VOID_KNIGHT_TOP_TROUVER_BROKEN = 33477; + public static final int PEST_VOID_KNIGHT_TOP_TROUVER_MANGLED = 33479; + public static final int ELITE_VOID_KNIGHT_TOP_TROUVER_BROKEN = 33481; + public static final int ELITE_VOID_KNIGHT_TOP_TROUVER_MANGLED = 33483; + public static final int PEST_VOID_KNIGHT_ROBES_TROUVER_BROKEN = 33485; + public static final int PEST_VOID_KNIGHT_ROBES_TROUVER_MANGLED = 33487; + public static final int ELITE_VOID_KNIGHT_ROBES_TROUVER_BROKEN = 33489; + public static final int ELITE_VOID_KNIGHT_ROBES_TROUVER_MANGLED = 33491; + public static final int PEST_VOID_KNIGHT_GLOVES_TROUVER_BROKEN = 33493; + public static final int PEST_VOID_KNIGHT_GLOVES_TROUVER_MANGLED = 33495; + public static final int SKILLCAPE_MAX_INFERNALCAPE_TROUVER_BROKEN = 33497; + public static final int SKILLCAPE_MAX_INFERNALCAPE_TROUVER_MANGLED = 33499; + public static final int INFERNAL_CAPE_TROUVER_BROKEN = 33501; + public static final int INFERNAL_CAPE_TROUVER_MANGLED = 33503; + public static final int ANCIENT_SCEPTRE_BLOOD_TROUVER_BROKEN = 33505; + public static final int ANCIENT_SCEPTRE_BLOOD_TROUVER_MANGLED = 33507; + public static final int ANCIENT_SCEPTRE_ICE_TROUVER_BROKEN = 33509; + public static final int ANCIENT_SCEPTRE_ICE_TROUVER_MANGLED = 33511; + public static final int ANCIENT_SCEPTRE_SMOKE_TROUVER_BROKEN = 33513; + public static final int ANCIENT_SCEPTRE_SMOKE_TROUVER_MANGLED = 33515; + public static final int ANCIENT_SCEPTRE_SHADOW_TROUVER_BROKEN = 33517; + public static final int ANCIENT_SCEPTRE_SHADOW_TROUVER_MANGLED = 33519; + public static final int BARBASSAULT_PENANCE_FIGHTER_TORSO_TROUVER_BROKEN = 33521; + public static final int BARBASSAULT_PENANCE_FIGHTER_TORSO_TROUVER_MANGLED = 33523; + public static final int DIZANAS_QUIVER_TROUVER_BROKEN = 33525; + public static final int DIZANAS_QUIVER_TROUVER_MANGLED = 33527; + public static final int DIZANAS_QUIVER_INFINITE_TROUVER_BROKEN = 33529; + public static final int DIZANAS_QUIVER_INFINITE_TROUVER_MANGLED = 33531; } /* This file is automatically generated. Do not edit. */ } 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 5e7c3304550..0ed6d31daa7 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 @@ -1109,6 +1109,10 @@ public final class NpcID */ public static final int POH_SERVANT_MAITRE_D_MAN = 227; public static final int POH_SERVANT_MULTI_MAITRE_D_MAN = 228; + + /** + * Demon butler + */ public static final int POH_SERVANT_DEMON = 229; public static final int POH_SERVANT_MULTI_DEMON = 230; @@ -68303,11 +68307,6 @@ public final class NpcID public static final int THRALL_IMP_MELEE_SUPERIOR = 15708; public static final int THRALL_IMP_MELEE_GREATER = 15709; - /** - * Demon butler - */ - public static final int POH_SERVANT_DEMON_BASE = 15710; - /** * Demon butler */ 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 56701164a1b..e989b602e06 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 @@ -20242,352 +20242,352 @@ public class ObjectID1 public static final int HERB_SNAPDRAGON_FULLYGROWN = 39811; /** - * Herb patch + * Guam leaf */ public static final int MYARM_REALPATCH_HERB1_GUAM_LEAF_ACTIVE = 39812; /** - * Herb patch + * Guam leaf */ public static final int MYARM_REALPATCH_HERB2_GUAM_LEAF_ACTIVE = 39813; /** - * Herbs + * Guam leaf */ public static final int MYARM_REALPATCH_HERB3_GUAM_LEAF_ACTIVE = 39814; /** - * Herbs + * Guam leaf */ public static final int MYARM_REALPATCH_HERB4_GUAM_LEAF_ACTIVE = 39815; /** - * Herbs + * Guam leaf */ public static final int MYARM_REALPATCH_HERB5_GUAM_LEAF_ACTIVE = 39816; /** - * Herb patch + * Marrentill */ public static final int MYARM_REALPATCH_HERB1_MARRENTILL_ACTIVE = 39817; /** - * Herb patch + * Marrentill */ public static final int MYARM_REALPATCH_HERB2_MARRENTILL_ACTIVE = 39818; /** - * Herbs + * Marrentill */ public static final int MYARM_REALPATCH_HERB3_MARRENTILL_ACTIVE = 39819; /** - * Herbs + * Marrentill */ public static final int MYARM_REALPATCH_HERB4_MARRENTILL_ACTIVE = 39820; /** - * Herbs + * Marrentill */ public static final int MYARM_REALPATCH_HERB5_MARRENTILL_ACTIVE = 39821; /** - * Herb patch + * Tarromin */ public static final int MYARM_REALPATCH_HERB1_TARROMIN_ACTIVE = 39822; /** - * Herb patch + * Tarromin */ public static final int MYARM_REALPATCH_HERB2_TARROMIN_ACTIVE = 39823; /** - * Herbs + * Tarromin */ public static final int MYARM_REALPATCH_HERB3_TARROMIN_ACTIVE = 39824; /** - * Herbs + * Tarromin */ public static final int MYARM_REALPATCH_HERB4_TARROMIN_ACTIVE = 39825; /** - * Herbs + * Tarromin */ public static final int MYARM_REALPATCH_HERB5_TARROMIN_ACTIVE = 39826; /** - * Herb patch + * Harralander */ public static final int MYARM_REALPATCH_HERB1_HARRALANDER_ACTIVE = 39827; /** - * Herb patch + * Harralander */ public static final int MYARM_REALPATCH_HERB2_HARRALANDER_ACTIVE = 39828; /** - * Herbs + * Harralander */ public static final int MYARM_REALPATCH_HERB3_HARRALANDER_ACTIVE = 39829; /** - * Herbs + * Harralander */ public static final int MYARM_REALPATCH_HERB4_HARRALANDER_ACTIVE = 39830; /** - * Herbs + * Harralander */ public static final int MYARM_REALPATCH_HERB5_HARRALANDER_ACTIVE = 39831; /** - * Herb patch + * Ranarr weed */ public static final int MYARM_REALPATCH_HERB1_RANARR_WEED_ACTIVE = 39832; /** - * Herb patch + * Ranarr weed */ public static final int MYARM_REALPATCH_HERB2_RANARR_WEED_ACTIVE = 39833; /** - * Herbs + * Ranarr weed */ public static final int MYARM_REALPATCH_HERB3_RANARR_WEED_ACTIVE = 39834; /** - * Herbs + * Ranarr weed */ public static final int MYARM_REALPATCH_HERB4_RANARR_WEED_ACTIVE = 39835; /** - * Herbs + * Ranarr weed */ public static final int MYARM_REALPATCH_HERB5_RANARR_WEED_ACTIVE = 39836; /** - * Herb patch + * Irit leaf */ public static final int MYARM_REALPATCH_HERB1_IRIT_LEAF_ACTIVE = 39837; /** - * Herb patch + * Irit leaf */ public static final int MYARM_REALPATCH_HERB2_IRIT_LEAF_ACTIVE = 39838; /** - * Herbs + * Irit leaf */ public static final int MYARM_REALPATCH_HERB3_IRIT_LEAF_ACTIVE = 39839; /** - * Herbs + * Irit leaf */ public static final int MYARM_REALPATCH_HERB4_IRIT_LEAF_ACTIVE = 39840; /** - * Herbs + * Irit leaf */ public static final int MYARM_REALPATCH_HERB5_IRIT_LEAF_ACTIVE = 39841; /** - * Herb patch + * Avantoe */ public static final int MYARM_REALPATCH_HERB1_AVANTOE_ACTIVE = 39842; /** - * Herb patch + * Avantoe */ public static final int MYARM_REALPATCH_HERB2_AVANTOE_ACTIVE = 39843; /** - * Herbs + * Avantoe */ public static final int MYARM_REALPATCH_HERB3_AVANTOE_ACTIVE = 39844; /** - * Herbs + * Avantoe */ public static final int MYARM_REALPATCH_HERB4_AVANTOE_ACTIVE = 39845; /** - * Herbs + * Avantoe */ public static final int MYARM_REALPATCH_HERB5_AVANTOE_ACTIVE = 39846; /** - * Herb patch + * Toadflax */ public static final int MYARM_REALPATCH_HERB1_TOADFLAX_ACTIVE = 39847; /** - * Herb patch + * Toadflax */ public static final int MYARM_REALPATCH_HERB2_TOADFLAX_ACTIVE = 39848; /** - * Herbs + * Toadflax */ public static final int MYARM_REALPATCH_HERB3_TOADFLAX_ACTIVE = 39849; /** - * Herbs + * Toadflax */ public static final int MYARM_REALPATCH_HERB4_TOADFLAX_ACTIVE = 39850; /** - * Herbs + * Toadflax */ public static final int MYARM_REALPATCH_HERB5_TOADFLAX_ACTIVE = 39851; /** - * Herb patch + * Kwuarm */ public static final int MYARM_REALPATCH_HERB1_KWUARM_ACTIVE = 39852; /** - * Herb patch + * Kwuarm */ public static final int MYARM_REALPATCH_HERB2_KWUARM_ACTIVE = 39853; /** - * Herbs + * Kwuarm */ public static final int MYARM_REALPATCH_HERB3_KWUARM_ACTIVE = 39854; /** - * Herbs + * Kwuarm */ public static final int MYARM_REALPATCH_HERB4_KWUARM_ACTIVE = 39855; /** - * Herbs + * Kwuarm */ public static final int MYARM_REALPATCH_HERB5_KWUARM_ACTIVE = 39856; /** - * Herb patch + * Cadantine */ public static final int MYARM_REALPATCH_HERB1_CADANTINE_ACTIVE = 39857; /** - * Herb patch + * Cadantine */ public static final int MYARM_REALPATCH_HERB2_CADANTINE_ACTIVE = 39858; /** - * Herbs + * Cadantine */ public static final int MYARM_REALPATCH_HERB3_CADANTINE_ACTIVE = 39859; /** - * Herbs + * Cadantine */ public static final int MYARM_REALPATCH_HERB4_CADANTINE_ACTIVE = 39860; /** - * Herbs + * Cadantine */ public static final int MYARM_REALPATCH_HERB5_CADANTINE_ACTIVE = 39861; /** - * Herb patch + * Lantadyme */ public static final int MYARM_REALPATCH_HERB1_LANTADYME_ACTIVE = 39862; /** - * Herb patch + * Lantadyme */ public static final int MYARM_REALPATCH_HERB2_LANTADYME_ACTIVE = 39863; /** - * Herbs + * Lantadyme */ public static final int MYARM_REALPATCH_HERB3_LANTADYME_ACTIVE = 39864; /** - * Herbs + * Lantadyme */ public static final int MYARM_REALPATCH_HERB4_LANTADYME_ACTIVE = 39865; /** - * Herbs + * Lantadyme */ public static final int MYARM_REALPATCH_HERB5_LANTADYME_ACTIVE = 39866; /** - * Herb patch + * Dwarf weed */ public static final int MYARM_REALPATCH_HERB1_DWARF_WEED_ACTIVE = 39867; /** - * Herb patch + * Dwarf weed */ public static final int MYARM_REALPATCH_HERB2_DWARF_WEED_ACTIVE = 39868; /** - * Herbs + * Dwarf weed */ public static final int MYARM_REALPATCH_HERB3_DWARF_WEED_ACTIVE = 39869; /** - * Herbs + * Dwarf weed */ public static final int MYARM_REALPATCH_HERB4_DWARF_WEED_ACTIVE = 39870; /** - * Herbs + * Dwarf weed */ public static final int MYARM_REALPATCH_HERB5_DWARF_WEED_ACTIVE = 39871; /** - * Herb patch + * Torstol */ public static final int MYARM_REALPATCH_HERB1_TORSTOL_ACTIVE = 39872; /** - * Herb patch + * Torstol */ public static final int MYARM_REALPATCH_HERB2_TORSTOL_ACTIVE = 39873; /** - * Herbs + * Torstol */ public static final int MYARM_REALPATCH_HERB3_TORSTOL_ACTIVE = 39874; /** - * Herbs + * Torstol */ public static final int MYARM_REALPATCH_HERB4_TORSTOL_ACTIVE = 39875; /** - * Herbs + * Torstol */ public static final int MYARM_REALPATCH_HERB5_TORSTOL_ACTIVE = 39876; /** - * Herb patch + * Snapdragon */ public static final int MYARM_REALPATCH_HERB1_SNAPDRAGON_ACTIVE = 39877; /** - * Herb patch + * Snapdragon */ public static final int MYARM_REALPATCH_HERB2_SNAPDRAGON_ACTIVE = 39878; /** - * Herbs + * Snapdragon */ public static final int MYARM_REALPATCH_HERB3_SNAPDRAGON_ACTIVE = 39879; /** - * Herbs + * Snapdragon */ public static final int MYARM_REALPATCH_HERB4_SNAPDRAGON_ACTIVE = 39880; /** - * Herbs + * Snapdragon */ public static final int MYARM_REALPATCH_HERB5_SNAPDRAGON_ACTIVE = 39881; @@ -60892,27 +60892,27 @@ public class ObjectID1 public static final int FARMING_HOPS_PATCH_5 = 55341; /** - * Herb patch + * Huasca */ public static final int MYARM_REALPATCH_HERB1_HUASCA_ACTIVE = 55342; /** - * Herb patch + * Huasca */ public static final int MYARM_REALPATCH_HERB2_HUASCA_ACTIVE = 55343; /** - * Herbs + * Huasca */ public static final int MYARM_REALPATCH_HERB3_HUASCA_ACTIVE = 55344; /** - * Herbs + * Huasca */ public static final int MYARM_REALPATCH_HERB4_HUASCA_ACTIVE = 55345; /** - * Herbs + * Huasca */ public static final int MYARM_REALPATCH_HERB5_HUASCA_ACTIVE = 55346; 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 8467611637d..3afbba2ae34 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 @@ -3758,6 +3758,7 @@ public static final class BanktabIcons public static final int _1 = 1082; public static final int _2 = 1083; public static final int _3 = 2417; + public static final int _4 = 8357; public static final int ALL_ITEMS = _0; public static final int ADD = _1; 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 7d156fd95bc..ad270821d31 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 @@ -1381,5 +1381,131 @@ public final class VarClientID public static final int LEAGUE_TASK_MENU_BUILD_IS_ACTIVE = 1374; public static final int ALLSTAR_OCULUS_HIDEHINT = 1375; public static final int SPECTATOR_SEARCH_STRING = 1376; + public static final int BANKTAGS_NEEDS_REDRAW = 1377; + public static final int BANKTAGS_SCROLLPOS = 1378; + public static final int BANKTAGS_SCROLLHEIGHT = 1379; + public static final int BANKTAGS_ACTIVE_TAG = 1380; + public static final int BANKTAGS_HEADERS_SLOT0 = 1381; + public static final int BANKTAGS_HEADERS_SLOT1 = 1382; + public static final int BANKTAGS_HEADERS_SLOT2 = 1383; + public static final int BANKTAGS_HEADERS_SLOT3 = 1384; + public static final int BANKTAGS_HEADERS_SLOT4 = 1385; + public static final int BANKTAGS_HEADERS_SLOT5 = 1386; + public static final int BANKTAGS_HEADERS_SLOT6 = 1387; + public static final int BANKTAGS_HEADERS_SLOT7 = 1388; + public static final int BANKTAGS_HEADERS_SLOT8 = 1389; + public static final int BANKTAGS_HEADERS_SLOT9 = 1390; + public static final int BANKTAGS_HEADERS_SLOT10 = 1391; + public static final int BANKTAGS_HEADERS_SLOT11 = 1392; + public static final int BANKTAGS_HEADERS_SLOT12 = 1393; + public static final int BANKTAGS_HEADERS_SLOT13 = 1394; + public static final int BANKTAGS_HEADERS_SLOT14 = 1395; + public static final int BANKTAGS_HEADERS_SLOT15 = 1396; + public static final int BANKTAGS_HEADERS_SLOT16 = 1397; + public static final int BANKTAGS_HEADERS_SLOT17 = 1398; + public static final int BANKTAGS_HEADERS_SLOT18 = 1399; + public static final int BANKTAGS_HEADERS_SLOT19 = 1400; + public static final int BANKTAGS_HEADERS_SCROLL_OFFSET = 1401; + public static final int BANKTAGS_T0_NAME = 1402; + public static final int BANKTAGS_T1_NAME = 1403; + public static final int BANKTAGS_T2_NAME = 1404; + public static final int BANKTAGS_T3_NAME = 1405; + public static final int BANKTAGS_T4_NAME = 1406; + public static final int BANKTAGS_T5_NAME = 1407; + public static final int BANKTAGS_T6_NAME = 1408; + public static final int BANKTAGS_T7_NAME = 1409; + public static final int BANKTAGS_T8_NAME = 1410; + public static final int BANKTAGS_T9_NAME = 1411; + public static final int BANKTAGS_T10_NAME = 1412; + public static final int BANKTAGS_T11_NAME = 1413; + public static final int BANKTAGS_T12_NAME = 1414; + public static final int BANKTAGS_T13_NAME = 1415; + public static final int BANKTAGS_T14_NAME = 1416; + public static final int BANKTAGS_T15_NAME = 1417; + public static final int BANKTAGS_T16_NAME = 1418; + public static final int BANKTAGS_T17_NAME = 1419; + public static final int BANKTAGS_T18_NAME = 1420; + public static final int BANKTAGS_T19_NAME = 1421; + public static final int BANKTAGS_T0_OBJICON = 1422; + public static final int BANKTAGS_T1_OBJICON = 1423; + public static final int BANKTAGS_T2_OBJICON = 1424; + public static final int BANKTAGS_T3_OBJICON = 1425; + public static final int BANKTAGS_T4_OBJICON = 1426; + public static final int BANKTAGS_T5_OBJICON = 1427; + public static final int BANKTAGS_T6_OBJICON = 1428; + public static final int BANKTAGS_T7_OBJICON = 1429; + public static final int BANKTAGS_T8_OBJICON = 1430; + public static final int BANKTAGS_T9_OBJICON = 1431; + public static final int BANKTAGS_T10_OBJICON = 1432; + public static final int BANKTAGS_T11_OBJICON = 1433; + public static final int BANKTAGS_T12_OBJICON = 1434; + public static final int BANKTAGS_T13_OBJICON = 1435; + public static final int BANKTAGS_T14_OBJICON = 1436; + public static final int BANKTAGS_T15_OBJICON = 1437; + public static final int BANKTAGS_T16_OBJICON = 1438; + public static final int BANKTAGS_T17_OBJICON = 1439; + public static final int BANKTAGS_T18_OBJICON = 1440; + public static final int BANKTAGS_T19_OBJICON = 1441; + public static final int BANKTAGS_T0_ITEMS = 1442; + public static final int BANKTAGS_T0_XCOORDS = 1443; + public static final int BANKTAGS_T0_YCOORDS = 1444; + public static final int BANKTAGS_T1_ITEMS = 1445; + public static final int BANKTAGS_T1_XCOORDS = 1446; + public static final int BANKTAGS_T1_YCOORDS = 1447; + public static final int BANKTAGS_T2_ITEMS = 1448; + public static final int BANKTAGS_T2_XCOORDS = 1449; + public static final int BANKTAGS_T2_YCOORDS = 1450; + public static final int BANKTAGS_T3_ITEMS = 1451; + public static final int BANKTAGS_T3_XCOORDS = 1452; + public static final int BANKTAGS_T3_YCOORDS = 1453; + public static final int BANKTAGS_T4_ITEMS = 1454; + public static final int BANKTAGS_T4_XCOORDS = 1455; + public static final int BANKTAGS_T4_YCOORDS = 1456; + public static final int BANKTAGS_T5_ITEMS = 1457; + public static final int BANKTAGS_T5_XCOORDS = 1458; + public static final int BANKTAGS_T5_YCOORDS = 1459; + public static final int BANKTAGS_T6_ITEMS = 1460; + public static final int BANKTAGS_T6_XCOORDS = 1461; + public static final int BANKTAGS_T6_YCOORDS = 1462; + public static final int BANKTAGS_T7_ITEMS = 1463; + public static final int BANKTAGS_T7_XCOORDS = 1464; + public static final int BANKTAGS_T7_YCOORDS = 1465; + public static final int BANKTAGS_T8_ITEMS = 1466; + public static final int BANKTAGS_T8_XCOORDS = 1467; + public static final int BANKTAGS_T8_YCOORDS = 1468; + public static final int BANKTAGS_T9_ITEMS = 1469; + public static final int BANKTAGS_T9_XCOORDS = 1470; + public static final int BANKTAGS_T9_YCOORDS = 1471; + public static final int BANKTAGS_T10_ITEMS = 1472; + public static final int BANKTAGS_T10_XCOORDS = 1473; + public static final int BANKTAGS_T10_YCOORDS = 1474; + public static final int BANKTAGS_T11_ITEMS = 1475; + public static final int BANKTAGS_T11_XCOORDS = 1476; + public static final int BANKTAGS_T11_YCOORDS = 1477; + public static final int BANKTAGS_T12_ITEMS = 1478; + public static final int BANKTAGS_T12_XCOORDS = 1479; + public static final int BANKTAGS_T12_YCOORDS = 1480; + public static final int BANKTAGS_T13_ITEMS = 1481; + public static final int BANKTAGS_T13_XCOORDS = 1482; + public static final int BANKTAGS_T13_YCOORDS = 1483; + public static final int BANKTAGS_T14_ITEMS = 1484; + public static final int BANKTAGS_T14_XCOORDS = 1485; + public static final int BANKTAGS_T14_YCOORDS = 1486; + public static final int BANKTAGS_T15_ITEMS = 1487; + public static final int BANKTAGS_T15_XCOORDS = 1488; + public static final int BANKTAGS_T15_YCOORDS = 1489; + public static final int BANKTAGS_T16_ITEMS = 1490; + public static final int BANKTAGS_T16_XCOORDS = 1491; + public static final int BANKTAGS_T16_YCOORDS = 1492; + public static final int BANKTAGS_T17_ITEMS = 1493; + public static final int BANKTAGS_T17_XCOORDS = 1494; + public static final int BANKTAGS_T17_YCOORDS = 1495; + public static final int BANKTAGS_T18_ITEMS = 1496; + public static final int BANKTAGS_T18_XCOORDS = 1497; + public static final int BANKTAGS_T18_YCOORDS = 1498; + public static final int BANKTAGS_T19_ITEMS = 1499; + public static final int BANKTAGS_T19_XCOORDS = 1500; + public static final int BANKTAGS_T19_YCOORDS = 1501; + public static final int REUSABLE_FLOATER_SELECTED = 1502; /* 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 d1ae7bbf362..bacd28c9fa9 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 @@ -10015,6 +10015,9 @@ public final class VarbitID public static final int RUNE_POUCH_QUANTITY_5 = 15375; public static final int RUNE_POUCH_QUANTITY_6 = 15376; public static final int BOUNTY_TASK_ITEM_COUNTER_5 = 15397; + public static final int SLAYER_UNLOCK_LONGER_GRYPHON = 15398; + public static final int SLAYER_UNLOCK_LONGER_FROST_DRAGONS = 15399; + public static final int SLAYER_WEIGHTED_LONGER_FROST_DRAGONS = 15400; public static final int XMAS24_INVITE_HAIRDRESSER = 15522; public static final int XMAS24_INVITE_SARAH = 15524; public static final int LEAGUE_HASNT_USED_BOOTS_FOR_MOUNT_QUID = 15647; diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java index ccb1cbf7a48..c02034b0e50 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java @@ -185,6 +185,10 @@ public enum ItemMapping ITEM_VIRTUS_ROBE_BOTTOM(ItemID.VIRTUS_LEGS, ItemID.VIRTUS_LEGS_ORNAMENT), ITEM_ECHO_VIRTUS_ORNAMENT_KIT(ItemID.VIRTUS_ORNAMENT_KIT, ItemID.VIRTUS_MASK_ORNAMENT, ItemID.VIRTUS_TOP_ORNAMENT, ItemID.VIRTUS_LEGS_ORNAMENT), ITEM_ECHO_VENATOR_BOW_ORNAMENT_KIT(ItemID.VENATOR_BOW_ORNAMENT_KIT, ItemID.VENATOR_BOW_ORNAMENT_UNCHARGED, ItemID.VENATOR_BOW_ORNAMENT), + ITEM_DEMONIC_PACTS_TRIDENT_ORNAMENT_KIT(ItemID.DEMONIC_TRIDENT_ORNAMENT_KIT, ItemID.TOTS_UNCHARGED_ORN, ItemID.TOTS_CHARGED_ORN, ItemID.TOTS_ORN, ItemID.TOTS_I_UNCHARGED_ORN, ItemID.TOTS_I_CHARGED_ORN, ItemID.TOXIC_TOTS_UNCHARGED_ORN, ItemID.TOXIC_TOTS_CHARGED_ORN, ItemID.TOXIC_TOTS_I_UNCHARGED_ORN, ItemID.TOXIC_TOTS_I_CHARGED_ORN), + ITEM_SOULREAPER_AXE(ItemID.SOULREAPER, ItemID.SOULREAPER_AXE_ORN), + ITEM_DEMONIC_PACTS_AXE_ORNAMENT_KIT(ItemID.DEMONIC_AXE_ORNAMENT_KIT, ItemID.SOULREAPER_AXE_ORN), + ITEM_DEMONIC_STAFF_KIT(ItemID.DEMONIC_STAFF_ORNAMENT_KIT, ItemID.IBAN_STAFF_ORN, ItemID.IBAN_STAFF_UPGRADED_ORN, ItemID.BROKEN_IBAN_STAFF_ORN), // Ensouled heads ITEM_ENSOULED_GOBLIN_HEAD(ItemID.ARCEUUS_CORPSE_GOBLIN, ItemID.ARCEUUS_CORPSE_GOBLIN_INITIAL), @@ -244,10 +248,11 @@ public enum ItemMapping // Degradable/charged weaponry/armour ITEM_ABYSSAL_WHIP(ItemID.ABYSSAL_WHIP, ItemID.ABYSSAL_WHIP_LAVA, ItemID.ABYSSAL_WHIP_ICE, ItemID.LEAGUE_3_WHIP), ITEM_KRAKEN_TENTACLE(ItemID.KRAKEN_TENTACLE, ItemID.ABYSSAL_TENTACLE, ItemID.LEAGUE_3_WHIP_TENTACLE), - ITEM_TRIDENT_OF_THE_SEAS(ItemID.TOTS_UNCHARGED, ItemID.TOTS_CHARGED), - ITEM_TRIDENT_OF_THE_SEAS_E(ItemID.TOTS_I_UNCHARGED, ItemID.TOTS_I_CHARGED), - ITEM_TRIDENT_OF_THE_SWAMP(ItemID.TOXIC_TOTS_UNCHARGED, ItemID.TOXIC_TOTS_CHARGED), - ITEM_TRIDENT_OF_THE_SWAMP_E(ItemID.TOXIC_TOTS_I_UNCHARGED, ItemID.TOXIC_TOTS_I_CHARGED), + ITEM_TRIDENT_OF_THE_SEAS(ItemID.TOTS_UNCHARGED, ItemID.TOTS_CHARGED, ItemID.TOTS_UNCHARGED_ORN, ItemID.TOTS_CHARGED_ORN), + ITEM_TRIDENT_OF_THE_SEAS_FULL(ItemID.TOTS, ItemID.TOTS_ORN), + ITEM_TRIDENT_OF_THE_SEAS_E(ItemID.TOTS_I_UNCHARGED, ItemID.TOTS_I_CHARGED, ItemID.TOTS_I_UNCHARGED_ORN, ItemID.TOTS_I_CHARGED_ORN), + ITEM_TRIDENT_OF_THE_SWAMP(ItemID.TOXIC_TOTS_UNCHARGED, ItemID.TOXIC_TOTS_CHARGED, ItemID.TOXIC_TOTS_UNCHARGED_ORN, ItemID.TOXIC_TOTS_CHARGED_ORN), + ITEM_TRIDENT_OF_THE_SWAMP_E(ItemID.TOXIC_TOTS_I_UNCHARGED, ItemID.TOXIC_TOTS_I_CHARGED, ItemID.TOXIC_TOTS_I_UNCHARGED_ORN, ItemID.TOXIC_TOTS_I_CHARGED_ORN), ITEM_TOXIC_BLOWPIPE(ItemID.TOXIC_BLOWPIPE, ItemID.TOXIC_BLOWPIPE_LOADED, ItemID.TOXIC_BLOWPIPE_ORNAMENT, ItemID.TOXIC_BLOWPIPE_LOADED_ORNAMENT), ITEM_TOXIC_STAFF_OFF_THE_DEAD(ItemID.TOXIC_SOTD, ItemID.TOXIC_SOTD_CHARGED), ITEM_SERPENTINE_HELM(ItemID.SERPENTINE_HELM, ItemID.SERPENTINE_HELM_CHARGED, ItemID.SERPENTINE_HELM_CYAN, ItemID.SERPENTINE_HELM_CHARGED_CYAN, ItemID.SERPENTINE_HELM_RED, ItemID.SERPENTINE_HELM_CHARGED_RED), @@ -324,6 +329,7 @@ public enum ItemMapping ITEM_BASILISK_JAW(ItemID.BASILISK_JAW, ItemID.NEITIZNOT_FACEGUARD), ITEM_HELM_OF_NEITIZNOT(ItemID.FRIS_KINGLY_HELM, ItemID.NEITIZNOT_FACEGUARD, ItemID.BH_FRIS_KINGLY_HELM_CORRUPTED), ITEM_TWISTED_HORNS(ItemID.TWISTED_HORNS, ItemID.SLAYER_HELM_TWISTED, ItemID.SLAYER_HELM_I_TWISTED, ItemID.SW_SLAYER_HELM_I_TWISTED, ItemID.PVPA_SLAYER_HELM_I_TWISTED), + ITEM_DEMONIC_QUILL(ItemID.LEAGUE_6_DEMONIC_QUILL, ItemID.LEAGUE_6_SLAYER_HELM1, ItemID.LEAGUE_6_SLAYER_HELM2, ItemID.LEAGUE_6_SLAYER_HELM1_I, ItemID.SW_LEAGUE_6_SLAYER_HELM1_I, ItemID.PVPA_LEAGUE_6_SLAYER_HELM1_I, ItemID.LEAGUE_6_SLAYER_HELM2_I, ItemID.SW_LEAGUE_6_SLAYER_HELM2_I, ItemID.PVPA_LEAGUE_6_SLAYER_HELM2_I), ITEM_ELDRITCH_ORB(ItemID.ELDRITCH_ORB, ItemID.NIGHTMARE_STAFF_ELDRITCH), ITEM_HARMONISED_ORB(ItemID.HARMONISED_ORB, ItemID.NIGHTMARE_STAFF_HARMONISED), ITEM_VOLATILE_ORB(ItemID.VOLATILE_ORB, ItemID.NIGHTMARE_STAFF_VOLATILE, ItemID.DEADMAN_NIGHTMARE_STAFF_VOLATILE), diff --git a/runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcOverlay.java b/runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcOverlay.java index 7d2411efcfe..4fcde0eff63 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcOverlay.java @@ -39,6 +39,7 @@ import net.runelite.api.Perspective; import net.runelite.api.Point; import net.runelite.api.coords.LocalPoint; +import net.runelite.api.gameval.VarbitID; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; @@ -64,6 +65,11 @@ class NpcOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { + if (client.getVarbitValue(VarbitID.CUTSCENE_STATUS) == 1) + { + return null; + } + for (HighlightedNpc highlightedNpc : highlightedNpcs.values()) { renderNpcOverlay(graphics, highlightedNpc); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java index f2eeb77c9c8..2bb4a50dcb8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java @@ -30,6 +30,50 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import com.google.common.html.HtmlEscapers; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Deque; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ScheduledExecutorService; +import java.util.function.Function; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.GroupLayout; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.KeyStroke; +import javax.swing.LayoutStyle; +import javax.swing.ScrollPaneConstants; +import javax.swing.SwingUtilities; +import javax.swing.border.EmptyBorder; +import javax.swing.border.LineBorder; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.client.config.Config; @@ -49,15 +93,6 @@ import net.runelite.client.util.LinkBrowser; import net.runelite.client.util.SwingUtil; import net.runelite.client.util.VerificationException; - -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.swing.*; -import javax.swing.border.EmptyBorder; -import javax.swing.border.LineBorder; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -248,7 +283,7 @@ private class PluginItem extends JPanel implements SearchablePlugin } else { - descriptionText = "Plugin is incompatible and requires its author to update it"; + descriptionText = "Plugin is incompatible, requires update by its author"; } } if (!descriptionText.startsWith("")) @@ -493,22 +528,18 @@ public void changedUpdate(DocumentEvent e) } }); - JLabel externalPluginWarning1 = new JLabel("External plugins are verified to not be " + - "malicious or rule-breaking, but are not " + - "maintained by the RuneLite developers. " + - "They may cause bugs or instability."); - externalPluginWarning1.setBackground(new Color(0xFFBB33)); - externalPluginWarning1.setForeground(Color.BLACK); - externalPluginWarning1.setBorder(new EmptyBorder(5, 5, 5, 2)); - externalPluginWarning1.setOpaque(true); - - JLabel externalPluginWarning2 = new JLabel("Use at your own risk!"); - externalPluginWarning2.setHorizontalAlignment(JLabel.CENTER); - externalPluginWarning2.setFont(FontManager.getRunescapeBoldFont()); - externalPluginWarning2.setBackground(externalPluginWarning1.getBackground()); - externalPluginWarning2.setForeground(externalPluginWarning1.getForeground()); - externalPluginWarning2.setBorder(new EmptyBorder(0, 5, 5, 5)); - externalPluginWarning2.setOpaque(true); + JLabel externalPluginWarning = new JLabel("Plugin Hub plugins are provided by third parties not affiliated with RuneLite. " + + "Click here to learn more."); + externalPluginWarning.setBorder(new EmptyBorder(5, 5, 5, 5)); + externalPluginWarning.setOpaque(true); + externalPluginWarning.addMouseListener(new MouseAdapter() + { + @Override + public void mouseClicked(MouseEvent e) + { + LinkBrowser.browse("https://github.com/runelite/runelite/wiki/Plugin-Hub-Review"); + } + }); mainPanel = new JPanel(); mainPanel.setBorder(BorderFactory.createEmptyBorder(0, 7, 7, 7)); @@ -525,16 +556,11 @@ public void changedUpdate(DocumentEvent e) mainPanelWrapper.setLayout(layout); layout.setVerticalGroup(layout.createSequentialGroup() - .addComponent(externalPluginWarning1) - .addComponent(externalPluginWarning2) - .addGap(7) .addComponent(mainPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(refreshing) .addGap(0, 0, 0x7000)); layout.setHorizontalGroup(layout.createParallelGroup() - .addComponent(externalPluginWarning1, 0, Short.MAX_VALUE, Short.MAX_VALUE) - .addComponent(externalPluginWarning2, 0, Short.MAX_VALUE, Short.MAX_VALUE) .addComponent(mainPanel) .addComponent(refreshing, 0, Short.MAX_VALUE, Short.MAX_VALUE)); } @@ -551,11 +577,17 @@ public void changedUpdate(DocumentEvent e) layout.setVerticalGroup(layout.createSequentialGroup() .addGap(10) + .addComponent(externalPluginWarning) + .addGap(7) .addComponent(searchBar, 30, 30, 30) .addGap(10) .addComponent(scrollPane)); layout.setHorizontalGroup(layout.createParallelGroup() + .addGroup(layout.createSequentialGroup() + .addGap(10) + .addComponent(externalPluginWarning) + .addGap(10)) .addGroup(layout.createSequentialGroup() .addGap(10) .addComponent(searchBar) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java index 4feca33da86..3bbec697ea0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java @@ -699,7 +699,7 @@ else if (color3 == -2) } // temp draw - int uploadTempModel(Model model, int orientation, int x, int y, int z, IntBuffer opaqueBuffer) + int uploadTempModel(Model model, int orientation, int x, int y, int z, IntBuffer buffer) { final int triangleCount = model.getFaceCount(); final int vertexCount = model.getVerticesCount(); @@ -716,6 +716,8 @@ int uploadTempModel(Model model, int orientation, int x, int y, int z, IntBuffer final int[] color2s = model.getFaceColors2(); final int[] color3s = model.getFaceColors3(); + final byte[] transparencies = model.getFaceTransparencies(); + final short[] faceTextures = model.getFaceTextures(); final byte[] bias = model.getFaceBias(); @@ -810,17 +812,18 @@ else if (color3 == -2) int sv2 = (int) (v2 * 256f); int alphaBias = 0; + alphaBias |= transparencies != null ? (transparencies[face] & 0xff) << 24 : 0; alphaBias |= bias != null ? (bias[face] & 0xff) << 16 : 0; int texture = faceTextures != null ? faceTextures[face] + 1 : 0; - putfff4(opaqueBuffer, vx1, vy1, vz1, alphaBias | color1); - put2222(opaqueBuffer, texture, su0, sv0, 0); + putfff4(buffer, vx1, vy1, vz1, alphaBias | color1); + put2222(buffer, texture, su0, sv0, 0); - putfff4(opaqueBuffer, vx2, vy2, vz2, alphaBias | color2); - put2222(opaqueBuffer, texture, su1, sv1, 0); + putfff4(buffer, vx2, vy2, vz2, alphaBias | color2); + put2222(buffer, texture, su1, sv1, 0); - putfff4(opaqueBuffer, vx3, vy3, vz3, alphaBias | color3); - put2222(opaqueBuffer, texture, su2, sv2, 0); + putfff4(buffer, vx3, vy3, vz3, alphaBias | color3); + put2222(buffer, texture, su2, sv2, 0); len += 3; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/Zone.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/Zone.java index 63da3d64d41..00df3ce78a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/Zone.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/Zone.java @@ -537,10 +537,10 @@ void renderAlpha(int zx, int zz, int cyaw, int cpitch, int minLevel, int current lastzx = zx; lastzz = zz; - int yawsin = Perspective.SINE[cyaw]; - int yawcos = Perspective.COSINE[cyaw]; - int pitchsin = Perspective.SINE[cpitch]; - int pitchcos = Perspective.COSINE[cpitch]; + int yawsin = Perspective.SINE14[cyaw]; + int yawcos = Perspective.COSINE14[cyaw]; + int pitchsin = Perspective.SINE14[cpitch]; + int pitchcos = Perspective.COSINE14[cpitch]; for (int j = 0; j < alphaModels.size(); ++j) // NOPMD: ForLoopCanBeForeach { AlphaModel m = alphaModels.get(j); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java index f8dd73906fa..0b2f8d5d173 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java @@ -138,6 +138,7 @@ private void init() add(new CappedStatBoost(HITPOINTS, max -> 18, max -> Math.min((int) (max * 0.2), 10)), ItemID.HADDOCK); add(combo(food(19), heal(RUN_ENERGY, 20)), ItemID.YELLOWFIN); add(combo(food(22), heal(PRAYER, 5)), ItemID.BLUEFIN); + add(combo(food(9), boost(STRENGTH, 2)), ItemID.TBONE_STEAK); // Dorgeshuun Cuisine add(food(2), ItemID.DORGESH_BAT_SHISH, ItemID.DORGESH_CRISPY_FROGLEGS, ItemID.DORGESH_CAVE_CRAWLER_FILLETS, ItemID.DORGESH_WALL_BEAST_FINGERS, ItemID.DORGESH_FROG_BURGER, ItemID.DORGESH_FROG_SPAWN_GUMBO, ItemID.DORGESH_GREEN_GLOOP_SOUP, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 48b58fda34e..abf413e53ec 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -546,7 +546,7 @@ private void configureObjectClick(MenuOpened event) if (entry.getType() == MenuAction.EXAMINE_OBJECT) { final ObjectComposition composition = client.getObjectDefinition(entry.getIdentifier()); - final var ops = composition.getOps(); + final EntityOps ops = composition.getOps(); final Integer swapConfig = getObjectSwapConfig(false, composition.getId()); final Integer shiftSwapConfig = getObjectSwapConfig(true, composition.getId()); @@ -579,22 +579,25 @@ private void configureObjectClick(MenuOpened event) .setType(MenuAction.RUNELITE) .onClick(objectConsumer(composition, op, opIdx, true)); - int numSubOps = ops.getNumSubOps(opIdx); - for (int subIdx = 0; subIdx < numSubOps; subIdx++) + EntityOps subops = ops.getSubOps(opIdx); + if (subops != null) { - String subOp = ops.getSubOp(opIdx, subIdx); - - if (subOp != null) + int numSubOps = subops.getNumOps(); + for (int subIdx = 0; subIdx < numSubOps; subIdx++) { - int subID = ops.getSubID(opIdx, subIdx); - subLeft.createMenuEntry(0) - .setOption(subOp) - .setType(MenuAction.RUNELITE) - .onClick(objectConsumer(composition, subOp, packSubID(opIdx, subID), false)); - subShift.createMenuEntry(0) - .setOption(subOp) - .setType(MenuAction.RUNELITE) - .onClick(objectConsumer(composition, subOp, packSubID(opIdx, subID), true)); + String subOp = subops.getOp(subIdx); + + if (subOp != null) + { + subLeft.createMenuEntry(0) + .setOption(subOp) + .setType(MenuAction.RUNELITE) + .onClick(objectConsumer(composition, subOp, packSubID(opIdx, subIdx), false)); + subShift.createMenuEntry(0) + .setOption(subOp) + .setType(MenuAction.RUNELITE) + .onClick(objectConsumer(composition, subOp, packSubID(opIdx, subIdx), true)); + } } } } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index 2ed4be23cf3..7510377faf0 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -46,6 +46,7 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.Menu; +import net.runelite.api.MenuAction; import net.runelite.api.gameval.InterfaceID; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetItem; @@ -641,7 +642,8 @@ private OverlayOriginY loadOverlayOriginY(final Overlay overlay) void addOriginMenu(Overlay overlay) { Menu menu = client.getMenu(); - Menu sub = menu.createMenuEntry(-1) + Menu sub = menu.createMenuEntry(1) + .setType(MenuAction.RUNELITE_OVERLAY) .setOption("Overlay Origin") .createSubMenu(); String[] opts = {"Top left", "Top center", "Top right", "Bottom left", "Bottom center", "Bottom right"}; @@ -659,6 +661,7 @@ void addOriginMenu(Overlay overlay) OverlayOriginX ox = originX[i]; OverlayOriginY oy = originY[i]; sub.createMenuEntry(-1 - off++) + .setType(MenuAction.RUNELITE_OVERLAY) .setOption(opts[i]) .onClick(e -> { @@ -685,6 +688,7 @@ void addOriginMenu(Overlay overlay) { OverlayOrigin origin = origins[i]; sub.createMenuEntry(-1 - off++) + .setType(MenuAction.RUNELITE_OVERLAY) .setOption(opts[i]) .onClick(e -> { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 6c827cbd226..0a940377258 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -51,8 +51,8 @@ import net.runelite.api.GameState; import net.runelite.api.KeyCode; import net.runelite.api.events.BeforeRender; -import net.runelite.api.events.ClientTick; import net.runelite.api.events.FocusChanged; +import net.runelite.api.events.PostMenuSort; import net.runelite.api.gameval.InterfaceID; import net.runelite.api.gameval.VarbitID; import net.runelite.api.widgets.Widget; @@ -174,7 +174,7 @@ public void onFocusChanged(FocusChanged event) } @Subscribe - protected void onClientTick(ClientTick t) + protected void onPostMenuSort(PostMenuSort event) { lastHoveredOverlay = curHoveredOverlay; @@ -203,7 +203,7 @@ protected void onClientTick(ClientTick t) { OverlayMenuEntry overlayMenuEntry = menuEntries.get(i); - client.createMenuEntry(-1) + client.createMenuEntry(-2) .setOption(overlayMenuEntry.getOption()) .setTarget(ColorUtil.wrapWithColorTag(overlayMenuEntry.getTarget(), JagexColors.MENU_TARGET)) .setType(overlayMenuEntry.getMenuAction()) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 3a124740b47..a0d1e0bea23 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -6332,14 +6332,18 @@ 20465, 24177, 26463, - 27000 + 27000, + 33476, + 33478 ], "void knight robe": [ 8840, 20469, 24179, 26465, - 27001 + 27001, + 33484, + 33486 ], "void knight mace": [ 8841, @@ -6351,7 +6355,9 @@ 20475, 24182, 26467, - 27002 + 27002, + 33492, + 33494 ], "bronze defender": [ 8844, @@ -7096,7 +7102,9 @@ 20513, 24175, 28067, - 28069 + 28069, + 33520, + 33522 ], "penance gloves": [ 10553, @@ -7630,21 +7638,27 @@ 20477, 24183, 26473, - 27005 + 27005, + 33468, + 33470 ], "void ranger helm": [ 11664, 20479, 24184, 26475, - 27006 + 27006, + 33472, + 33474 ], "void melee helm": [ 11665, 20481, 24185, 26477, - 27007 + 27007, + 33464, + 33466 ], "void seal": [ 11666, @@ -8651,14 +8665,18 @@ 20467, 24178, 26469, - 27003 + 27003, + 33480, + 33482 ], "elite void robe": [ 13073, 20471, 24180, 26471, - 27004 + 27004, + 33488, + 33490 ], "crystal halberd full": [ 13080, @@ -9542,14 +9560,18 @@ 21284, 21285, 21289, - 24133 + 24133, + 33496, + 33498 ], "infernal cape": [ 21287, 21295, 21297, 23622, - 24224 + 24224, + 33500, + 33502 ], "amethyst javelin": [ 21318, @@ -9714,7 +9736,8 @@ "dragon crossbow": [ 21902, 21921, - 28053 + 28053, + 33460 ], "dragon bolts": [ 21905, @@ -10936,25 +10959,33 @@ 25489, 28238, 28260, - 28473 + 28473, + 33504, + 33506 ], "ice ancient sceptre": [ 25490, 28242, 28262, - 28474 + 28474, + 33508, + 33510 ], "smoke ancient sceptre": [ 25491, 28240, 28264, - 28475 + 28475, + 33512, + 33514 ], "shadow ancient sceptre": [ 25492, 28244, 28266, - 28476 + 28476, + 33516, + 33518 ], "celestial ring": [ 25539, @@ -12148,17 +12179,23 @@ 28947, 28949, 28951, - 28953 + 28953, + 33524, + 33526 ], "blessed dizanas quiver": [ 28828, 28955, - 28957 + 28957, + 33528, + 33530 ], "dizanas max cape": [ 28830, 28902, - 28906 + 28906, + 33532, + 33533 ], "sunlight moth": [ 28863, @@ -12805,6 +12842,10 @@ 30653, 30654 ], + "oathplate helm": [ + 30750, + 33462 + ], "purifying sigil": [ 30783, 30785, diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/blocked_edges.tsv b/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/blocked_edges.tsv index 49bc9a2141c..29148daa902 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/blocked_edges.tsv +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/blocked_edges.tsv @@ -28,3 +28,100 @@ 2935 3450 0 2935 3449 0 true Taverley wall 2937 3450 0 2937 3449 0 true Taverley wall 2938 3450 0 2938 3449 0 true Taverley wall +# Al Kharid mine - block routing through open pit (collision data gap) +3281 3151 0 3281 3150 0 true Al Kharid mine south edge +3282 3151 0 3282 3150 0 true Al Kharid mine south edge +3283 3151 0 3283 3150 0 true Al Kharid mine south edge +3284 3151 0 3284 3150 0 true Al Kharid mine south edge +3285 3151 0 3285 3150 0 true Al Kharid mine south edge +3286 3151 0 3286 3150 0 true Al Kharid mine south edge +3287 3151 0 3287 3150 0 true Al Kharid mine south edge +3288 3151 0 3288 3150 0 true Al Kharid mine south edge +3289 3151 0 3289 3150 0 true Al Kharid mine south edge +3290 3151 0 3290 3150 0 true Al Kharid mine south edge +3291 3151 0 3291 3150 0 true Al Kharid mine south edge +3292 3151 0 3292 3150 0 true Al Kharid mine south edge +3293 3151 0 3293 3150 0 true Al Kharid mine south edge +3294 3151 0 3294 3150 0 true Al Kharid mine south edge +3295 3151 0 3295 3150 0 true Al Kharid mine south edge +3296 3151 0 3296 3150 0 true Al Kharid mine south edge +3297 3151 0 3297 3150 0 true Al Kharid mine south edge +3298 3151 0 3298 3150 0 true Al Kharid mine south edge +3299 3151 0 3299 3150 0 true Al Kharid mine south edge +3300 3151 0 3300 3150 0 true Al Kharid mine south edge +3281 3151 0 3280 3151 0 true Al Kharid mine west edge +3281 3152 0 3280 3152 0 true Al Kharid mine west edge +3281 3153 0 3280 3153 0 true Al Kharid mine west edge +3281 3154 0 3280 3154 0 true Al Kharid mine west edge +3281 3155 0 3280 3155 0 true Al Kharid mine west edge +3281 3156 0 3280 3156 0 true Al Kharid mine west edge +3281 3157 0 3280 3157 0 true Al Kharid mine west edge +3281 3158 0 3280 3158 0 true Al Kharid mine west edge +3281 3159 0 3280 3159 0 true Al Kharid mine west edge +3281 3160 0 3280 3160 0 true Al Kharid mine west edge +3281 3161 0 3280 3161 0 true Al Kharid mine west edge +3281 3162 0 3280 3162 0 true Al Kharid mine west edge +3281 3163 0 3280 3163 0 true Al Kharid mine west edge +3281 3164 0 3280 3164 0 true Al Kharid mine west edge +3281 3165 0 3280 3165 0 true Al Kharid mine west edge +3281 3166 0 3280 3166 0 true Al Kharid mine west edge +3281 3167 0 3280 3167 0 true Al Kharid mine west edge +3281 3168 0 3280 3168 0 true Al Kharid mine west edge +3281 3169 0 3280 3169 0 true Al Kharid mine west edge +3281 3170 0 3280 3170 0 true Al Kharid mine west edge +3281 3171 0 3280 3171 0 true Al Kharid mine west edge +3281 3172 0 3280 3172 0 true Al Kharid mine west edge +3281 3173 0 3280 3173 0 true Al Kharid mine west edge +3281 3174 0 3280 3174 0 true Al Kharid mine west edge +3281 3175 0 3280 3175 0 true Al Kharid mine west edge +3281 3176 0 3280 3176 0 true Al Kharid mine west edge +3281 3177 0 3280 3177 0 true Al Kharid mine west edge +3281 3178 0 3280 3178 0 true Al Kharid mine west edge +3300 3151 0 3301 3151 0 true Al Kharid mine east edge +3300 3152 0 3301 3152 0 true Al Kharid mine east edge +3300 3153 0 3301 3153 0 true Al Kharid mine east edge +3300 3154 0 3301 3154 0 true Al Kharid mine east edge +3300 3155 0 3301 3155 0 true Al Kharid mine east edge +3300 3156 0 3301 3156 0 true Al Kharid mine east edge +3300 3157 0 3301 3157 0 true Al Kharid mine east edge +3300 3158 0 3301 3158 0 true Al Kharid mine east edge +3300 3159 0 3301 3159 0 true Al Kharid mine east edge +3300 3160 0 3301 3160 0 true Al Kharid mine east edge +3300 3161 0 3301 3161 0 true Al Kharid mine east edge +3300 3162 0 3301 3162 0 true Al Kharid mine east edge +3300 3163 0 3301 3163 0 true Al Kharid mine east edge +3300 3164 0 3301 3164 0 true Al Kharid mine east edge +3300 3165 0 3301 3165 0 true Al Kharid mine east edge +3300 3166 0 3301 3166 0 true Al Kharid mine east edge +3300 3167 0 3301 3167 0 true Al Kharid mine east edge +3300 3168 0 3301 3168 0 true Al Kharid mine east edge +3300 3169 0 3301 3169 0 true Al Kharid mine east edge +3300 3170 0 3301 3170 0 true Al Kharid mine east edge +3300 3171 0 3301 3171 0 true Al Kharid mine east edge +3300 3172 0 3301 3172 0 true Al Kharid mine east edge +3300 3173 0 3301 3173 0 true Al Kharid mine east edge +3300 3174 0 3301 3174 0 true Al Kharid mine east edge +3300 3175 0 3301 3175 0 true Al Kharid mine east edge +3300 3176 0 3301 3176 0 true Al Kharid mine east edge +3300 3177 0 3301 3177 0 true Al Kharid mine east edge +3300 3178 0 3301 3178 0 true Al Kharid mine east edge +3281 3178 0 3281 3179 0 true Al Kharid mine north edge +3282 3178 0 3282 3179 0 true Al Kharid mine north edge +3283 3178 0 3283 3179 0 true Al Kharid mine north edge +3284 3178 0 3284 3179 0 true Al Kharid mine north edge +3285 3178 0 3285 3179 0 true Al Kharid mine north edge +3286 3178 0 3286 3179 0 true Al Kharid mine north edge +3287 3178 0 3287 3179 0 true Al Kharid mine north edge +3288 3178 0 3288 3179 0 true Al Kharid mine north edge +3289 3178 0 3289 3179 0 true Al Kharid mine north edge +3290 3178 0 3290 3179 0 true Al Kharid mine north edge +3291 3178 0 3291 3179 0 true Al Kharid mine north edge +3292 3178 0 3292 3179 0 true Al Kharid mine north edge +3293 3178 0 3293 3179 0 true Al Kharid mine north edge +3294 3178 0 3294 3179 0 true Al Kharid mine north edge +3295 3178 0 3295 3179 0 true Al Kharid mine north edge +3296 3178 0 3296 3179 0 true Al Kharid mine north edge +3297 3178 0 3297 3179 0 true Al Kharid mine north edge +3298 3178 0 3298 3179 0 true Al Kharid mine north edge +3299 3178 0 3299 3179 0 true Al Kharid mine north edge +3300 3178 0 3300 3179 0 true Al Kharid mine north edge diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc index c449225bea3..8057080ea29 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc @@ -4466,5 +4466,15 @@ "z1": 0, "z2": 0 } + ], + "11300": [ // Last light + { + "rx1": 43, + "ry1": 16, + "rx2": 49, + "ry2": 22, + "z1": 2, + "z2": 3 + } ] } diff --git a/runelite-client/src/main/scripts/BankMainBuild.hash b/runelite-client/src/main/scripts/BankMainBuild.hash index bbaa5ce7da7..5234cf89cc3 100644 --- a/runelite-client/src/main/scripts/BankMainBuild.hash +++ b/runelite-client/src/main/scripts/BankMainBuild.hash @@ -1 +1 @@ -DAC2811954AF01D0DA9D701E1334BCF2068A000DD73F0DB02904AC2D9A82FF52 \ No newline at end of file +0DC667D052C87AB3A8C728C4304FD41B21DB5F1AF3747FEC3B03FA81B25A6BD3 \ 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 3b0b210523b..4d6c72fc281 100644 --- a/runelite-client/src/main/scripts/BankMainBuild.rs2asm +++ b/runelite-client/src/main/scripts/BankMainBuild.rs2asm @@ -167,12 +167,12 @@ LABEL131: jump LABEL149 LABEL145: iconst 1 - iconst 786470 + iconst 786476 if_sethide jump LABEL152 LABEL149: iconst 0 - iconst 786470 + iconst 786476 if_sethide LABEL152: iload 22 @@ -282,7 +282,7 @@ LABEL237: iconst 39 iconst 1 iconst 1 - iconst 786446 + iconst 786451 if_setsize jump LABEL276 LABEL255: @@ -305,7 +305,7 @@ LABEL255: iconst 81 iconst 1 iconst 1 - iconst 786446 + iconst 786451 if_setsize LABEL276: get_varbit 4150 @@ -314,7 +314,7 @@ LABEL276: jump LABEL300 LABEL280: iconst 0 - iconst 786446 + iconst 786451 if_sethide iload 23 iconst 1 @@ -325,7 +325,7 @@ LABEL287: iload 2 if_sethide LABEL290: - iconst 786551 + iconst 786558 iconst 0 cc_find iconst 1 @@ -339,9 +339,9 @@ LABEL298: jump LABEL314 LABEL300: iconst 1 - iconst 786446 + iconst 786451 if_sethide - iconst 786551 + iconst 786558 iconst 0 cc_find iconst 1 @@ -358,6 +358,9 @@ LABEL314: iload 4 iload 3 invoke 231 + iconst 786449 + iconst 786446 + invoke 231 iconst 1410 istore 25 iconst 1410 @@ -366,28 +369,28 @@ LABEL314: multiply add istore 26 -LABEL325: +LABEL328: iload 25 iload 26 - if_icmple LABEL329 - jump LABEL342 -LABEL329: + if_icmple LABEL332 + jump LABEL345 +LABEL332: iload 3 iload 25 cc_find iconst 1 - if_icmpeq LABEL335 - jump LABEL337 -LABEL335: + if_icmpeq LABEL338 + jump LABEL340 +LABEL338: iconst 1 cc_sethide -LABEL337: +LABEL340: iload 25 iconst 1 add istore 25 - jump LABEL325 -LABEL342: + jump LABEL328 +LABEL345: iconst 0 istore 25 iconst 8 @@ -428,17 +431,17 @@ LABEL342: 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 LABEL387 ; + jump LABEL390 ; sconst "" ostore 2 iload 37 iconst 1 - if_icmpeq LABEL385 - jump LABEL387 -LABEL385: + if_icmpeq LABEL388 + jump LABEL390 +LABEL388: invoke 280 ostore 2 -LABEL387: +LABEL390: iconst 0 ; sconst "bankBuildTab" ; runelite_callback ; @@ -449,52 +452,52 @@ LABEL387: get_varbit 4150 iconst 0 - if_icmple LABEL394 + if_icmple LABEL397 get_varbit 4150 iconst 9 - if_icmpgt LABEL394 - jump LABEL872 -LABEL394: + if_icmpgt LABEL397 + jump LABEL884 +LABEL397: get_varbit 4150 iconst 15 - if_icmpne LABEL398 - jump LABEL872 -LABEL398: + if_icmpne LABEL401 + jump LABEL884 +LABEL401: iload 25 iconst 1410 - if_icmplt LABEL402 - jump LABEL427 -LABEL402: + if_icmplt LABEL405 + jump LABEL430 +LABEL405: iload 3 iload 25 cc_find iconst 1 - if_icmpeq LABEL408 - jump LABEL410 -LABEL408: + if_icmpeq LABEL411 + jump LABEL413 +LABEL411: iconst 1 cc_sethide -LABEL410: +LABEL413: iconst 95 iload 25 inv_getobj iconst -1 - if_icmpne LABEL416 - jump LABEL422 -LABEL416: + if_icmpne LABEL419 + jump LABEL425 +LABEL419: iload 34 iconst 1 add iload 25 istore 35 istore 34 -LABEL422: +LABEL425: iload 25 iconst 1 add istore 25 - jump LABEL398 -LABEL427: + jump LABEL401 +LABEL430: get_varbit 4171 get_varbit 4172 add @@ -515,14 +518,14 @@ LABEL427: istore 36 iload 36 iconst 0 - if_icmple LABEL449 - jump LABEL453 -LABEL449: + if_icmple LABEL452 + jump LABEL456 +LABEL452: iconst 1410 iconst 1 sub istore 35 -LABEL453: +LABEL456: iload 36 iload 35 iconst 1 @@ -550,9 +553,9 @@ LABEL453: istore 25 get_varbit 4171 iconst 0 - if_icmpgt LABEL482 - jump LABEL514 -LABEL482: + if_icmpgt LABEL485 + jump LABEL517 +LABEL485: iconst 1 iload 3 iload 33 @@ -585,12 +588,12 @@ LABEL482: get_varbit 4171 add istore 25 -LABEL514: +LABEL517: get_varbit 4172 iconst 0 - if_icmpgt LABEL518 - jump LABEL550 -LABEL518: + if_icmpgt LABEL521 + jump LABEL553 +LABEL521: iconst 2 iload 3 iload 33 @@ -623,12 +626,12 @@ LABEL518: get_varbit 4172 add istore 25 -LABEL550: +LABEL553: get_varbit 4173 iconst 0 - if_icmpgt LABEL554 - jump LABEL586 -LABEL554: + if_icmpgt LABEL557 + jump LABEL589 +LABEL557: iconst 3 iload 3 iload 33 @@ -661,12 +664,12 @@ LABEL554: get_varbit 4173 add istore 25 -LABEL586: +LABEL589: get_varbit 4174 iconst 0 - if_icmpgt LABEL590 - jump LABEL622 -LABEL590: + if_icmpgt LABEL593 + jump LABEL625 +LABEL593: iconst 4 iload 3 iload 33 @@ -699,12 +702,12 @@ LABEL590: get_varbit 4174 add istore 25 -LABEL622: +LABEL625: get_varbit 4175 iconst 0 - if_icmpgt LABEL626 - jump LABEL658 -LABEL626: + if_icmpgt LABEL629 + jump LABEL661 +LABEL629: iconst 5 iload 3 iload 33 @@ -737,12 +740,12 @@ LABEL626: get_varbit 4175 add istore 25 -LABEL658: +LABEL661: get_varbit 4176 iconst 0 - if_icmpgt LABEL662 - jump LABEL694 -LABEL662: + if_icmpgt LABEL665 + jump LABEL697 +LABEL665: iconst 6 iload 3 iload 33 @@ -775,12 +778,12 @@ LABEL662: get_varbit 4176 add istore 25 -LABEL694: +LABEL697: get_varbit 4177 iconst 0 - if_icmpgt LABEL698 - jump LABEL730 -LABEL698: + if_icmpgt LABEL701 + jump LABEL733 +LABEL701: iconst 7 iload 3 iload 33 @@ -813,12 +816,12 @@ LABEL698: get_varbit 4177 add istore 25 -LABEL730: +LABEL733: get_varbit 4178 iconst 0 - if_icmpgt LABEL734 - jump LABEL766 -LABEL734: + if_icmpgt LABEL737 + jump LABEL769 +LABEL737: iconst 8 iload 3 iload 33 @@ -851,12 +854,12 @@ LABEL734: get_varbit 4178 add istore 25 -LABEL766: +LABEL769: get_varbit 4179 iconst 0 - if_icmpgt LABEL770 - jump LABEL802 -LABEL770: + if_icmpgt LABEL773 + jump LABEL805 +LABEL773: iconst 9 iload 3 iload 33 @@ -889,18 +892,18 @@ LABEL770: get_varbit 4179 add istore 25 -LABEL802: +LABEL805: iload 37 iconst 1 - if_icmpeq LABEL806 - jump LABEL845 -LABEL806: + if_icmpeq LABEL809 + jump LABEL848 +LABEL809: oload 2 string_length iconst 0 - if_icmpgt LABEL811 - jump LABEL830 -LABEL811: + if_icmpgt LABEL814 + jump LABEL833 +LABEL814: sconst "Showing items: " sconst "" oload 2 @@ -910,9 +913,9 @@ LABEL811: if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL822 - jump LABEL829 -LABEL822: + if_icmpeq LABEL825 + jump LABEL832 +LABEL825: sconst "Show items whose names contain the following text: (" iload 32 tostring @@ -924,9 +927,9 @@ LABEL822: pop_int ; pop number of matches iconst 10616875 if_settext -LABEL829: - jump LABEL844 -LABEL830: +LABEL832: + jump LABEL847 +LABEL833: sconst "Showing items: " sconst "" sconst "*" @@ -936,21 +939,32 @@ LABEL830: if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL841 - jump LABEL844 -LABEL841: + if_icmpeq LABEL844 + jump LABEL847 +LABEL844: sconst "Show items whose names contain the following text:" sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback iconst 10616875 if_settext -LABEL844: - jump LABEL848 -LABEL845: +LABEL847: + jump LABEL860 +LABEL848: + get_varc_int 1380 + iconst -1 + if_icmpne LABEL852 + jump LABEL857 +LABEL852: + get_varc_int 1380 + invoke 9552 + iload 6 + if_settext + jump LABEL860 +LABEL857: sconst "The Bank of Gielinor" iload 6 if_settext -LABEL848: +LABEL860: iload 0 iload 1 iload 2 @@ -997,18 +1011,18 @@ singletabbuildmode: get_varbit 4179 ; add ; istore 36 ; store start to the first item in the "All items" tab -LABEL872: +LABEL884: ; if (~bankmain_searching = 1) { iload 37 iconst 1 - if_icmpeq LABEL876 - jump LABEL880 -LABEL876: + if_icmpeq LABEL888 + jump LABEL892 +LABEL888: iconst 1 iconst 1 iconst 1 invoke 299 -LABEL880: +LABEL892: ; after ~meslayer close iconst -1 istore 38 @@ -1022,12 +1036,12 @@ LABEL880: istore 40 iconst 0 istore 41 -LABEL892: +LABEL904: iload 25 iconst 1410 - if_icmplt LABEL896 - jump LABEL972 -LABEL896: + if_icmplt LABEL908 + jump LABEL984 +LABEL908: ; item index = (loop index + offset) % bank size iload 25 ; loop index iload 36 ; offset @@ -1042,9 +1056,9 @@ LOAD_ITEM_INDEX: iload 35 ; use item index instead of loop index cc_find iconst 1 - if_icmpeq LABEL902 - jump LABEL967 -LABEL902: + if_icmpeq LABEL914 + jump LABEL979 +LABEL914: iconst 95 jump LOAD_ITEM_INDEX2 iload 25 @@ -1054,34 +1068,34 @@ LOAD_ITEM_INDEX2: istore 30 iload 30 iconst -1 - if_icmpne LABEL910 - jump LABEL914 -LABEL910: + if_icmpne LABEL922 + jump LABEL926 +LABEL922: iload 34 iconst 1 add istore 34 -LABEL914: +LABEL926: iload 42 ; overriding single tab building mode? iconst 1 ; if_icmpeq filtertest ; iload 25 iload 38 - if_icmpge LABEL918 - jump LABEL965 -LABEL918: + if_icmpge LABEL930 + jump LABEL977 +LABEL930: iload 25 iload 39 - if_icmplt LABEL922 - jump LABEL965 + if_icmplt LABEL934 + jump LABEL977 filtertest: iload 30 ; obj iload 37 ; bankmain_searching oload 2 ; bankmain_filterstring invoke 279 ; ~bankmain_filteritem iconst 1 ; - if_icmpne LABEL965 ; -LABEL922: + if_icmpne LABEL977 ; +LABEL934: iconst 0 cc_sethide iload 30 @@ -1110,15 +1124,15 @@ LOAD_ITEM_INDEX3: cc_setposition iload 40 iload 27 - if_icmplt LABEL949 - jump LABEL954 -LABEL949: + if_icmplt LABEL961 + jump LABEL966 +LABEL961: iload 40 iconst 1 add istore 40 - jump LABEL964 -LABEL954: + jump LABEL976 +LABEL966: iconst 0 iload 41 iconst 1 @@ -1129,32 +1143,43 @@ LABEL954: iconst 36 multiply istore 33 -LABEL964: - jump LABEL967 -LABEL965: +LABEL976: + jump LABEL979 +LABEL977: iconst 1 cc_sethide -LABEL967: +LABEL979: iload 25 iconst 1 add istore 25 - jump LABEL892 -LABEL972: + jump LABEL904 +LABEL984: iload 33 iconst 32 add istore 33 + get_varc_int 1380 + iconst -1 + if_icmpne LABEL992 + jump LABEL997 +LABEL992: + get_varc_int 1380 + invoke 9552 + iload 6 + if_settext + jump LABEL1025 +LABEL997: get_varbit 4150 iconst 15 - if_icmpeq LABEL980 - jump LABEL984 -LABEL980: + if_icmpeq LABEL1001 + jump LABEL1005 +LABEL1001: sconst "Potion storage" iload 6 if_settext - jump LABEL1004 -LABEL984: + jump LABEL1025 +LABEL1005: iload 42 ; overriding single tab building mode? iconst 1 ; if_icmpne tabtitle ; set normal "Tab" title @@ -1165,9 +1190,9 @@ LABEL984: tabtitle: ; get_varbit 4170 iconst 2 - if_icmpeq LABEL988 - jump LABEL998 -LABEL988: + if_icmpeq LABEL1009 + jump LABEL1019 +LABEL1009: sconst "Tab " iconst 105 iconst 115 @@ -1177,8 +1202,8 @@ LABEL988: join_string 2 iload 6 if_settext - jump LABEL1004 -LABEL998: + jump LABEL1025 +LABEL1019: sconst "Tab " get_varbit 4150 tostring @@ -1186,7 +1211,7 @@ LABEL998: iload 6 if_settext FinishBuilding: -LABEL1004: +LABEL1025: iload 0 iload 1 iload 2 diff --git a/runelite-client/src/main/scripts/PrivateMessage.hash b/runelite-client/src/main/scripts/PrivateMessage.hash index be7561592d1..76e90663250 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.hash +++ b/runelite-client/src/main/scripts/PrivateMessage.hash @@ -1 +1 @@ -795B53312C3233FA5216008AB2015D8A0F98270CB42B5D70FBEED986610C6111 \ No newline at end of file +2CF25673AB745EC8592C6D82847A09714019789FB1761263EC22241CE176414E \ No newline at end of file diff --git a/runelite-client/src/main/scripts/PrivateMessage.rs2asm b/runelite-client/src/main/scripts/PrivateMessage.rs2asm index 75d6c4f1e55..dae4c1f9dd5 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.rs2asm +++ b/runelite-client/src/main/scripts/PrivateMessage.rs2asm @@ -24,7 +24,7 @@ LABEL10: iload 1 iconst 0 if_icmpgt LABEL21 - jump LABEL268 + jump LABEL273 LABEL21: get_varc_int 5 switch @@ -48,10 +48,11 @@ LABEL21: 11: LABEL259 18: LABEL259 16: LABEL265 - jump LABEL267 + 29: LABEL268 + jump LABEL272 LABEL24: return - jump LABEL267 + jump LABEL272 LABEL26: ignore_count iconst 0 @@ -79,7 +80,7 @@ LABEL44: get_varc_string 359 ignore_del LABEL46: - jump LABEL267 + jump LABEL272 LABEL47: friend_count iconst 0 @@ -164,14 +165,14 @@ LABEL108: clientclock set_varc_int 61 LABEL110: - jump LABEL267 + jump LABEL272 LABEL111: get_varc_string 359 invoke 212 resume_countdialog iconst 0 set_varc_int 5 - jump LABEL267 + jump LABEL272 LABEL117: get_varc_string 359 removetags @@ -180,7 +181,7 @@ LABEL117: resume_namedialog iconst 0 set_varc_int 5 - jump LABEL267 + jump LABEL272 LABEL125: get_varc_int 5 switch @@ -264,7 +265,7 @@ LABEL196: resume_stringdialog iconst 0 set_varc_int 5 - jump LABEL267 + jump LABEL272 LABEL201: get_varbit 8119 iconst 0 @@ -284,7 +285,7 @@ LABEL212: set_varc_string 362 get_varc_string 359 clan_joinchat - jump LABEL267 + jump LABEL272 LABEL218: iload 1 iconst 10 @@ -306,7 +307,7 @@ LABEL230: chat_setmessagefilter invoke 553 invoke 84 - jump LABEL267 + jump LABEL272 LABEL236: get_varbit 8119 iconst 0 @@ -332,41 +333,48 @@ LABEL247: sconst "ii" iconst 10616843 if_setontimer - jump LABEL267 + jump LABEL272 LABEL259: iconst 0 iconst 1 iconst 1 invoke 299 return - jump LABEL267 + jump LABEL272 LABEL265: get_varc_string 359 invoke 2061 -LABEL267: - jump LABEL277 + jump LABEL272 LABEL268: + get_varc_string 359 + resume_stringdialog + iconst 0 + set_varc_int 5 +LABEL272: + jump LABEL282 +LABEL273: get_varc_int 5 switch - 7: LABEL271 - 8: LABEL271 - 9: LABEL271 - 15: LABEL271 - 20: LABEL271 - 21: LABEL271 - 16: LABEL273 - 27: LABEL275 - jump LABEL277 -LABEL271: + 7: LABEL276 + 8: LABEL276 + 9: LABEL276 + 15: LABEL276 + 20: LABEL276 + 21: LABEL276 + 29: LABEL276 + 16: LABEL278 + 27: LABEL280 + jump LABEL282 +LABEL276: return - jump LABEL277 -LABEL273: + jump LABEL282 +LABEL278: return - jump LABEL277 -LABEL275: + jump LABEL282 +LABEL280: sconst "" invoke 7330 -LABEL277: +LABEL282: iconst 1 iconst 1 iconst 1