diff --git a/gradle.properties b/gradle.properties index cea2f9b405a..3e7d41a472a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,10 +28,10 @@ org.gradle.parallel=true org.gradle.caching=false project.build.group=net.runelite -project.build.version=1.12.27 +project.build.version=1.12.28 glslang.path= -microbot.version=2.6.4 +microbot.version=2.6.5 microbot.commit.sha=nogit microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/ microbot.repo.username= diff --git a/libs.versions.toml b/libs.versions.toml index c7609d50e22..87e3f9193e1 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -42,7 +42,7 @@ rs-cache = { module = "net.runelite.rs:cache", version.ref = "cache" } flatlaf-core = { module = "net.runelite:flatlaf", version.ref = "flatlaf" } flatlaf-extras = { module = "net.runelite:flatlaf-extras", version.ref = "flatlaf" } -rl-http-api = "net.runelite.arn:http-api:1.2.22" +rl-http-api = "net.runelite.arn:http-api:1.2.23" rl-awt = "net.runelite:rlawt:1.8" rl-discord = "net.runelite:discord:1.4" rl-orange = "net.runelite:orange-extensions:1.1" diff --git a/runelite-api/src/main/interfaces/interfaces.toml b/runelite-api/src/main/interfaces/interfaces.toml index 7d5ca86d34b..31001049613 100644 --- a/runelite-api/src/main/interfaces/interfaces.toml +++ b/runelite-api/src/main/interfaces/interfaces.toml @@ -771,9 +771,9 @@ id=128 [seed_vault] id=631 title_container=2 -item_container=15 -item_text=16 -search_button=24 +item_container=16 +item_text=17 +search_button=26 [seed_vault_inventory] id=630 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 a890d53e68d..da610b507ad 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -16248,17 +16248,17 @@ public final class ItemID public static final int TRIDENT_OF_THE_SWAMP_O = 33314; public static final int UNCHARGED_TOXIC_TRIDENT_O = 33316; public static final int TRIDENT_OF_THE_SWAMP_E_O = 33318; - public static final int UNCHARGED_TOXIC_TRIDENT_E_33320 = 33320; + public static final int UNCHARGED_TOXIC_TRIDENT_E_O = 33320; public static final int TRIDENT_OF_THE_SEAS_O = 33322; public static final int TRIDENT_OF_THE_SEAS_FULL_O = 33323; public static final int TRIDENT_OF_THE_SEAS_E_O = 33326; public static final int UNCHARGED_TRIDENT_E_O = 33328; - public static final int IBANS_STAFF_33330 = 33330; + public static final int IBANS_STAFF_O = 33330; public static final int IBANS_STAFF_U_O = 33332; - public static final int IBANS_STAFF_O = 33333; + public static final int IBANS_STAFF_BO = 33333; public static final int SOULREAPER_AXE_O = 33335; - public static final int DEMONIC_SLAYER_HELMET = 33338; - public static final int DEMONIC_SLAYER_HELMET_33340 = 33340; + public static final int OATHPLATE_SLAYER_HELMET = 33338; + public static final int RADIANT_SLAYER_HELMET = 33340; public static final int DEMONIC_QUILL = 33342; public static final int DEMONIC_PACTS_DRAGON_TROPHY = 33345; public static final int DEMONIC_PACTS_RUNE_TROPHY = 33347; @@ -16267,7 +16267,7 @@ public final class ItemID public static final int DEMONIC_PACTS_STEEL_TROPHY = 33353; public static final int DEMONIC_PACTS_IRON_TROPHY = 33355; public static final int DEMONIC_PACTS_BRONZE_TROPHY = 33357; - public static final int IMPISH_RITUAL_KIT = 33359; + public static final int IMPISH_RITUAL_SCROLL = 33359; public static final int DEMONIC_PACTS_THRONE_SCROLL = 33362; public static final int IMPISH_WHISTLE = 33365; public static final int DEMONIC_PACTS_DEMON_BUTLER_SCROLL = 33368; @@ -16293,5 +16293,16 @@ public final class ItemID public static final int SPECTATOR_OCULUS = 33427; public static final int TRINKET_OF_VENGEANCE_2 = 33428; public static final int TRINKET_OF_VENGEANCE_1 = 33431; + public static final int UNCHARGED_TRIDENT_O = 33434; + public static final int SULPHUROUS_FERTILISER_33437 = 33437; + public static final int OATHPLATE_SLAYER_HELMET_I = 33439; + public static final int OATHPLATE_SLAYER_HELMET_I_33441 = 33441; + public static final int OATHPLATE_SLAYER_HELMET_I_33443 = 33443; + public static final int RADIANT_SLAYER_HELMET_I = 33445; + public static final int RADIANT_SLAYER_HELMET_I_33447 = 33447; + public static final int RADIANT_SLAYER_HELMET_I_33449 = 33449; + 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; /* 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 4584495f6dc..3b3b292b92e 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -227,7 +227,6 @@ 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; @@ -6559,7 +6558,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 = 7331; + public static final int DEMON_BUTLER = 7331; public static final int FAIRY_FIXIT = 7332; public static final int FAIRY_FIXIT_7333 = 7333; public static final int GIANT_SQUIRREL = 7334; @@ -13133,5 +13132,7 @@ 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 bf38f17796e..044b11a9b8e 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -16760,16 +16760,11 @@ public final class NullItemID public static final int NULL_33312 = 33312; public static final int NULL_33313 = 33313; public static final int NULL_33315 = 33315; - public static final int NULL_33317 = 33317; public static final int NULL_33319 = 33319; - public static final int NULL_33321 = 33321; - public static final int NULL_33324 = 33324; public static final int NULL_33325 = 33325; public static final int NULL_33327 = 33327; - public static final int NULL_33329 = 33329; public static final int NULL_33331 = 33331; public static final int NULL_33334 = 33334; - public static final int NULL_33336 = 33336; public static final int NULL_33337 = 33337; public static final int NULL_33339 = 33339; public static final int NULL_33341 = 33341; @@ -16831,5 +16826,20 @@ public final class NullItemID public static final int NULL_33430 = 33430; public static final int NULL_33432 = 33432; public static final int NULL_33433 = 33433; + public static final int NULL_33435 = 33435; + public static final int NULL_33436 = 33436; + public static final int NULL_33438 = 33438; + public static final int NULL_33440 = 33440; + public static final int NULL_33442 = 33442; + public static final int NULL_33444 = 33444; + public static final int NULL_33446 = 33446; + public static final int NULL_33448 = 33448; + public static final int NULL_33450 = 33450; + public static final int NULL_33452 = 33452; + public static final int NULL_33453 = 33453; + public static final int NULL_33455 = 33455; + public static final int NULL_33456 = 33456; + public static final int NULL_33458 = 33458; + public static final int NULL_33459 = 33459; /* 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 d4c1ac0cf70..830c5bfa0ea 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -18,6 +18,7 @@ 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; @@ -2561,5 +2562,14 @@ public final class NullNpcID public static final int NULL_15670 = 15670; public static final int NULL_15671 = 15671; public static final int NULL_15676 = 15676; + public static final int NULL_15701 = 15701; + public static final int NULL_15702 = 15702; + public static final int NULL_15703 = 15703; + public static final int NULL_15704 = 15704; + public static final int NULL_15705 = 15705; + public static final int NULL_15706 = 15706; + public static final int NULL_15707 = 15707; + public static final int NULL_15708 = 15708; + public static final int NULL_15709 = 15709; /* This file is automatically generated. Do not edit. */ } 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 6ded450580f..da790ae2d21 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -8037,7 +8037,7 @@ public final class ObjectID public static final int SEWAGE_WATER = 14204; public static final int FOOD_PILE = 14205; public static final int FOOD_PILE_14206 = 14206; - public static final int HERBS_14209 = 14209; + public static final int GUAM_LEAF = 14209; public static final int WALL_14212 = 14212; public static final int WALL_14213 = 14213; public static final int WALL_14216 = 14216; @@ -14094,11 +14094,11 @@ public final class ObjectID public static final int HUTCH_26822 = 26822; public static final int CAGES_26823 = 26823; public static final int CAGE_26824 = 26824; - public static final int HERBS_26825 = 26825; - public static final int HERBS_26826 = 26826; - public static final int HERBS_26827 = 26827; - public static final int HERBS_26828 = 26828; - public static final int HERBS_26829 = 26829; + public static final int GUAM_LEAF_26825 = 26825; + public static final int GUAM_LEAF_26826 = 26826; + public static final int GUAM_LEAF_26827 = 26827; + public static final int GUAM_LEAF_26828 = 26828; + public static final int MARRENTILL = 26829; public static final int CONSECRATED_HOUSE = 26830; public static final int DESECRATED_HOUSE = 26831; public static final int NATURE_HOUSE = 26832; @@ -15632,6 +15632,58 @@ public final class ObjectID public static final int HEROIC_STATUE = 29557; public static final int DEATH = 29559; public static final int FAIRY_RING_29560 = 29560; + public static final int OAK_OUTFIT_STAND = 29561; + public static final int OAK_OUTFIT_STAND_29562 = 29562; + public static final int OAK_OUTFIT_STAND_29563 = 29563; + public static final int MAHOGANY_OUTFIT_STAND = 29564; + public static final int MAHOGANY_OUTFIT_STAND_29565 = 29565; + public static final int MAHOGANY_OUTFIT_STAND_29566 = 29566; + public static final int THRONE_29567 = 29567; + public static final int DISEASED_GUAM_LEAF = 29568; + public static final int DISEASED_GUAM_LEAF_29569 = 29569; + public static final int DISEASED_GUAM_LEAF_29570 = 29570; + public static final int DISEASED_MARRENTILL = 29571; + public static final int DISEASED_MARRENTILL_29572 = 29572; + public static final int DISEASED_MARRENTILL_29573 = 29573; + public static final int DISEASED_TARROMIN = 29574; + public static final int DISEASED_TARROMIN_29575 = 29575; + public static final int DISEASED_TARROMIN_29576 = 29576; + public static final int DISEASED_HARRALANDER = 29577; + public static final int DISEASED_HARRALANDER_29578 = 29578; + public static final int DISEASED_HARRALANDER_29579 = 29579; + public static final int DISEASED_RANARR_WEED = 29580; + public static final int DISEASED_RANARR_WEED_29581 = 29581; + public static final int DISEASED_RANARR_WEED_29582 = 29582; + public static final int DISEASED_IRIT_LEAF = 29583; + public static final int DISEASED_IRIT_LEAF_29584 = 29584; + public static final int DISEASED_IRIT_LEAF_29585 = 29585; + public static final int DISEASED_AVANTOE = 29586; + public static final int DISEASED_AVANTOE_29587 = 29587; + public static final int DISEASED_AVANTOE_29588 = 29588; + public static final int DISEASED_TOADFLAX = 29589; + public static final int DISEASED_TOADFLAX_29590 = 29590; + public static final int DISEASED_TOADFLAX_29591 = 29591; + public static final int DISEASED_KWUARM = 29592; + public static final int DISEASED_KWUARM_29593 = 29593; + public static final int DISEASED_KWUARM_29594 = 29594; + public static final int DISEASED_CADANTINE = 29595; + public static final int DISEASED_CADANTINE_29596 = 29596; + public static final int DISEASED_CADANTINE_29597 = 29597; + public static final int DISEASED_LANTADYME = 29598; + public static final int DISEASED_LANTADYME_29599 = 29599; + public static final int DISEASED_LANTADYME_29600 = 29600; + public static final int DISEASED_DWARF_WEED = 29601; + public static final int DISEASED_DWARF_WEED_29602 = 29602; + public static final int DISEASED_DWARF_WEED_29603 = 29603; + public static final int DISEASED_TORSTOL = 29604; + public static final int DISEASED_TORSTOL_29605 = 29605; + public static final int DISEASED_TORSTOL_29606 = 29606; + public static final int DISEASED_SNAPDRAGON = 29607; + public static final int DISEASED_SNAPDRAGON_29608 = 29608; + public static final int DISEASED_SNAPDRAGON_29609 = 29609; + public static final int DISEASED_HUASCA = 29610; + public static final int DISEASED_HUASCA_29611 = 29611; + public static final int DISEASED_HUASCA_29612 = 29612; public static final int MOUNTED_MAX_CAPE_29625 = 29625; public static final int CRACK_29626 = 29626; public static final int CRACK_29627 = 29627; @@ -19906,70 +19958,70 @@ public final class ObjectID public static final int GIANT_ANVIL_39724 = 39724; public static final int STONE_PILE_39740 = 39740; public static final int STONE_PILE_39741 = 39741; - public static final int HERBS_39748 = 39748; - public static final int HERBS_39749 = 39749; - public static final int HERBS_39750 = 39750; - public static final int HERBS_39751 = 39751; - public static final int HERBS_39752 = 39752; - public static final int HERBS_39753 = 39753; - public static final int HERBS_39754 = 39754; - public static final int HERBS_39755 = 39755; - public static final int HERBS_39756 = 39756; - public static final int HERBS_39757 = 39757; - public static final int HERBS_39758 = 39758; - public static final int HERBS_39759 = 39759; - public static final int HERBS_39760 = 39760; - public static final int HERBS_39761 = 39761; - public static final int HERBS_39762 = 39762; - public static final int HERBS_39763 = 39763; - public static final int HERBS_39764 = 39764; - public static final int HERBS_39765 = 39765; - public static final int HERBS_39766 = 39766; - public static final int HERBS_39767 = 39767; - public static final int HERBS_39768 = 39768; - public static final int HERBS_39769 = 39769; - public static final int HERBS_39770 = 39770; - public static final int HERBS_39771 = 39771; - public static final int HERBS_39772 = 39772; - public static final int HERBS_39773 = 39773; - public static final int HERBS_39774 = 39774; - public static final int HERBS_39775 = 39775; - public static final int HERBS_39776 = 39776; - public static final int HERBS_39777 = 39777; - public static final int HERBS_39778 = 39778; - public static final int HERBS_39779 = 39779; - public static final int HERBS_39780 = 39780; - public static final int HERBS_39781 = 39781; - public static final int HERBS_39782 = 39782; - public static final int HERBS_39783 = 39783; - public static final int HERBS_39784 = 39784; - public static final int HERBS_39785 = 39785; - public static final int HERBS_39786 = 39786; - public static final int HERBS_39787 = 39787; - public static final int HERBS_39788 = 39788; - public static final int HERBS_39789 = 39789; - public static final int HERBS_39790 = 39790; - public static final int HERBS_39791 = 39791; - public static final int HERBS_39792 = 39792; - public static final int HERBS_39793 = 39793; - public static final int HERBS_39794 = 39794; - public static final int HERBS_39795 = 39795; - public static final int HERBS_39796 = 39796; - public static final int HERBS_39797 = 39797; - public static final int HERBS_39798 = 39798; - public static final int HERBS_39799 = 39799; - public static final int HERBS_39800 = 39800; - public static final int HERBS_39801 = 39801; - public static final int HERBS_39802 = 39802; - public static final int HERBS_39803 = 39803; - public static final int HERBS_39804 = 39804; - public static final int HERBS_39805 = 39805; - public static final int HERBS_39806 = 39806; - public static final int HERBS_39807 = 39807; - public static final int HERBS_39808 = 39808; - public static final int HERBS_39809 = 39809; - public static final int HERBS_39810 = 39810; - public static final int HERBS_39811 = 39811; + public static final int MARRENTILL_39748 = 39748; + public static final int MARRENTILL_39749 = 39749; + public static final int MARRENTILL_39750 = 39750; + public static final int MARRENTILL_39751 = 39751; + public static final int TARROMIN = 39752; + public static final int TARROMIN_39753 = 39753; + public static final int TARROMIN_39754 = 39754; + public static final int TARROMIN_39755 = 39755; + public static final int TARROMIN_39756 = 39756; + public static final int HARRALANDER = 39757; + public static final int HARRALANDER_39758 = 39758; + public static final int HARRALANDER_39759 = 39759; + public static final int HARRALANDER_39760 = 39760; + public static final int HARRALANDER_39761 = 39761; + public static final int RANARR_WEED = 39762; + public static final int RANARR_WEED_39763 = 39763; + public static final int RANARR_WEED_39764 = 39764; + public static final int RANARR_WEED_39765 = 39765; + public static final int RANARR_WEED_39766 = 39766; + public static final int IRIT_LEAF = 39767; + public static final int IRIT_LEAF_39768 = 39768; + public static final int IRIT_LEAF_39769 = 39769; + public static final int IRIT_LEAF_39770 = 39770; + public static final int IRIT_LEAF_39771 = 39771; + public static final int AVANTOE = 39772; + public static final int AVANTOE_39773 = 39773; + public static final int AVANTOE_39774 = 39774; + public static final int AVANTOE_39775 = 39775; + public static final int AVANTOE_39776 = 39776; + public static final int TOADFLAX = 39777; + public static final int TOADFLAX_39778 = 39778; + public static final int TOADFLAX_39779 = 39779; + public static final int TOADFLAX_39780 = 39780; + public static final int TOADFLAX_39781 = 39781; + public static final int KWUARM = 39782; + public static final int KWUARM_39783 = 39783; + public static final int KWUARM_39784 = 39784; + public static final int KWUARM_39785 = 39785; + public static final int KWUARM_39786 = 39786; + public static final int CADANTINE = 39787; + public static final int CADANTINE_39788 = 39788; + public static final int CADANTINE_39789 = 39789; + public static final int CADANTINE_39790 = 39790; + public static final int CADANTINE_39791 = 39791; + public static final int LANTADYME = 39792; + public static final int LANTADYME_39793 = 39793; + public static final int LANTADYME_39794 = 39794; + public static final int LANTADYME_39795 = 39795; + public static final int LANTADYME_39796 = 39796; + public static final int DWARF_WEED = 39797; + public static final int DWARF_WEED_39798 = 39798; + public static final int DWARF_WEED_39799 = 39799; + public static final int DWARF_WEED_39800 = 39800; + public static final int DWARF_WEED_39801 = 39801; + public static final int TORSTOL = 39802; + public static final int TORSTOL_39803 = 39803; + public static final int TORSTOL_39804 = 39804; + public static final int TORSTOL_39805 = 39805; + public static final int TORSTOL_39806 = 39806; + public static final int SNAPDRAGON = 39807; + public static final int SNAPDRAGON_39808 = 39808; + 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; @@ -20787,14 +20839,14 @@ public final class ObjectID public static final int ORNATE_BANNER_STAND_41162 = 41162; public static final int ORNATE_BANNER_STAND_41163 = 41163; public static final int ORNATE_BANNER_STAND_41164 = 41164; - public static final int OAK_OUTFIT_STAND = 41165; + public static final int OAK_OUTFIT_STAND_41165 = 41165; public static final int OAK_OUTFIT_STAND_41166 = 41166; public static final int OAK_OUTFIT_STAND_41167 = 41167; public static final int OAK_OUTFIT_STAND_41168 = 41168; public static final int OAK_OUTFIT_STAND_41169 = 41169; public static final int OAK_OUTFIT_STAND_41170 = 41170; public static final int OAK_OUTFIT_STAND_41171 = 41171; - public static final int MAHOGANY_OUTFIT_STAND = 41172; + public static final int MAHOGANY_OUTFIT_STAND_41172 = 41172; public static final int MAHOGANY_OUTFIT_STAND_41173 = 41173; public static final int MAHOGANY_OUTFIT_STAND_41174 = 41174; public static final int MAHOGANY_OUTFIT_STAND_41175 = 41175; @@ -26267,11 +26319,11 @@ public final class ObjectID 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 HERBS_55347 = 55347; - public static final int HERBS_55348 = 55348; - public static final int HERBS_55349 = 55349; - public static final int HERBS_55350 = 55350; - public static final int HERBS_55351 = 55351; + public static final int HUASCA = 55347; + public static final int HUASCA_55348 = 55348; + public static final int HUASCA_55349 = 55349; + public static final int HUASCA_55350 = 55350; + public static final int HUASCA_55351 = 55351; public static final int HOUSE_ADVERTISEMENT_55352 = 55352; public static final int PORTAL_55353 = 55353; public static final int HOPPER_CONTROLS_55402 = 55402; diff --git a/runelite-api/src/main/java/net/runelite/api/Renderable.java b/runelite-api/src/main/java/net/runelite/api/Renderable.java index b3162b3e91b..bce439b4dd2 100644 --- a/runelite-api/src/main/java/net/runelite/api/Renderable.java +++ b/runelite-api/src/main/java/net/runelite/api/Renderable.java @@ -45,11 +45,12 @@ public interface Renderable extends Node int getAnimationHeightOffset(); - @MagicConstant(intValues = {RENDERMODE_DEFAULT, RENDERMODE_SORTED, RENDERMODE_SORTED_NO_DEPTH, RENDERMODE_UNSORTED}) + @MagicConstant(intValues = {RENDERMODE_DEFAULT, RENDERMODE_SORTED, RENDERMODE_SORTED_NO_DEPTH, RENDERMODE_UNSORTED, RENDERMODE_UNSORTED_NO_DEPTH}) int getRenderMode(); int RENDERMODE_DEFAULT = 0; int RENDERMODE_SORTED = 1; int RENDERMODE_SORTED_NO_DEPTH = 2; int RENDERMODE_UNSORTED = 3; + int RENDERMODE_UNSORTED_NO_DEPTH = 4; } diff --git a/runelite-api/src/main/java/net/runelite/api/Scene.java b/runelite-api/src/main/java/net/runelite/api/Scene.java index d660408d2a4..0d3a63c335c 100644 --- a/runelite-api/src/main/java/net/runelite/api/Scene.java +++ b/runelite-api/src/main/java/net/runelite/api/Scene.java @@ -173,4 +173,6 @@ public interface Scene extends Renderable byte getOverrideHue(); byte getOverrideSaturation(); byte getOverrideLuminance(); + + Model getSkybox(); } diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index d77c75300e2..500fa965fa9 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -486,7 +486,7 @@ public final class ScriptID @ScriptArguments(integer = 17) public static final int BANK_DEPOSITBOX_INIT = 144; - @ScriptArguments(integer = 7) + @ScriptArguments(integer = 8) public static final int SEED_VAULT_BUILD = 2819; @ScriptArguments(integer = 4) diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java index fa85c934677..fb0adc899ff 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java @@ -13899,5 +13899,12 @@ public final class AnimationID public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_FULL_OFFSET = 13899; public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_DOWN_TO_FULL_OFFSET = 13900; public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_HALF_TO_FULL_OFFSET = 13901; + public static final int LEAGUE_6_HOME_TELEPORT_SCROLL_READ = 13902; + public static final int CHAIR_SIT_READY_THRONE_8 = 13903; + public static final int CHAIR_EAT_THRONE_8 = 13904; + public static final int SLAYER_TOTS_CHARGE_ORN = 13905; + public static final int SLAYER_TOTS_CHARGE_TOXIC_ORN = 13906; + public static final int SLAYER_TOTS_I_CHARGE_ORN = 13907; + public static final int SLAYER_TOTS_I_CHARGE_TOXIC_ORN = 13908; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java b/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java index 9f53b1831d1..834e2e5431b 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 @@ -7086,6 +7086,9 @@ public static final class Row public static final int VENGEANCE_ANIM_TOGGLE_LIST = 4094; public static final int ALCHEMY_ANIM_TOGGLE_LIST = 4095; public static final int NPC_CONTACT_ANIM_TOGGLE_LIST = 4096; + public static final int RESURRECTION_COSMETIC_TOGGLE_LIST_ZOMBIE = 8114; + public static final int RESURRECTION_COSMETIC_TOGGLE_LIST_SKELETON = 8115; + public static final int RESURRECTION_COSMETIC_TOGGLE_LIST_GHOST = 8116; } } @@ -9222,6 +9225,7 @@ public static final class Row public static final int POH_TROPHY_BLUEFIN = 7126; public static final int POH_TROPHY_MARLIN = 7127; public static final int POH_GARDEN_CENTREPIECE_6 = 9654; + public static final int POH_THRONE_8 = 16324; } } @@ -10327,6 +10331,7 @@ public static final class Row public static final int SLAYER_REWARDS_UNLOCK_GRYPHONS = 9420; public static final int SLAYER_REWARDS_UNLOCK_HELM_HOODED = 9641; public static final int SLAYER_REWARDS_LONGER_GRYPHONS = 9642; + public static final int SLAYER_REWARDS_UNLOCK_HELM_LEAGUE_6 = 16325; } } @@ -22710,6 +22715,7 @@ public static final class Row public static final int SKILL_FEATURE_MAGIC_ANCIENT_LEAGUES_6_HOME_TELEPORT = 16262; 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; } } 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 b7f47bee02d..06bfef774a4 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 @@ -5365,6 +5365,9 @@ public static final class FarmingTools public static final int COMPOST = 0x007d_0011; public static final int SUPERCOMPOST = 0x007d_0012; public static final int ULTRACOMPOST = 0x007d_0013; + public static final int DEPOSIT_ALL = 0x007d_0014; + public static final int DEPOSITINV = 0x007d_0015; + public static final int DEPOSITINV_GRAPHIC = 0x007d_0016; } public static final class FarmingToolsSide @@ -22334,27 +22337,29 @@ public static final class SeedVault public static final int RIGHT_PANEL = 0x0277_0009; public static final int RIGHT_SCROLL = 0x0277_000a; public static final int LIST = 0x0277_000b; - public static final int FAVES = 0x0277_000c; - public static final int CATEGORY_HEADERS = 0x0277_000d; - public static final int CATEGORY_LINES = 0x0277_000e; - public static final int OBJ_LIST = 0x0277_000f; - public static final int TEXT_LIST = 0x0277_0010; - public static final int BUTTONS = 0x0277_0011; - public static final int BUTTONS_LINE0 = 0x0277_0012; - public static final int X1 = 0x0277_0013; - public static final int X5 = 0x0277_0014; - public static final int X10 = 0x0277_0015; - public static final int XX = 0x0277_0016; - public static final int XALL = 0x0277_0017; - public static final int SEARCH = 0x0277_0018; - public static final int DEPOSIT_ALL = 0x0277_0019; - public static final int DEPOSIT_ALL_GFX = 0x0277_001a; - public static final int TEXT_1 = 0x0277_001b; - public static final int TEXT_5 = 0x0277_001c; - public static final int TEXT_10 = 0x0277_001d; - public static final int TEXT_X = 0x0277_001e; - public static final int TEXT_ALL = 0x0277_001f; - public static final int SEARCH_GFX = 0x0277_0020; + public static final int CONTRACT_SEEDS = 0x0277_000c; + public static final int MAIN_VAULT = 0x0277_000d; + public static final int FAVES = 0x0277_000e; + public static final int CATEGORY_HEADERS = 0x0277_000f; + public static final int CATEGORY_LINES = 0x0277_0010; + public static final int OBJ_LIST = 0x0277_0011; + public static final int TEXT_LIST = 0x0277_0012; + public static final int BUTTONS = 0x0277_0013; + public static final int BUTTONS_LINE0 = 0x0277_0014; + public static final int X1 = 0x0277_0015; + public static final int X5 = 0x0277_0016; + public static final int X10 = 0x0277_0017; + public static final int XX = 0x0277_0018; + public static final int XALL = 0x0277_0019; + public static final int SEARCH = 0x0277_001a; + public static final int DEPOSIT_ALL = 0x0277_001b; + public static final int DEPOSIT_ALL_GFX = 0x0277_001c; + public static final int TEXT_1 = 0x0277_001d; + public static final int TEXT_5 = 0x0277_001e; + public static final int TEXT_10 = 0x0277_001f; + public static final int TEXT_X = 0x0277_0020; + public static final int TEXT_ALL = 0x0277_0021; + public static final int SEARCH_GFX = 0x0277_0022; } public static final class HallowedToolSide 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 c16ac4a14ef..36cb0504e9b 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 @@ -87225,7 +87225,7 @@ public final class ItemID public static final int TOXIC_TOTS_I_CHARGED_ORN = 33318; /** - * Uncharged toxic trident (e) + * Uncharged toxic trident (e) (o) */ public static final int TOXIC_TOTS_I_UNCHARGED_ORN = 33320; @@ -87250,7 +87250,7 @@ public final class ItemID public static final int TOTS_I_UNCHARGED_ORN = 33328; /** - * Iban's staff + * Iban's staff (o) */ public static final int IBAN_STAFF_ORN = 33330; @@ -87260,7 +87260,7 @@ public final class ItemID public static final int IBAN_STAFF_UPGRADED_ORN = 33332; /** - * Iban's staff (o) + * Iban's staff (b)(o) */ public static final int BROKEN_IBAN_STAFF_ORN = 33333; @@ -87270,12 +87270,12 @@ public final class ItemID public static final int SOULREAPER_AXE_ORN = 33335; /** - * Demonic slayer helmet + * Oathplate slayer helmet */ public static final int LEAGUE_6_SLAYER_HELM1 = 33338; /** - * Demonic slayer helmet + * Radiant slayer helmet */ public static final int LEAGUE_6_SLAYER_HELM2 = 33340; @@ -87320,7 +87320,7 @@ public final class ItemID public static final int LEAGUE_6_BRONZE_TROPHY = 33357; /** - * Impish ritual kit + * Impish ritual scroll */ public static final int LEAGUE_6_RITUAL_KIT = 33359; @@ -87479,6 +87479,62 @@ public final class ItemID */ public static final int MAGIC_ROCK_OF_VENGEANCE_1_USE = 33431; + /** + * Uncharged trident (o) + */ + public static final int TOTS_UNCHARGED_ORN = 33434; + public static final int POH_DUMMY_THRONE_8 = 33436; + + /** + * Sulphurous fertiliser + */ + public static final int BUCKET_SULPHUROUS_FERTILISER = 33437; + + /** + * Oathplate slayer helmet (i) + */ + public static final int LEAGUE_6_SLAYER_HELM1_I = 33439; + + /** + * Oathplate slayer helmet (i) + */ + public static final int SW_LEAGUE_6_SLAYER_HELM1_I = 33441; + + /** + * Oathplate slayer helmet (i) + */ + public static final int PVPA_LEAGUE_6_SLAYER_HELM1_I = 33443; + + /** + * Radiant slayer helmet (i) + */ + public static final int LEAGUE_6_SLAYER_HELM2_I = 33445; + + /** + * Radiant slayer helmet (i) + */ + public static final int SW_LEAGUE_6_SLAYER_HELM2_I = 33447; + + /** + * Radiant slayer helmet (i) + */ + public static final int PVPA_LEAGUE_6_SLAYER_HELM2_I = 33449; + + /** + * Demonic pacts relic hunter (t1) armour set + */ + public static final int SET_LEAGUE_6_RELICHUNTER_T1 = 33451; + + /** + * Demonic pacts relic hunter (t2) armour set + */ + public static final int SET_LEAGUE_6_RELICHUNTER_T2 = 33454; + + /** + * Demonic pacts relic hunter (t3) armour set + */ + public static final int SET_LEAGUE_6_RELICHUNTER_T3 = 33457; + public static final class Cert { public static final int TWPART1 = 7; @@ -92104,11 +92160,6 @@ public static final class Cert public static final int DEMONIC_AXE_ORNAMENT_KIT = 33306; public static final int DEMONIC_STAFF_ORNAMENT_KIT = 33309; public static final int DEMONIC_TRIDENT_ORNAMENT_KIT = 33312; - public static final int TOXIC_TOTS_UNCHARGED_ORN = 33317; - public static final int TOXIC_TOTS_I_UNCHARGED_ORN = 33321; - public static final int TOTS_ORN = 33324; - public static final int TOTS_I_UNCHARGED_ORN = 33329; - public static final int SOULREAPER_AXE_ORN = 33336; public static final int LEAGUE_6_DEMONIC_QUILL = 33343; public static final int LEAGUE_6_RITUAL_KIT = 33360; public static final int LEAGUE_6_THRONE = 33363; @@ -92117,6 +92168,9 @@ public static final class Cert public static final int DEADMAN_ALL_STAR_MISSION_TOTEM = 33425; public static final int MAGIC_ROCK_OF_VENGEANCE_2_USE = 33429; public static final int MAGIC_ROCK_OF_VENGEANCE_1_USE = 33432; + 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 class Placeholder @@ -101670,6 +101724,17 @@ 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; + public static final int PVPA_LEAGUE_6_SLAYER_HELM1_I = 33444; + public static final int LEAGUE_6_SLAYER_HELM2_I = 33446; + public static final int SW_LEAGUE_6_SLAYER_HELM2_I = 33448; + public static final int PVPA_LEAGUE_6_SLAYER_HELM2_I = 33450; + 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; } /* 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 d634a4aeb4b..5e7c3304550 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,10 +1109,6 @@ 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; @@ -68297,5 +68293,24 @@ public final class NpcID * Yama */ public static final int DEADMAN_ALL_STARS_MISSION_YAMA = 15700; + public static final int THRALL_IMP_MAGIC_LESSER = 15701; + public static final int THRALL_IMP_MAGIC_SUPERIOR = 15702; + public static final int THRALL_IMP_MAGIC_GREATER = 15703; + public static final int THRALL_IMP_RANGED_LESSER = 15704; + public static final int THRALL_IMP_RANGED_SUPERIOR = 15705; + public static final int THRALL_IMP_RANGED_GREATER = 15706; + public static final int THRALL_IMP_MELEE_LESSER = 15707; + 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 + */ + public static final int POH_SERVANT_DEMON_LEAGUES_6 = 15711; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID.java index 2c69dca512e..8ebba550d0d 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID.java @@ -46339,7 +46339,7 @@ public final class ObjectID extends ObjectID1 public static final int DUNGEONKIT_BARS02_EDGE01 = 14208; /** - * Herbs + * Guam leaf */ public static final int HERB_GUAM_LEAF_SEED = 14209; public static final int PEST_WALL_RANGE_FIXED = 14210; @@ -83239,27 +83239,27 @@ public final class ObjectID extends ObjectID1 public static final int FEUD_BIRD_CAGE_TABLE_SMALLER = 26824; /** - * Herbs + * Guam leaf */ public static final int HERB_GUAM_LEAF_1 = 26825; /** - * Herbs + * Guam leaf */ public static final int HERB_GUAM_LEAF_2 = 26826; /** - * Herbs + * Guam leaf */ public static final int HERB_GUAM_LEAF_3 = 26827; /** - * Herbs + * Guam leaf */ public static final int HERB_GUAM_LEAF_FULLYGROWN = 26828; /** - * Herbs + * Marrentill */ public static final int HERB_MARRENTILL_SEED = 26829; @@ -92130,6 +92130,266 @@ public final class ObjectID extends ObjectID1 */ public static final int FAIRYRING_HOMEHUB = 29560; + /** + * Oak outfit stand + */ + public static final int POH_LEAGUEHALL_OUTFITSTAND_OAK_LEAGUE_6_T1 = 29561; + + /** + * Oak outfit stand + */ + public static final int POH_LEAGUEHALL_OUTFITSTAND_OAK_LEAGUE_6_T2 = 29562; + + /** + * Oak outfit stand + */ + public static final int POH_LEAGUEHALL_OUTFITSTAND_OAK_LEAGUE_6_T3 = 29563; + + /** + * Mahogany outfit stand + */ + public static final int POH_LEAGUEHALL_OUTFITSTAND_MAHOGANY_LEAGUE_6_T1 = 29564; + + /** + * Mahogany outfit stand + */ + public static final int POH_LEAGUEHALL_OUTFITSTAND_MAHOGANY_LEAGUE_6_T2 = 29565; + + /** + * Mahogany outfit stand + */ + public static final int POH_LEAGUEHALL_OUTFITSTAND_MAHOGANY_LEAGUE_6_T3 = 29566; + + /** + * Throne + */ + public static final int POH_INVISIBLE_THRONE_8 = 29567; + + /** + * Diseased guam leaf + */ + public static final int HERB_GUAM_LEAF_DISEASED_1 = 29568; + + /** + * Diseased guam leaf + */ + public static final int HERB_GUAM_LEAF_DISEASED_2 = 29569; + + /** + * Diseased guam leaf + */ + public static final int HERB_GUAM_LEAF_DISEASED_3 = 29570; + + /** + * Diseased marrentill + */ + public static final int HERB_MARENTILL_DISEASED_1 = 29571; + + /** + * Diseased marrentill + */ + public static final int HERB_MARENTILL_DISEASED_2 = 29572; + + /** + * Diseased marrentill + */ + public static final int HERB_MARENTILL_DISEASED_3 = 29573; + + /** + * Diseased tarromin + */ + public static final int HERB_TARROMIN_DISEASED_1 = 29574; + + /** + * Diseased tarromin + */ + public static final int HERB_TARROMIN_DISEASED_2 = 29575; + + /** + * Diseased tarromin + */ + public static final int HERB_TARROMIN_DISEASED_3 = 29576; + + /** + * Diseased harralander + */ + public static final int HERB_HARRALANDER_DISEASED_1 = 29577; + + /** + * Diseased harralander + */ + public static final int HERB_HARRALANDER_DISEASED_2 = 29578; + + /** + * Diseased harralander + */ + public static final int HERB_HARRALANDER_DISEASED_3 = 29579; + + /** + * Diseased ranarr weed + */ + public static final int HERB_RANARR_WEED_DISEASED_1 = 29580; + + /** + * Diseased ranarr weed + */ + public static final int HERB_RANARR_WEED_DISEASED_2 = 29581; + + /** + * Diseased ranarr weed + */ + public static final int HERB_RANARR_WEED_DISEASED_3 = 29582; + + /** + * Diseased irit leaf + */ + public static final int HERB_IRIT_LEAF_DISEASED_1 = 29583; + + /** + * Diseased irit leaf + */ + public static final int HERB_IRIT_LEAF_DISEASED_2 = 29584; + + /** + * Diseased irit leaf + */ + public static final int HERB_IRIT_LEAF_DISEASED_3 = 29585; + + /** + * Diseased avantoe + */ + public static final int HERB_AVANTOE_DISEASED_1 = 29586; + + /** + * Diseased avantoe + */ + public static final int HERB_AVANTOE_DISEASED_2 = 29587; + + /** + * Diseased avantoe + */ + public static final int HERB_AVANTOE_DISEASED_3 = 29588; + + /** + * Diseased toadflax + */ + public static final int HERB_TOADFLAX_DISEASED_1 = 29589; + + /** + * Diseased toadflax + */ + public static final int HERB_TOADFLAX_DISEASED_2 = 29590; + + /** + * Diseased toadflax + */ + public static final int HERB_TOADFLAX_DISEASED_3 = 29591; + + /** + * Diseased kwuarm + */ + public static final int HERB_KWUARM_DISEASED_1 = 29592; + + /** + * Diseased kwuarm + */ + public static final int HERB_KWUARM_DISEASED_2 = 29593; + + /** + * Diseased kwuarm + */ + public static final int HERB_KWUARM_DISEASED_3 = 29594; + + /** + * Diseased cadantine + */ + public static final int HERB_CADANTINE_DISEASED_1 = 29595; + + /** + * Diseased cadantine + */ + public static final int HERB_CADANTINE_DISEASED_2 = 29596; + + /** + * Diseased cadantine + */ + public static final int HERB_CADANTINE_DISEASED_3 = 29597; + + /** + * Diseased lantadyme + */ + public static final int HERB_LANTADYME_DISEASED_1 = 29598; + + /** + * Diseased lantadyme + */ + public static final int HERB_LANTADYME_DISEASED_2 = 29599; + + /** + * Diseased lantadyme + */ + public static final int HERB_LANTADYME_DISEASED_3 = 29600; + + /** + * Diseased dwarf weed + */ + public static final int HERB_DWARF_WEED_DISEASED_1 = 29601; + + /** + * Diseased dwarf weed + */ + public static final int HERB_DWARF_WEED_DISEASED_2 = 29602; + + /** + * Diseased dwarf weed + */ + public static final int HERB_DWARF_WEED_DISEASED_3 = 29603; + + /** + * Diseased torstol + */ + public static final int HERB_TORSTOL_DISEASED_1 = 29604; + + /** + * Diseased torstol + */ + public static final int HERB_TORSTOL_DISEASED_2 = 29605; + + /** + * Diseased torstol + */ + public static final int HERB_TORSTOL_DISEASED_3 = 29606; + + /** + * Diseased snapdragon + */ + public static final int HERB_SNAPDRAGON_DISEASED_1 = 29607; + + /** + * Diseased snapdragon + */ + public static final int HERB_SNAPDRAGON_DISEASED_2 = 29608; + + /** + * Diseased snapdragon + */ + public static final int HERB_SNAPDRAGON_DISEASED_3 = 29609; + + /** + * Diseased huasca + */ + public static final int HERB_HUASCA_DISEASED_1 = 29610; + + /** + * Diseased huasca + */ + public static final int HERB_HUASCA_DISEASED_2 = 29611; + + /** + * Diseased huasca + */ + public static final int HERB_HUASCA_DISEASED_3 = 29612; + /** * Mounted Max Cape */ 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 94ae1e9d1f3..56701164a1b 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 @@ -19922,322 +19922,322 @@ public class ObjectID1 public static final int GH_ROCKSLIDE_06 = 39747; /** - * Herbs + * Marrentill */ public static final int HERB_MARRENTILL_1 = 39748; /** - * Herbs + * Marrentill */ public static final int HERB_MARRENTILL_2 = 39749; /** - * Herbs + * Marrentill */ public static final int HERB_MARRENTILL_3 = 39750; /** - * Herbs + * Marrentill */ public static final int HERB_MARRENTILL_FULLYGROWN = 39751; /** - * Herbs + * Tarromin */ public static final int HERB_TARROMIN_SEED = 39752; /** - * Herbs + * Tarromin */ public static final int HERB_TARROMIN_1 = 39753; /** - * Herbs + * Tarromin */ public static final int HERB_TARROMIN_2 = 39754; /** - * Herbs + * Tarromin */ public static final int HERB_TARROMIN_3 = 39755; /** - * Herbs + * Tarromin */ public static final int HERB_TARROMIN_FULLYGROWN = 39756; /** - * Herbs + * Harralander */ public static final int HERB_HARRALANDER_SEED = 39757; /** - * Herbs + * Harralander */ public static final int HERB_HARRALANDER_1 = 39758; /** - * Herbs + * Harralander */ public static final int HERB_HARRALANDER_2 = 39759; /** - * Herbs + * Harralander */ public static final int HERB_HARRALANDER_3 = 39760; /** - * Herbs + * Harralander */ public static final int HERB_HARRALANDER_FULLYGROWN = 39761; /** - * Herbs + * Ranarr weed */ public static final int HERB_RANARR_WEED_SEED = 39762; /** - * Herbs + * Ranarr weed */ public static final int HERB_RANARR_WEED_1 = 39763; /** - * Herbs + * Ranarr weed */ public static final int HERB_RANARR_WEED_2 = 39764; /** - * Herbs + * Ranarr weed */ public static final int HERB_RANARR_WEED_3 = 39765; /** - * Herbs + * Ranarr weed */ public static final int HERB_RANARR_WEED_FULLYGROWN = 39766; /** - * Herbs + * Irit leaf */ public static final int HERB_IRIT_LEAF_SEED = 39767; /** - * Herbs + * Irit leaf */ public static final int HERB_IRIT_LEAF_1 = 39768; /** - * Herbs + * Irit leaf */ public static final int HERB_IRIT_LEAF_2 = 39769; /** - * Herbs + * Irit leaf */ public static final int HERB_IRIT_LEAF_3 = 39770; /** - * Herbs + * Irit leaf */ public static final int HERB_IRIT_LEAF_FULLYGROWN = 39771; /** - * Herbs + * Avantoe */ public static final int HERB_AVANTOE_SEED = 39772; /** - * Herbs + * Avantoe */ public static final int HERB_AVANTOE_1 = 39773; /** - * Herbs + * Avantoe */ public static final int HERB_AVANTOE_2 = 39774; /** - * Herbs + * Avantoe */ public static final int HERB_AVANTOE_3 = 39775; /** - * Herbs + * Avantoe */ public static final int HERB_AVANTOE_FULLYGROWN = 39776; /** - * Herbs + * Toadflax */ public static final int HERB_TOADFLAX_SEED = 39777; /** - * Herbs + * Toadflax */ public static final int HERB_TOADFLAX_1 = 39778; /** - * Herbs + * Toadflax */ public static final int HERB_TOADFLAX_2 = 39779; /** - * Herbs + * Toadflax */ public static final int HERB_TOADFLAX_3 = 39780; /** - * Herbs + * Toadflax */ public static final int HERB_TOADFLAX_FULLYGROWN = 39781; /** - * Herbs + * Kwuarm */ public static final int HERB_KWUARM_SEED = 39782; /** - * Herbs + * Kwuarm */ public static final int HERB_KWUARM_1 = 39783; /** - * Herbs + * Kwuarm */ public static final int HERB_KWUARM_2 = 39784; /** - * Herbs + * Kwuarm */ public static final int HERB_KWUARM_3 = 39785; /** - * Herbs + * Kwuarm */ public static final int HERB_KWUARM_FULLYGROWN = 39786; /** - * Herbs + * Cadantine */ public static final int HERB_CADANTINE_SEED = 39787; /** - * Herbs + * Cadantine */ public static final int HERB_CADANTINE_1 = 39788; /** - * Herbs + * Cadantine */ public static final int HERB_CADANTINE_2 = 39789; /** - * Herbs + * Cadantine */ public static final int HERB_CADANTINE_3 = 39790; /** - * Herbs + * Cadantine */ public static final int HERB_CADANTINE_FULLYGROWN = 39791; /** - * Herbs + * Lantadyme */ public static final int HERB_LANTADYME_SEED = 39792; /** - * Herbs + * Lantadyme */ public static final int HERB_LANTADYME_1 = 39793; /** - * Herbs + * Lantadyme */ public static final int HERB_LANTADYME_2 = 39794; /** - * Herbs + * Lantadyme */ public static final int HERB_LANTADYME_3 = 39795; /** - * Herbs + * Lantadyme */ public static final int HERB_LANTADYME_FULLYGROWN = 39796; /** - * Herbs + * Dwarf weed */ public static final int HERB_DWARF_WEED_SEED = 39797; /** - * Herbs + * Dwarf weed */ public static final int HERB_DWARF_WEED_1 = 39798; /** - * Herbs + * Dwarf weed */ public static final int HERB_DWARF_WEED_2 = 39799; /** - * Herbs + * Dwarf weed */ public static final int HERB_DWARF_WEED_3 = 39800; /** - * Herbs + * Dwarf weed */ public static final int HERB_DWARF_WEED_FULLYGROWN = 39801; /** - * Herbs + * Torstol */ public static final int HERB_TORSTOL_SEED = 39802; /** - * Herbs + * Torstol */ public static final int HERB_TORSTOL_1 = 39803; /** - * Herbs + * Torstol */ public static final int HERB_TORSTOL_2 = 39804; /** - * Herbs + * Torstol */ public static final int HERB_TORSTOL_3 = 39805; /** - * Herbs + * Torstol */ public static final int HERB_TORSTOL_FULLYGROWN = 39806; /** - * Herbs + * Snapdragon */ public static final int HERB_SNAPDRAGON_SEED = 39807; /** - * Herbs + * Snapdragon */ public static final int HERB_SNAPDRAGON_1 = 39808; /** - * Herbs + * Snapdragon */ public static final int HERB_SNAPDRAGON_2 = 39809; /** - * Herbs + * Snapdragon */ public static final int HERB_SNAPDRAGON_3 = 39810; /** - * Herbs + * Snapdragon */ public static final int HERB_SNAPDRAGON_FULLYGROWN = 39811; @@ -60917,27 +60917,27 @@ public class ObjectID1 public static final int MYARM_REALPATCH_HERB5_HUASCA_ACTIVE = 55346; /** - * Herbs + * Huasca */ public static final int HERB_HUASCA_SEED = 55347; /** - * Herbs + * Huasca */ public static final int HERB_HUASCA_1 = 55348; /** - * Herbs + * Huasca */ public static final int HERB_HUASCA_2 = 55349; /** - * Herbs + * Huasca */ public static final int HERB_HUASCA_3 = 55350; /** - * Herbs + * Huasca */ public static final int HERB_HUASCA_FULLYGROWN = 55351; diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/SpotanimID.java b/runelite-api/src/main/java/net/runelite/api/gameval/SpotanimID.java index eda5325a1e4..c520fca3cfa 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/SpotanimID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/SpotanimID.java @@ -3786,5 +3786,15 @@ public final class SpotanimID public static final int VFX_SAILING_CANNON01_SMALL01_CHAINSHOT01_ADAMANT_PROJ01 = 3779; public static final int VFX_SAILING_CANNON01_SMALL01_CHAINSHOT01_RUNE_PROJ01 = 3780; public static final int VFX_SAILING_CANNON01_SMALL01_CHAINSHOT01_DRAGON_PROJ01 = 3781; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_ASGARNIA = 3782; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_FREMENNIK = 3783; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_KANDARIN = 3784; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_KARAMJA = 3785; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_KHARIDIAN_DESERT = 3786; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_MORYTANIA = 3787; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_TIRANNWN = 3788; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_WILDERNESS = 3789; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_KOUREND = 3790; + public static final int LEAGUE_6_AREA_UNLOCK_EMOTE_SPOTANIM_VARLAMORE = 3791; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java b/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java index a17e363306c..8467611637d 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 @@ -3946,6 +3946,12 @@ public static final class WorldswitcherFlags public static final int _9 = 4936; public static final int _10 = 4937; public static final int _11 = 4938; + public static final int _12 = 8351; + public static final int _13 = 8352; + public static final int _14 = 8353; + public static final int _15 = 8354; + public static final int _16 = 8355; + public static final int _17 = 8356; public static final int NONE = _0; public static final int USA = _1; diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java b/runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java index 97fd0474995..25b8ef58025 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java @@ -903,6 +903,7 @@ public final class VarPlayerID public static final int KEBOS_BLESSING_TRACKER = 2088; public static final int MOLCH_BARRIERS = 2090; public static final int KEBOS_FARMGUILD = 2091; + public static final int FARMGUILD_CONTRACT = 2094; public static final int SLAYER_AREA = 2096; public static final int CLUEQUEST_MAIN = 2111; public static final int SEED_VAULT_TEMP = 2194; @@ -2862,5 +2863,11 @@ public final class VarPlayerID public static final int DEADMAN_ALLSTAR_DATA = 5575; public static final int DEADMAN_ALLSTAR_DATA_2 = 5576; public static final int DEADMAN_ALLSTAR_DATA_3 = 5577; + public static final int RESURRECTION_COSMETIC_TOGGLES = 5581; + public static final int LEAGUE_6_REWARDS = 5582; + public static final int AUTO_BANK_LOOT = 5583; + public static final int POH_BUTLER_COSMETICS = 5584; + public static final int PORT_TASKS_BOUNTY_ITEM_COUNTER = 5586; + public static final int SLAYER_REWARDS_UNLOCKS2 = 5587; /* 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 5a837c364cc..d1ae7bbf362 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 @@ -4827,6 +4827,10 @@ public final class VarbitID public static final int FGUILD_BOOK_HERBS = 7956; public static final int FGUILD_BOOK_TREES = 7957; public static final int FGUILD_BOOK_FRUIT = 7958; + public static final int FARMGUILD_CONTRACT_COMPLETE = 7961; + public static final int FARMGUILD_CONTRACT_LEVEL = 7962; + public static final int FARMGUILD_CONTRACT_TYPE = 7963; + public static final int FARMGUILD_CONTRACT_COUNT = 7964; public static final int PLAYER_HAS_HIT_200M_ALL = 7969; public static final int HH_CONSTRUCTED_MEDIUM_EXP10 = 7970; public static final int WINT_TRANSMIT_RESPAWNDELAY = 7980; @@ -8456,6 +8460,14 @@ public final class VarbitID public static final int SPECTATOR_STAT_TRACK_TARGET = 13326; public static final int SPECTATOR_TOTAL_PLAYER = 13327; public static final int SPECTATOR_PLAYERLIST_IS_SEARCHING = 13328; + public static final int RESURRECTION_COSMETIC_TOGGLES_ZOMBIE = 13329; + public static final int RESURRECTION_COSMETIC_TOGGLES_SKELETON = 13330; + public static final int RESURRECTION_COSMETIC_TOGGLES_GHOST = 13331; + public static final int LEAGUE_6_HOME_TELEPORT_UNLOCKED = 13332; + public static final int LEAGUE_6_THRALL_OVERRIDE_UNLOCKED = 13333; + public static final int LEAGUE_6_RED_SKIN_UNLOCKED = 13334; + public static final int LEAGUE_6_BUTLER_UNLOCKED = 13335; + public static final int POH_DEMON_BUTLER_COSMETICS = 13336; public static final int LEAGUE_TASK_FILTER_SKILL = 13340; public static final int LEAGUE_REWARD_POINTS_BUFFER = 13341; public static final int LEAGUE_UNLOCK_POINTS_BUFFER = 13342; @@ -9537,6 +9549,8 @@ public final class VarbitID public static final int CA_TASK_TOA_KILLCOUNT_1 = 14659; public static final int CA_TASK_TOA_KILLCOUNT_2 = 14660; public static final int CA_TASK_TOA_KILLCOUNT_3 = 14661; + public static final int BOUNTY_TASK_ITEM_COUNTER_1 = 14662; + public static final int BOUNTY_TASK_ITEM_COUNTER_2 = 14663; public static final int CA_TASK_TOA_KILLCOUNT_6 = 14664; public static final int CA_TASK_TOA_KILLCOUNT_7 = 14665; public static final int CA_TASK_TOA_KILLCOUNT_8 = 14666; @@ -9668,6 +9682,7 @@ public final class VarbitID public static final int SETTINGS_TEXTFIELD_CSV_MODAL_OPENED = 14816; public static final int OPTION_MASTER_VOLUME_SAVED = 14817; public static final int AB_GROUP_RESET6 = 14818; + public static final int BOUNTY_TASK_ITEM_COUNTER_3 = 14819; public static final int SLAYER_LONGER_REVENANTS = 14822; public static final int SLAYER_TOGGLEOFF_LONGERREVENANTS = 14823; public static final int SLAYER_TOGGLEOFF_FOSSILWYVERNBLOCK = 14824; @@ -9993,11 +10008,13 @@ public final class VarbitID public static final int STAR_LAST_MINED_LOCATION = 15352; public static final int STAR_LAST_MINED_SIZE = 15353; public static final int STAR_TIME_SINCE_LANDED = 15354; + public static final int BOUNTY_TASK_ITEM_COUNTER_4 = 15370; public static final int POH_DECOR_LEAGUES_4_POOL = 15372; public static final int RUNE_POUCH_TYPE_5 = 15373; public static final int RUNE_POUCH_TYPE_6 = 15374; 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 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-api/src/main/java/net/runelite/api/hooks/DrawCallbacks.java b/runelite-api/src/main/java/net/runelite/api/hooks/DrawCallbacks.java index 71aa1356b14..03dfb2ad7f3 100644 --- a/runelite-api/src/main/java/net/runelite/api/hooks/DrawCallbacks.java +++ b/runelite-api/src/main/java/net/runelite/api/hooks/DrawCallbacks.java @@ -73,6 +73,7 @@ public interface DrawCallbacks int PASS_OPAQUE = 0; int PASS_ALPHA = 1; + int PRE_PASS_ALPHA = 2; static int RENDER_THREADS(int num) { @@ -140,6 +141,15 @@ default void despawnWorldView(WorldView worldView) { } + default void preSceneDraw( + Scene scene, Projection entityProjection, + float cameraX, float cameraY, float cameraZ, float cameraPitch, float cameraYaw, + int minLevel, int level, int maxLevel, Set hideRoofIds) + { + preSceneDraw(scene, cameraX, cameraY, cameraZ, cameraPitch, cameraYaw, minLevel, level, maxLevel, hideRoofIds); + } + + @Deprecated default void preSceneDraw( Scene scene, float cameraX, float cameraY, float cameraZ, float cameraPitch, float cameraYaw, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java index 6b9fb0c0a5d..107bfbe5218 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java @@ -146,7 +146,7 @@ public enum HotColdLocation MORYTANIA_MOS_LES_HARMLESS(MASTER, new WorldPoint(3740, 3041, 0), MORYTANIA, "Northern area of Mos Le'Harmless, between the lakes.", BRASSICAN_MAGE), MORYTANIA_MOS_LES_HARMLESS_BAR(MASTER, new WorldPoint(3666, 2972, 0), MORYTANIA, "Near Mos Le'Harmless southern bar.", BRASSICAN_MAGE), MORYTANIA_DRAGONTOOTH_NORTH(MASTER, new WorldPoint(3811, 3569, 0), MORYTANIA, "Northern part of Dragontooth Island.", BRASSICAN_MAGE), - MORYTANIA_DRAGONTOOTH_SOUTH(MASTER, new WorldPoint(3803, 3532, 0), MORYTANIA, "Southern part of Dragontooth Island.", BRASSICAN_MAGE), + MORYTANIA_DRAGONTOOTH_SOUTH(MASTER, new WorldPoint(3803, 3529, 0), MORYTANIA, "Southern part of Dragontooth Island.", BRASSICAN_MAGE), MORYTANIA_SLEPE_TENTS(MASTER, new WorldPoint(3769, 3383, 0), MORYTANIA, "North-east of Slepe, near the tents.", BRASSICAN_MAGE), NORTHEAST_OF_AL_KHARID_MINE(BEGINNER, new WorldPoint(3332, 3313, 0), MISTHALIN, "Northeast of Al Kharid Mine"), SAIL_GREAT_CONCH(MASTER, new WorldPoint(3249, 2349, 0), OCEAN, "In the south-eastern mine of the Great Conch", BRASSICAN_MAGE), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java index ad7a76ac1fa..fbc0604c0b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java @@ -502,6 +502,16 @@ public void onCommandExecuted(CommandExecuted commandExecuted) player.getPlayerComposition().setHash(); break; } + case "zsort": + { + Player player = client.getLocalPlayer(); + player.getPlayerComposition().getEquipmentIds()[KitType.AMULET.getIndex()] = ItemID.ENCHANTED_ONYX_AMULET + PlayerComposition.ITEM_OFFSET; + player.getPlayerComposition().getEquipmentIds()[KitType.CAPE.getIndex()] = ItemID.SKILLCAPE_CONSTRUCTION + PlayerComposition.ITEM_OFFSET; + player.getPlayerComposition().getEquipmentIds()[KitType.TORSO.getIndex()] = ItemID.TORVA_CHEST + PlayerComposition.ITEM_OFFSET; + player.getPlayerComposition().getEquipmentIds()[KitType.LEGS.getIndex()] = ItemID.BARROWS_AHRIM_LEGS + PlayerComposition.ITEM_OFFSET; + player.getPlayerComposition().setHash(); + break; + } case "sound": { int id = Integer.parseInt(args[0]); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index a37c2c52334..ae96637ac02 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -177,13 +177,14 @@ public class GpuPlugin extends Plugin implements DrawCallbacks private VAOList vaoO; private VAOList vaoA; - private VAOList vaoPO; private SceneUploader clientUploader, mapUploader; private FacePrioritySorter facePrioritySorter; static class SceneContext { + final float[] projection = Mat4.identity(); + final int sizeX, sizeZ; Zone[][] zones; @@ -250,7 +251,7 @@ SceneContext context(WorldView wv) private int uniExpandedMapLoadingChunks; private int uniSmoothBanding; private int uniWorldProj; - private static int uniEntityProj; + static int uniEntityProj; static int uniEntityTint; private int uniBrightness; private int uniTex; @@ -266,7 +267,7 @@ SceneContext context(WorldView wv) private int uniUiColorblindIntensity; static int uniBase; - private static Projection lastProjection; + static final float[] IDENTITY = Mat4.identity(); @Override protected void startUp() @@ -666,7 +667,6 @@ private void initBuffers() vaoO = new VAOList(); vaoA = new VAOList(); - vaoPO = new VAOList(); } private void initGlBuffer(GLBuffer glBuffer) @@ -688,11 +688,7 @@ private void shutdownBuffers() { vaoA.free(); } - if (vaoPO != null) - { - vaoPO.free(); - } - vaoO = vaoA = vaoPO = null; + vaoO = vaoA = null; } private void destroyGlBuffer(GLBuffer glBuffer) @@ -790,33 +786,25 @@ private void shutdownFbo() } } - static void updateEntityProjection(Projection projection) - { - if (lastProjection != projection) - { - float[] p = projection instanceof FloatProjection ? ((FloatProjection) projection).getProjection() : Mat4.identity(); - glUniformMatrix4fv(uniEntityProj, false, p); - lastProjection = projection; - } - } - @Override - public void preSceneDraw(Scene scene, + public void preSceneDraw(Scene scene, Projection entityProjection, float cameraX, float cameraY, float cameraZ, float cameraPitch, float cameraYaw, int minLevel, int level, int maxLevel, Set hideRoofIds) { SceneContext ctx = context(scene); - if (ctx != null) + if (ctx == null) { - ctx.cameraX = (int) cameraX; - ctx.cameraY = (int) cameraY; - ctx.cameraZ = (int) cameraZ; - ctx.minLevel = minLevel; - ctx.level = level; - ctx.maxLevel = maxLevel; - ctx.hideRoofIds = hideRoofIds; + return; } + ctx.cameraX = (int) cameraX; + ctx.cameraY = (int) cameraY; + ctx.cameraZ = (int) cameraZ; + ctx.minLevel = minLevel; + ctx.level = level; + ctx.maxLevel = maxLevel; + ctx.hideRoofIds = hideRoofIds; + if (scene.getWorldViewId() == WorldView.TOPLEVEL) { this.cameraYaw = client.getCameraYaw(); @@ -825,9 +813,8 @@ public void preSceneDraw(Scene scene, } else { - Scene toplevel = client.getScene(); - vaoO.addRange(null, toplevel); - vaoPO.addRange(null, toplevel); + System.arraycopy(((FloatProjection) entityProjection).getProjection(), 0, ctx.projection, 0, 16); + glUniformMatrix4fv(uniEntityProj, false, ctx.projection); glUniform4i(uniEntityTint, scene.getOverrideHue(), scene.getOverrideSaturation(), scene.getOverrideLuminance(), scene.getOverrideAmount()); } } @@ -896,12 +883,6 @@ private void preSceneDrawToplevel(Scene scene, glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fboScene); } - // Clear scene - int sky = client.getSkyboxColor(); - glClearColor((sky >> 16 & 0xFF) / 255f, (sky >> 8 & 0xFF) / 255f, (sky & 0xFF) / 255f, 1f); - glClearDepth(0d); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - // Setup anisotropic filtering final int anisotropicFilteringLevel = config.anisotropicFilteringLevel(); @@ -944,6 +925,7 @@ private void preSceneDrawToplevel(Scene scene, // Setup uniforms final int drawDistance = getDrawDistance(); final int fogDepth = config.fogDepth(); + final int sky = client.getSkyboxColor(); glUniform1i(uniUseFog, fogDepth > 0 ? 1 : 0); glUniform4f(uniFogColor, (sky >> 16 & 0xFF) / 255f, (sky >> 8 & 0xFF) / 255f, (sky & 0xFF) / 255f, 1f); glUniform1i(uniFogDepth, fogDepth); @@ -970,8 +952,7 @@ private void preSceneDrawToplevel(Scene scene, Mat4.mul(projectionMatrix, Mat4.translate(-cameraX, -cameraY, -cameraZ)); glUniformMatrix4fv(uniWorldProj, false, projectionMatrix); - projectionMatrix = Mat4.identity(); - glUniformMatrix4fv(uniEntityProj, false, projectionMatrix); + glUniformMatrix4fv(uniEntityProj, false, IDENTITY); glUniform4i(uniEntityTint, 0, 0, 0, 0); @@ -990,9 +971,38 @@ private void preSceneDrawToplevel(Scene scene, glDepthFunc(GL_GREATER); glEnable(GL_DEPTH_TEST); + drawSkybox(scene, sky, cameraX, cameraY, cameraZ); + checkGLErrors(); } + private void drawSkybox(Scene scene, int sky, float cameraX, float cameraY, float cameraZ) + { + Model skybox = scene.getSkybox(); + if (skybox == null) + { + glClearColor((sky >> 16 & 0xFF) / 255f, (sky >> 8 & 0xFF) / 255f, (sky & 0xFF) / 255f, 1f); + glClearDepth(0d); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + return; + } + + glClearColor(0f, 0f, 0f, 1f); + glClearDepth(0d); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + int size = skybox.getFaceCount() * 3 * VAO.VERT_SIZE; + VAO o = vaoO.get(size); + clientUploader.uploadTempModel(skybox, 0, 0, 0, 0, o.vbo.vb); + + float[] skyboxProjection = Mat4.translate(cameraX, cameraY, cameraZ); + o.addRange(skyboxProjection, scene, Renderable.RENDERMODE_UNSORTED_NO_DEPTH); + + vaoO.draw(); + + glUniformMatrix4fv(uniEntityProj, false, IDENTITY); + } + @Override public void postSceneDraw(Scene scene) { @@ -1003,6 +1013,7 @@ public void postSceneDraw(Scene scene) else { glUniform4i(uniEntityTint, 0, 0, 0, 0); + glUniformMatrix4fv(uniEntityProj, false, IDENTITY); } } @@ -1042,8 +1053,6 @@ private void blitSceneFbo() @Override public void drawZoneOpaque(Projection entityProjection, Scene scene, int zx, int zz) { - updateEntityProjection(entityProjection); - SceneContext ctx = context(scene); if (ctx == null) { @@ -1082,9 +1091,6 @@ public void drawZoneAlpha(Projection entityProjection, Scene scene, int level, i return; } - updateEntityProjection(entityProjection); - glUniform4i(uniEntityTint, scene.getOverrideHue(), scene.getOverrideSaturation(), scene.getOverrideLuminance(), scene.getOverrideAmount()); - int offset = scene.getWorldViewId() == WorldView.TOPLEVEL ? (SCENE_OFFSET >> 3) : 0; int dx = ctx.cameraX - ((zx - offset) << 10); int dz = ctx.cameraZ - ((zz - offset) << 10); @@ -1110,45 +1116,15 @@ public void drawPass(Projection projection, Scene scene, int pass) return; } - updateEntityProjection(projection); - if (pass == DrawCallbacks.PASS_OPAQUE) { - vaoO.addRange(projection, scene); - vaoPO.addRange(projection, scene); - if (scene.getWorldViewId() == WorldView.TOPLEVEL) { - glUniform3i(uniBase, 0, 0, 0); - - int sz = vaoO.unmap(); - for (int i = 0; i < sz; ++i) - { - VAO vao = vaoO.vaos.get(i); - vao.draw(); - vao.reset(); - } - - sz = vaoPO.unmap(); - if (sz > 0) - { - glDepthMask(false); - for (int i = 0; i < sz; ++i) - { - VAO vao = vaoPO.vaos.get(i); - vao.draw(); - } - glDepthMask(true); - - glColorMask(false, false, false, false); - for (int i = 0; i < sz; ++i) - { - VAO vao = vaoPO.vaos.get(i); - vao.draw(); - vao.reset(); - } - glColorMask(true, true, true, true); - } + vaoO.draw(); + } + else + { + glUniformMatrix4fv(uniEntityProj, false, IDENTITY); } } else if (pass == DrawCallbacks.PASS_ALPHA) @@ -1162,6 +1138,11 @@ else if (pass == DrawCallbacks.PASS_ALPHA) } } } + else if (pass == DrawCallbacks.PRE_PASS_ALPHA) + { + glUniformMatrix4fv(uniEntityProj, false, ctx.projection); + glUniform4i(uniEntityTint, scene.getOverrideHue(), scene.getOverrideSaturation(), scene.getOverrideLuminance(), scene.getOverrideAmount()); + } checkGLErrors(); } @@ -1185,6 +1166,7 @@ public void drawDynamic(Projection worldProjection, Scene scene, TileObject tile { VAO o = vaoO.get(size); clientUploader.uploadTempModel(m, orient, x, y, z, o.vbo.vb); + o.addRange(ctx.projection, scene, 0); } else { @@ -1201,6 +1183,8 @@ public void drawDynamic(Projection worldProjection, Scene scene, TileObject tile } int end = a.vbo.vb.position(); + o.addRange(ctx.projection, scene, 0); + if (end > start) { int offset = scene.getWorldViewId() == WorldView.TOPLEVEL ? SCENE_OFFSET : 0; @@ -1236,10 +1220,7 @@ public void drawTemp(Projection worldProjection, Scene scene, GameObject gameObj int renderMode = renderable.getRenderMode(); if (renderMode == Renderable.RENDERMODE_SORTED_NO_DEPTH || m.getFaceTransparencies() != null) { - // opaque player faces have their own vao and are drawn in a separate pass from normal opaque faces - // because they are not depth tested. transparent player faces don't need their own vao because normal - // transparent faces are already not depth tested - VAO o = renderMode == Renderable.RENDERMODE_SORTED_NO_DEPTH ? vaoPO.get(size) : vaoO.get(size); + VAO o = vaoO.get(size); VAO a = vaoA.get(size); int start = a.vbo.vb.position(); @@ -1254,6 +1235,8 @@ public void drawTemp(Projection worldProjection, Scene scene, GameObject gameObj } int end = a.vbo.vb.position(); + o.addRange(ctx.projection, scene, renderMode == Renderable.RENDERMODE_SORTED_NO_DEPTH ? renderMode : 0); + if (end > start) { int offset = scene.getWorldViewId() == WorldView.TOPLEVEL ? (SCENE_OFFSET >> 3) : 0; @@ -1268,6 +1251,7 @@ public void drawTemp(Projection worldProjection, Scene scene, GameObject gameObj { VAO o = vaoO.get(size); clientUploader.uploadTempModel(m, orient, x, y, z, o.vbo.vb); + o.addRange(ctx.projection, scene, 0); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/VAO.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/VAO.java index a8ae02af5b1..e7b6c498e5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/VAO.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/VAO.java @@ -28,10 +28,11 @@ import java.util.Arrays; import java.util.List; import lombok.extern.slf4j.Slf4j; -import net.runelite.api.Projection; +import net.runelite.api.Renderable; import net.runelite.api.Scene; +import static net.runelite.client.plugins.gpu.GpuPlugin.uniBase; +import static net.runelite.client.plugins.gpu.GpuPlugin.uniEntityProj; import static net.runelite.client.plugins.gpu.GpuPlugin.uniEntityTint; -import static net.runelite.client.plugins.gpu.GpuPlugin.updateEntityProjection; import static org.lwjgl.opengl.GL33C.*; class VAO @@ -78,51 +79,104 @@ void destroy() vao = 0; } - int[] lengths = new int[4]; - Projection[] projs = new Projection[4]; - Scene[] scenes = new Scene[4]; - int off = 0; + static class Range + { + int endpos; + float[] projection; + byte h, s, l, a; + byte renderMethod; + } + + Range[] ranges = new Range[4]; + int off; + + { + for (int i = 0; i < ranges.length; ++i) + { + ranges[i] = new Range(); + } + } - void addRange(Projection projection, Scene scene) + void addRange(float[] projection, Scene scene, int renderMode) { assert vbo.mapped; - if (off > 0 && lengths[off - 1] == vbo.vb.position()) + if (off > 0) { - return; + Range r = ranges[off - 1]; + int pos = vbo.vb.position(); + if (r.endpos == pos) + { + return; + } + + if (projection == r.projection && renderMode == r.renderMethod) + { + assert pos > r.endpos; + r.endpos = pos; + return; + } } - if (lengths.length == off) + if (ranges.length == off) { - int l = lengths.length << 1; - lengths = Arrays.copyOf(lengths, l); - projs = Arrays.copyOf(projs, l); - scenes = Arrays.copyOf(scenes, l); + int l = ranges.length << 1; + ranges = Arrays.copyOf(ranges, l); + for (int i = ranges.length >> 1; i < ranges.length; ++i) + { + ranges[i] = new Range(); + } } - lengths[off] = vbo.vb.position(); - projs[off] = projection; - scenes[off] = scene; - off++; + Range r = ranges[off++]; + r.endpos = vbo.vb.position(); + r.projection = projection; + r.h = scene.getOverrideHue(); + r.s = scene.getOverrideSaturation(); + r.l = scene.getOverrideLuminance(); + r.a = scene.getOverrideAmount(); + r.renderMethod = (byte) renderMode; } void draw() { assert !vbo.mapped; + glUniform3i(uniBase, 0, 0, 0); + int start = 0; for (int i = 0; i < off; ++i) { - int end = lengths[i]; - Projection p = projs[i]; - Scene scene = scenes[i]; + Range range = ranges[i]; + int end = range.endpos; int count = end - start; - updateEntityProjection(p); - glUniform4i(uniEntityTint, scene.getOverrideHue(), scene.getOverrideSaturation(), scene.getOverrideLuminance(), scene.getOverrideAmount()); + glUniformMatrix4fv(uniEntityProj, false, range.projection); + glUniform4i(uniEntityTint, range.h, range.s, range.l, range.a); + glBindVertexArray(vao); - glDrawArrays(GL_TRIANGLES, start / (VERT_SIZE / 4), count / (VAO.VERT_SIZE / 4)); + + if (range.renderMethod == Renderable.RENDERMODE_SORTED_NO_DEPTH) + { + glDepthMask(false); + glDrawArrays(GL_TRIANGLES, start / (VERT_SIZE / 4), count / (VERT_SIZE / 4)); + glDepthMask(true); + + glColorMask(false, false, false, false); + glDrawArrays(GL_TRIANGLES, start / (VERT_SIZE / 4), count / (VERT_SIZE / 4)); + glColorMask(true, true, true, true); + } + else if (range.renderMethod == Renderable.RENDERMODE_UNSORTED_NO_DEPTH) + { + glDepthMask(false); + glDrawArrays(GL_TRIANGLES, start / (VERT_SIZE / 4), count / (VERT_SIZE / 4)); + glDepthMask(true); + } + else + { + glDrawArrays(GL_TRIANGLES, start / (VERT_SIZE / 4), count / (VERT_SIZE / 4)); + } start = end; } @@ -130,8 +184,10 @@ void draw() void reset() { - Arrays.fill(projs, 0, off, null); - Arrays.fill(scenes, 0, off, null); + for (int i = 0; i < off; ++i) + { + ranges[i].projection = null; + } off = 0; } } @@ -200,15 +256,14 @@ void free() curIdx = 0; } - void addRange(Projection projection, Scene scene) + void draw() { - for (int i = 0; i <= curIdx && i < vaos.size(); ++i) + int sz = unmap(); + for (int i = 0; i < sz; ++i) { VAO vao = vaos.get(i); - if (vao.vbo.mapped) - { - vao.addRange(projection, scene); - } + vao.draw(); + vao.reset(); } } @@ -218,12 +273,10 @@ void debug() for (VAO vao : vaos) { log.debug("vao {} mapped: {} num ranges: {} length: {}", vao, vao.vbo.mapped, vao.off, vao.vbo.mapped ? vao.vbo.vb.position() : -1); - if (vao.off > 1) + for (int i = 0; i < vao.off; ++i) { - for (int i = 0; i < vao.off; ++i) - { - log.debug(" {} {} {}", vao.lengths[i], vao.projs[i], vao.scenes[i]); - } + VAO.Range r = vao.ranges[i]; + log.debug(" endpos: {} proj: {} hsl: {},{},{},{} renderMethod: {}", r.endpos, r.projection, r.h, r.s, r.l, r.a, r.renderMethod); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/RegionFilterMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/RegionFilterMode.java index 033b5a329fc..d0011405be5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/RegionFilterMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/RegionFilterMode.java @@ -50,6 +50,9 @@ public String toString() } }, BRAZIL(WorldRegion.BRAZIL), + JAPAN(WorldRegion.JAPAN), + SINGAPORE(WorldRegion.SINGAPORE), + SOUTH_AFRICA(WorldRegion.SOUTH_AFRICA), ; @Getter @@ -57,20 +60,13 @@ public String toString() static RegionFilterMode of(WorldRegion region) { - switch (region) + for (var rfm : values()) { - case UNITED_STATES_OF_AMERICA: - return UNITED_STATES; - case UNITED_KINGDOM: - return UNITED_KINGDOM; - case AUSTRALIA: - return AUSTRALIA; - case GERMANY: - return GERMANY; - case BRAZIL: - return BRAZIL; - default: - throw new IllegalStateException(); + if (rfm.region == region) + { + return rfm; + } } + throw new IllegalArgumentException(); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index f8ed5447c7a..56f61ec7ea0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -597,7 +597,7 @@ private void hop(boolean previous) world = worlds.get(worldIdx); // Check world region if filter is enabled - if (!regionFilter.isEmpty() && !regionFilter.contains(RegionFilterMode.of(world.getRegion()))) + if (!regionFilter.isEmpty() && world.getRegion() != null && !regionFilter.contains(RegionFilterMode.of(world.getRegion()))) { continue; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java index 62d83543016..db64ab0bd2d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java @@ -271,7 +271,7 @@ void populate(List worlds, @Nullable EnumComposition worldLocations) break; } - if (!regionFilterMode.isEmpty() && !regionFilterMode.contains(RegionFilterMode.of(world.getRegion()))) + if (!regionFilterMode.isEmpty() && world.getRegion() != null && !regionFilterMode.contains(RegionFilterMode.of(world.getRegion()))) { continue; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java index be2c6f99304..1e2890c19a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java @@ -56,6 +56,9 @@ class WorldTableRow extends JPanel private static final ImageIcon FLAG_US_WEST; private static final ImageIcon FLAG_GER; private static final ImageIcon FLAG_BR; + private static final ImageIcon FLAG_JP; + private static final ImageIcon FLAG_SG; + private static final ImageIcon FLAG_ZA; private static final int WORLD_COLUMN_WIDTH = 60; private static final int PLAYERS_COLUMN_WIDTH = 40; @@ -80,6 +83,9 @@ class WorldTableRow extends JPanel FLAG_US_WEST = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_us_west.png")); FLAG_GER = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_ger.png")); FLAG_BR = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_br.png")); + FLAG_JP = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_jp.png")); + FLAG_SG = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_sg.png")); + FLAG_ZA = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_za.png")); } private static final int LOCATION_US_WEST = -73; @@ -432,6 +438,12 @@ private static ImageIcon getFlag(WorldRegion region, int worldLocation) return FLAG_GER; case BRAZIL: return FLAG_BR; + case JAPAN: + return FLAG_JP; + case SINGAPORE: + return FLAG_SG; + case SOUTH_AFRICA: + return FLAG_ZA; default: return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java index b5c13f5c03f..95c9c2e3878 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java @@ -126,8 +126,8 @@ public void onGameTick(GameTick gameTick) if (local != null) { lastDisplayName = local.getName(); + fetchXp = false; } - fetchXp = false; } } diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index b0fae409853..3a124740b47 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -7999,7 +7999,13 @@ 33070, 33072, 33338, - 33340 + 33340, + 33439, + 33441, + 33443, + 33445, + 33447, + 33449 ], "slayer ring": [ 11866, @@ -8021,7 +8027,8 @@ 33322, 33323, 33326, - 33328 + 33328, + 33434 ], "box of chocolate strawberries": [ 11912, @@ -8874,7 +8881,8 @@ ], "sulphurous fertiliser": [ 13419, - 18467 + 18467, + 33437 ], "ensouled goblin head": [ 13447, @@ -13900,5 +13908,10 @@ "gem sack": [ 33393, 33395 + ], + "demonic pacts relic hunter armour set": [ + 33451, + 33454, + 33457 ] } \ No newline at end of file diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_jp.png b/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_jp.png new file mode 100644 index 00000000000..a8f83b3adf4 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_jp.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_sg.png b/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_sg.png new file mode 100644 index 00000000000..15f96ac1129 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_sg.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_za.png b/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_za.png new file mode 100644 index 00000000000..ea338388e52 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/worldhopper/flag_za.png differ