diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 2af65a27e7..cc6fc35fc8 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -25,9 +25,9 @@ object ProjectVersions { const val launcherVersion = "2.2.0" - const val rlVersion = "1.6.22" + const val rlVersion = "1.6.23" - const val openosrsVersion = "3.4.0" + const val openosrsVersion = "3.4.1" const val rsversion = 190 const val cacheversion = 165 diff --git a/http-api/src/main/java/net/runelite/http/api/item/ItemEquipmentStats.java b/http-api/src/main/java/net/runelite/http/api/item/ItemEquipmentStats.java index d0815ea90d..0afdce988e 100644 --- a/http-api/src/main/java/net/runelite/http/api/item/ItemEquipmentStats.java +++ b/http-api/src/main/java/net/runelite/http/api/item/ItemEquipmentStats.java @@ -24,6 +24,7 @@ */ package net.runelite.http.api.item; +import com.google.gson.annotations.SerializedName; import lombok.Builder; import lombok.Value; @@ -33,6 +34,9 @@ public class ItemEquipmentStats { private int slot; + @SerializedName("is2h") + private boolean isTwoHanded; + private int astab; private int aslash; private int acrush; @@ -51,4 +55,3 @@ public class ItemEquipmentStats private int prayer; private int aspeed; } - diff --git a/runelite-api/src/main/java/net/runelite/api/ItemContainer.java b/runelite-api/src/main/java/net/runelite/api/ItemContainer.java index 81e2074106..9bd2332e86 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemContainer.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemContainer.java @@ -67,4 +67,10 @@ public interface ItemContainer extends Node * @see ItemID */ int count(int itemId); + + /** + * Get the number of items in this item container. May include empty slots. + * @return + */ + int size(); } 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 ba23e01326..70ad10dbeb 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11583,5 +11583,11 @@ public final class ItemID public static final int WARRIOR_PATH_STARTER_KIT = 24859; public static final int WIZARD_PATH_STARTER_KIT = 24860; public static final int RANGER_PATH_STARTER_KIT = 24861; + public static final int KARAMJAN_MONKEY = 24862; + public static final int ZOMBIE_MONKEY = 24863; + public static final int MANIACAL_MONKEY = 24864; + public static final int SKELETON_MONKEY = 24865; + public static final int KRUK_JR = 24866; + public static final int PRINCELY_MONKEY = 24867; /* This file is automatically generated. Do not edit. */ } 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 642de57dfb..a309a15622 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -8758,5 +8758,38 @@ public final class NpcID public static final int GRAVE = 9856; public static final int GRAVE_9857 = 9857; public static final int SQUIRE_10368 = 10368; + public static final int BOBAWU = 10369; + public static final int MARTEN = 10370; + public static final int WIZARD_10371 = 10371; + public static final int WIZARD_10372 = 10372; + public static final int WIZARD_10373 = 10373; + public static final int HILL_GIANT_10374 = 10374; + public static final int HILL_GIANT_10375 = 10375; + public static final int HILL_GIANT_10376 = 10376; + public static final int FEROX = 10377; + public static final int SIGISMUND = 10378; + public static final int ZAMORAKIAN_ACOLYTE = 10379; + public static final int ZAMORAKIAN_ACOLYTE_10380 = 10380; + public static final int ZAMORAKIAN_ACOLYTE_10381 = 10381; + public static final int REFUGEE = 10382; + public static final int REFUGEE_10383 = 10383; + public static final int REFUGEE_10384 = 10384; + public static final int REFUGEE_10385 = 10385; + public static final int PHABELLE_BILE = 10386; + public static final int DERSE_VENATOR = 10387; + public static final int ANDROS_MAI = 10388; + public static final int BANKER_10389 = 10389; + public static final int MERCENARY_10390 = 10390; + public static final int FINANCIAL_WIZARD_10391 = 10391; + public static final int CAMARST = 10392; + public static final int WARRIOR_OF_MURAHS = 10393; + public static final int WARRIOR_OF_MURAHS_10394 = 10394; + public static final int WARRIOR_OF_MURAHS_10395 = 10395; + public static final int SPIKED_TUROTH = 10397; + public static final int SHADOW_WYRM = 10398; + public static final int SHADOW_WYRM_10399 = 10399; + public static final int GUARDIAN_DRAKE = 10400; + public static final int GUARDIAN_DRAKE_10401 = 10401; + public static final int COLOSSAL_HYDRA = 10402; /* This file is automatically generated. Do not edit. */ } 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 99e56e7411..cc1cb6dd36 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -1592,5 +1592,6 @@ public final class NullNpcID public static final int NULL_10365 = 10365; public static final int NULL_10366 = 10366; public static final int NULL_10367 = 10367; + public static final int NULL_10396 = 10396; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 071ab447bf..62d5fa9147 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -19517,5 +19517,81 @@ public final class NullObjectID public static final int NULL_39616 = 39616; public static final int NULL_39618 = 39618; public static final int NULL_39619 = 39619; + public static final int NULL_39622 = 39622; + public static final int NULL_39623 = 39623; + public static final int NULL_39624 = 39624; + public static final int NULL_39625 = 39625; + public static final int NULL_39626 = 39626; + public static final int NULL_39627 = 39627; + public static final int NULL_39628 = 39628; + public static final int NULL_39629 = 39629; + public static final int NULL_39630 = 39630; + public static final int NULL_39631 = 39631; + public static final int NULL_39632 = 39632; + public static final int NULL_39633 = 39633; + public static final int NULL_39634 = 39634; + public static final int NULL_39635 = 39635; + public static final int NULL_39636 = 39636; + public static final int NULL_39638 = 39638; + public static final int NULL_39649 = 39649; + public static final int NULL_39654 = 39654; + public static final int NULL_39655 = 39655; + public static final int NULL_39656 = 39656; + public static final int NULL_39661 = 39661; + public static final int NULL_39662 = 39662; + public static final int NULL_39663 = 39663; + public static final int NULL_39664 = 39664; + public static final int NULL_39665 = 39665; + public static final int NULL_39666 = 39666; + public static final int NULL_39667 = 39667; + public static final int NULL_39668 = 39668; + public static final int NULL_39669 = 39669; + public static final int NULL_39670 = 39670; + public static final int NULL_39671 = 39671; + public static final int NULL_39672 = 39672; + public static final int NULL_39673 = 39673; + public static final int NULL_39683 = 39683; + public static final int NULL_39684 = 39684; + public static final int NULL_39685 = 39685; + public static final int NULL_39686 = 39686; + public static final int NULL_39694 = 39694; + public static final int NULL_39701 = 39701; + public static final int NULL_39702 = 39702; + public static final int NULL_39703 = 39703; + public static final int NULL_39704 = 39704; + public static final int NULL_39705 = 39705; + public static final int NULL_39706 = 39706; + public static final int NULL_39707 = 39707; + public static final int NULL_39708 = 39708; + public static final int NULL_39709 = 39709; + public static final int NULL_39710 = 39710; + public static final int NULL_39711 = 39711; + public static final int NULL_39712 = 39712; + public static final int NULL_39713 = 39713; + public static final int NULL_39714 = 39714; + public static final int NULL_39715 = 39715; + public static final int NULL_39717 = 39717; + public static final int NULL_39722 = 39722; + public static final int NULL_39725 = 39725; + public static final int NULL_39726 = 39726; + public static final int NULL_39727 = 39727; + public static final int NULL_39728 = 39728; + public static final int NULL_39729 = 39729; + public static final int NULL_39730 = 39730; + public static final int NULL_39731 = 39731; + public static final int NULL_39732 = 39732; + public static final int NULL_39733 = 39733; + public static final int NULL_39734 = 39734; + public static final int NULL_39735 = 39735; + public static final int NULL_39736 = 39736; + public static final int NULL_39737 = 39737; + public static final int NULL_39738 = 39738; + public static final int NULL_39739 = 39739; + public static final int NULL_39742 = 39742; + public static final int NULL_39743 = 39743; + public static final int NULL_39744 = 39744; + public static final int NULL_39745 = 39745; + public static final int NULL_39746 = 39746; + public static final int NULL_39747 = 39747; /* 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 6200b65794..8900b0cc44 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -8061,7 +8061,7 @@ public final class ObjectID public static final int STONE_BLOCK_14203 = 14203; public static final int STONE_BLOCK_14204 = 14204; public static final int STONE_BLOCK_14205 = 14205; - public static final int FINAL_OWNAGE_ELITE_STATUE = 14209; + public static final int HERBS_14209 = 14209; public static final int WALL_14212 = 14212; public static final int WALL_14213 = 14213; public static final int WALL_14216 = 14216; @@ -14137,11 +14137,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 ANCIENT_FURY_STATUE = 26825; - public static final int FATALITY_STATUE = 26826; - public static final int HEXIS_STATUE = 26827; - public static final int REIGN_OF_TERROR_STATUE = 26828; - public static final int STUD_UNIT_STATUE = 26829; + 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 CONSECRATED_HOUSE = 26830; public static final int DESECRATED_HOUSE = 26831; public static final int NATURE_HOUSE = 26832; @@ -20089,7 +20089,191 @@ public final class ObjectID public static final int COFFIN_39608 = 39608; public static final int STAIRS_39609 = 39609; public static final int CRYPT = 39617; - public static final int COFFIN_39620 = 39620; + public static final int RUSTED_ANVIL = 39620; public static final int MOUNTED_MAX_CAPE_39621 = 39621; + public static final int DEATHS_DOMAIN_39637 = 39637; + public static final int CASUAL = 39639; + public static final int COMPETITIVE = 39640; + public static final int HIGH_STAKES = 39641; + public static final int ALTAR_39642 = 39642; + public static final int STAIRS_39643 = 39643; + public static final int LADDER_39644 = 39644; + public static final int LADDER_39645 = 39645; + public static final int LIFT_PLATFORM_39646 = 39646; + public static final int STAIRS_39647 = 39647; + public static final int OPENING_39648 = 39648; + public static final int STAIRS_39650 = 39650; + public static final int POOL_OF_REFRESHMENT = 39651; + public static final int BARRIER_39652 = 39652; + public static final int BARRIER_39653 = 39653; + public static final int GATE_39657 = 39657; + public static final int GATE_39658 = 39658; + public static final int GATE_39659 = 39659; + public static final int GATE_39660 = 39660; + public static final int STATUE_39674 = 39674; + public static final int CORPSE_39675 = 39675; + public static final int TREE_39676 = 39676; + public static final int TREE_39677 = 39677; + public static final int TREE_39678 = 39678; + public static final int TREE_39679 = 39679; + public static final int BUSH_39680 = 39680; + public static final int BUSH_39681 = 39681; + public static final int BUSH_39682 = 39682; + public static final int BENCH_39687 = 39687; + public static final int CAMPING_EQUIPMENT_39688 = 39688; + public static final int TWISTED_CRATE = 39689; + public static final int BARREL_39690 = 39690; + public static final int STONE_PILE_39691 = 39691; + public static final int STONE_PILE_39692 = 39692; + public static final int WOOD_39693 = 39693; + public static final int SACKS_39695 = 39695; + public static final int SACKS_39696 = 39696; + public static final int FLOWERS_39697 = 39697; + public static final int FLOWERS_39698 = 39698; + public static final int FLOWERS_39699 = 39699; + public static final int FLOWERS_39700 = 39700; + public static final int TABLE_39716 = 39716; + public static final int STOOL_39718 = 39718; + public static final int HOLE_39719 = 39719; + public static final int WELL_39720 = 39720; + public static final int CAVE_39721 = 39721; + public static final int ALTAR_39723 = 39723; + 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 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; /* This file is automatically generated. Do not edit. */ } 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 2af9215c65..882b52b084 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -332,4 +332,13 @@ public final class ScriptID */ @ScriptArguments(integer = 4, string = 1) public static final int XPDROPS_SETDROPSIZE = 996; + + /** + * Main layout script for the bank + *