diff --git a/http-api/src/main/java/net/runelite/http/api/npc/NpcInfo.java b/http-api/src/main/java/net/runelite/http/api/npc/NpcInfo.java index 285169a32d..091f36e471 100644 --- a/http-api/src/main/java/net/runelite/http/api/npc/NpcInfo.java +++ b/http-api/src/main/java/net/runelite/http/api/npc/NpcInfo.java @@ -29,7 +29,5 @@ import lombok.Data; @Data public class NpcInfo { - private String name; - private int combat; private int hitpoints; } diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 75ace64160..be55931afc 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -1238,6 +1238,16 @@ public interface Client extends GameShell */ void setCameraPitchRelaxerEnabled(boolean enabled); + /** + * Sets if the moving the camera horizontally should be backwards + */ + void setInvertYaw(boolean invertYaw); + + /** + * Sets if the moving the camera vertically should be backwards + */ + void setInvertPitch(boolean invertPitch); + /** * Gets the world map overview. * 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 509a547fc9..b467f8f689 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -676,7 +676,7 @@ public final class ItemID public static final int LEATHER_GLOVES = 1059; public static final int LEATHER_BOOTS = 1061; public static final int LEATHER_VAMBRACES = 1063; - public static final int GREEN_DHIDE_VAMB = 1065; + public static final int GREEN_DHIDE_VAMBRACES = 1065; public static final int IRON_PLATELEGS = 1067; public static final int STEEL_PLATELEGS = 1069; public static final int MITHRIL_PLATELEGS = 1071; @@ -1483,9 +1483,9 @@ public final class ItemID public static final int LANTADYME = 2481; public static final int LANTADYME_POTION_UNF = 2483; public static final int GRIMY_LANTADYME = 2485; - public static final int BLUE_DHIDE_VAMB = 2487; - public static final int RED_DHIDE_VAMB = 2489; - public static final int BLACK_DHIDE_VAMB = 2491; + public static final int BLUE_DHIDE_VAMBRACES = 2487; + public static final int RED_DHIDE_VAMBRACES = 2489; + public static final int BLACK_DHIDE_VAMBRACES = 2491; public static final int BLUE_DHIDE_CHAPS = 2493; public static final int RED_DHIDE_CHAPS = 2495; public static final int BLACK_DHIDE_CHAPS = 2497; @@ -6287,10 +6287,10 @@ public final class ItemID public static final int SPOTTIER_CAPE_10074 = 10074; public static final int GLOVES_OF_SILENCE = 10075; public static final int SPIKY_VAMBRACES = 10077; - public static final int GREEN_SPIKY_VAMBS = 10079; - public static final int BLUE_SPIKY_VAMBS = 10081; - public static final int RED_SPIKY_VAMBS = 10083; - public static final int BLACK_SPIKY_VAMBS = 10085; + public static final int GREEN_SPIKY_VAMBRACES = 10079; + public static final int BLUE_SPIKY_VAMBRACES = 10081; + public static final int RED_SPIKY_VAMBRACES = 10083; + public static final int BLACK_SPIKY_VAMBRACES = 10085; public static final int STRIPY_FEATHER = 10087; public static final int RED_FEATHER = 10088; public static final int BLUE_FEATHER = 10089; @@ -6492,15 +6492,15 @@ public final class ItemID public static final int STRENGTH_AMULET_T = 10364; public static final int AMULET_OF_MAGIC_T = 10366; public static final int ZAMORAK_BRACERS = 10368; - public static final int ZAMORAK_DHIDE = 10370; + public static final int ZAMORAK_DHIDE_BODY = 10370; public static final int ZAMORAK_CHAPS = 10372; public static final int ZAMORAK_COIF = 10374; public static final int GUTHIX_BRACERS = 10376; - public static final int GUTHIX_DHIDE = 10378; + public static final int GUTHIX_DHIDE_BODY = 10378; public static final int GUTHIX_CHAPS = 10380; public static final int GUTHIX_COIF = 10382; public static final int SARADOMIN_BRACERS = 10384; - public static final int SARADOMIN_DHIDE = 10386; + public static final int SARADOMIN_DHIDE_BODY = 10386; public static final int SARADOMIN_CHAPS = 10388; public static final int SARADOMIN_COIF = 10390; public static final int A_POWDERED_WIG = 10392; @@ -6802,8 +6802,8 @@ public final class ItemID public static final int SARADOMIN_ROBE_TOP_10784 = 10784; public static final int ZAMORAK_ROBE_TOP_10786 = 10786; public static final int GUTHIX_ROBE_TOP_10788 = 10788; - public static final int ZAMORAK_DHIDE_10790 = 10790; - public static final int SARADOMIN_DHIDE_10792 = 10792; + public static final int ZAMORAK_DHIDE_BODY_10790 = 10790; + public static final int SARADOMIN_DHIDE_BODY_10792 = 10792; public static final int GUTHIX_DRAGONHIDE = 10794; public static final int ROBIN_HOOD_HAT_10796 = 10796; public static final int RUNE_PLATEBODY_G_10798 = 10798; @@ -7878,15 +7878,15 @@ public final class ItemID public static final int BANDOS_FULL_HELM = 12486; public static final int BANDOS_KITESHIELD = 12488; public static final int ANCIENT_BRACERS = 12490; - public static final int ANCIENT_DHIDE = 12492; + public static final int ANCIENT_DHIDE_BODY = 12492; public static final int ANCIENT_CHAPS = 12494; public static final int ANCIENT_COIF = 12496; public static final int BANDOS_BRACERS = 12498; - public static final int BANDOS_DHIDE = 12500; + public static final int BANDOS_DHIDE_BODY = 12500; public static final int BANDOS_CHAPS = 12502; public static final int BANDOS_COIF = 12504; public static final int ARMADYL_BRACERS = 12506; - public static final int ARMADYL_DHIDE = 12508; + public static final int ARMADYL_DHIDE_BODY = 12508; public static final int ARMADYL_CHAPS = 12510; public static final int ARMADYL_COIF = 12512; public static final int EXPLORER_BACKPACK = 12514; @@ -10775,7 +10775,7 @@ public final class ItemID public static final int GIANT_BOOT = 23252; public static final int URIS_HAT = 23255; public static final int GILDED_COIF = 23258; - public static final int GILDED_DHIDE_VAMBS = 23261; + public static final int GILDED_DHIDE_VAMBRACES = 23261; public static final int GILDED_DHIDE_BODY = 23264; public static final int GILDED_DHIDE_CHAPS = 23267; public static final int ADAMANT_DRAGON_MASK = 23270; @@ -11415,5 +11415,19 @@ public final class ItemID public static final int RUNNER_HAT_BROKEN = 24531; public static final int RUNNER_HAT_L = 24533; public static final int MITHRIL_SEEDS_24534 = 24534; + public static final int MAGIC_EGG_BALL = 24535; + public static final int CARROT_SWORD = 24537; + public static final int _24CARAT_SWORD = 24539; + public static final int PAINTED_FAKE_MAGIC_EGG = 24541; + public static final int UNPAINTED_FAKE_MAGIC_EGG = 24542; + public static final int CONCH_SHELL = 24543; + public static final int BROKEN_EGG = 24544; + public static final int DUMMY_PORTAL = 24545; + public static final int CARROT = 24546; + public static final int BROKEN_GOAT_HORN = 24547; + public static final int CAKE_24549 = 24549; + public static final int BLADE_OF_SAELDOR_I = 24551; + public static final int BLADE_OF_SAELDOR_I_24553 = 24553; + public static final int PYROMANCER_SET = 24554; /* 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 1520245928..fc3dfa8882 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -5993,6 +5993,7 @@ public final class NpcID public static final int SISTER_SCAROPHIA = 6590; public static final int LAVA_DRAGON = 6593; public static final int ENT = 6594; + public static final int THE_DISAPPOINTING_GELT = 6595; public static final int ZOMBIE_6596 = 6596; public static final int ZOMBIE_6597 = 6597; public static final int ZOMBIE_6598 = 6598; @@ -8482,5 +8483,21 @@ public final class NpcID public static final int SISTER_SENGA = 9471; public static final int SISTER_SENGA_9472 = 9472; public static final int ENT_TRUNK = 9474; + public static final int DUKE_RABBACIO = 9475; + public static final int PAWS = 9476; + public static final int RABBIT_CHEF = 9477; + public static final int GUARD_9478 = 9478; + public static final int MAGIC_EGG = 9479; + public static final int RABBIT_9480 = 9480; + public static final int RABBIT_9481 = 9481; + public static final int RABBIT_9482 = 9482; + public static final int RID = 9483; + public static final int FARMER_MAGGOT = 9484; + public static final int FATHER_BUCKEREK = 9485; + public static final int RESTLESS_GOAT = 9486; + public static final int SHOP_KEEPER_9487 = 9487; + public static final int BARTENDER_9488 = 9488; + public static final int COW_CALF_9489 = 9489; + public static final int CHICKEN_9490 = 9490; /* 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 ca9521d21a..d766b2c53e 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12911,5 +12911,11 @@ public final class NullItemID public static final int NULL_24526 = 24526; public static final int NULL_24530 = 24530; public static final int NULL_24532 = 24532; + public static final int NULL_24536 = 24536; + public static final int NULL_24538 = 24538; + public static final int NULL_24540 = 24540; + public static final int NULL_24548 = 24548; + public static final int NULL_24550 = 24550; + public static final int NULL_24552 = 24552; /* 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 a8e0db8e3a..1eaf83e2d5 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -14123,6 +14123,10 @@ public final class NullObjectID public static final int NULL_30144 = 30144; public static final int NULL_30156 = 30156; public static final int NULL_30159 = 30159; + public static final int NULL_30165 = 30165; + public static final int NULL_30166 = 30166; + public static final int NULL_30167 = 30167; + public static final int NULL_30168 = 30168; public static final int NULL_30171 = 30171; public static final int NULL_30181 = 30181; public static final int NULL_30182 = 30182; @@ -14977,6 +14981,7 @@ public final class NullObjectID public static final int NULL_31895 = 31895; public static final int NULL_31896 = 31896; public static final int NULL_31897 = 31897; + public static final int NULL_31899 = 31899; public static final int NULL_31937 = 31937; public static final int NULL_31938 = 31938; public static final int NULL_31945 = 31945; @@ -16161,6 +16166,7 @@ public final class NullObjectID public static final int NULL_34678 = 34678; public static final int NULL_34679 = 34679; public static final int NULL_34680 = 34680; + public static final int NULL_34688 = 34688; public static final int NULL_34689 = 34689; public static final int NULL_34690 = 34690; public static final int NULL_34691 = 34691; @@ -16223,6 +16229,7 @@ public final class NullObjectID public static final int NULL_34823 = 34823; public static final int NULL_34824 = 34824; public static final int NULL_34825 = 34825; + public static final int NULL_34827 = 34827; public static final int NULL_34831 = 34831; public static final int NULL_34832 = 34832; public static final int NULL_34841 = 34841; @@ -18161,6 +18168,7 @@ public final class NullObjectID public static final int NULL_37722 = 37722; public static final int NULL_37723 = 37723; public static final int NULL_37724 = 37724; + public static final int NULL_37725 = 37725; public static final int NULL_37732 = 37732; public static final int NULL_37733 = 37733; public static final int NULL_37734 = 37734; @@ -18328,6 +18336,11 @@ public final class NullObjectID public static final int NULL_37933 = 37933; public static final int NULL_37934 = 37934; public static final int NULL_37935 = 37935; + public static final int NULL_37940 = 37940; + public static final int NULL_37945 = 37945; + public static final int NULL_37947 = 37947; public static final int NULL_37950 = 37950; + public static final int NULL_37956 = 37956; + public static final int NULL_37958 = 37958; /* 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 7e2270e14b..af1d77c7a5 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -15803,6 +15803,8 @@ public final class ObjectID public static final int POOL_OF_NIGHTMARES = 29706; public static final int POOL_OF_NIGHTMARES_29707 = 29707; public static final int SCOREBOARD_29708 = 29708; + public static final int MAGIC_PORTAL_29711 = 29711; + public static final int PAINT_BUCKETS = 29712; public static final int NOTICEBOARD_29718 = 29718; public static final int BALLISTA_29719 = 29719; public static final int STAIRCASE_29720 = 29720; @@ -16023,6 +16025,11 @@ public final class ObjectID public static final int PAINTING_30155 = 30155; public static final int FURNACE_30157 = 30157; public static final int FURNACE_30158 = 30158; + public static final int BROKEN_EGG = 30160; + public static final int CONCH_SHELL = 30161; + public static final int THE_MAGIC_EGG = 30162; + public static final int CAKE = 30163; + public static final int CARROT = 30164; public static final int CRACK_30169 = 30169; public static final int ROOT_30170 = 30170; public static final int PORTAL_30172 = 30172; @@ -18579,7 +18586,6 @@ public final class ObjectID public static final int RUBBLE_34804 = 34804; public static final int RUBBLE_34805 = 34805; public static final int JADFEST_PORTAL = 34826; - public static final int HANDY_PORTAL = 34827; public static final int LARRANS_SMALL_CHEST_34828 = 34828; public static final int LARRANS_BIG_CHEST = 34829; public static final int LARRANS_BIG_CHEST_34830 = 34830; @@ -19539,6 +19545,9 @@ public final class ObjectID public static final int NIGHTMARE_TOPIARY = 37630; public static final int SUPPLIES_37631 = 37631; public static final int BANNER_37726 = 37726; + public static final int RABBIT = 37727; + public static final int RABBIT_37728 = 37728; + public static final int GRAVE_37729 = 37729; public static final int ENERGY_BARRIER_37730 = 37730; public static final int ENERGY_BARRIER_37731 = 37731; public static final int SPORE = 37738; @@ -19581,7 +19590,19 @@ public final class ObjectID public static final int CRATE_37936 = 37936; public static final int DOOR_37937 = 37937; public static final int DOOR_37938 = 37938; + public static final int BROKEN_GOAT_HORN = 37939; + public static final int GATE_37941 = 37941; + public static final int GATE_37942 = 37942; + public static final int GATE_37943 = 37943; + public static final int GATE_37944 = 37944; + public static final int TREE_37946 = 37946; + public static final int DEAD_TREE_37948 = 37948; public static final int SCOREBOARD_37949 = 37949; public static final int COFFIN_37951 = 37951; + public static final int JUNGLE_TREE_37952 = 37952; + public static final int YEW_37953 = 37953; + public static final int TREE_STUMP_37954 = 37954; + public static final int FURNACE_37955 = 37955; + public static final int HANDY_PORTAL = 37957; /* 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 db982bd452..fb02976579 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -262,7 +262,7 @@ public final class ScriptID /** * Builds the grand exchange item search widget */ - @ScriptArguments(integer = 2) + @ScriptArguments(integer = 3) public static final int GE_ITEM_SEARCH = 752; /** diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 47f5e63ba8..974a1c8c7f 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -87,6 +87,7 @@ import net.runelite.client.ui.overlay.WidgetOverlay; import net.runelite.client.ui.overlay.arrow.ArrowMinimapOverlay; import net.runelite.client.ui.overlay.arrow.ArrowWorldOverlay; import net.runelite.client.ui.overlay.infobox.InfoBoxOverlay; +import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.ui.overlay.tooltip.TooltipOverlay; import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay; import net.runelite.client.util.Groups; @@ -145,6 +146,12 @@ public class RuneLite @Inject private OverlayManager overlayManager; + @Inject + private TooltipManager tooltipManager; + + @Inject + private Provider partyService; + @Inject private Provider itemManager; @@ -421,6 +428,15 @@ public class RuneLite // Initialize Discord service discordService.init(); + // Register event listeners + eventBus.register(clientUI); + eventBus.register(pluginManager); + eventBus.register(externalPluginManager); + eventBus.register(overlayManager); + eventBus.register(drawManager); + eventBus.register(infoBoxManager); + eventBus.register(tooltipManager); + if (!isOutdated) { // Initialize chat colors diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java index 2f51a2f1ae..cff907207c 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java @@ -60,8 +60,8 @@ public class WidgetOverlay extends Overlay .put(WidgetInfo.MULTICOMBAT_FIXED, OverlayPosition.BOTTOM_RIGHT) .put(WidgetInfo.MULTICOMBAT_RESIZEABLE, OverlayPosition.CANVAS_TOP_RIGHT) .put(WidgetInfo.PYRAMID_PLUNDER_DATA, OverlayPosition.TOP_CENTER) - .put(WidgetInfo.LMS_INFO, OverlayPosition.TOP_CENTER) - .put(WidgetInfo.LMS_KDA, OverlayPosition.TOP_CENTER) + .put(WidgetInfo.LMS_INFO, OverlayPosition.TOP_RIGHT) + .put(WidgetInfo.LMS_KDA, OverlayPosition.TOP_RIGHT) .put(WidgetInfo.THEATRE_OF_BLOOD_HEALTH_ORBS, OverlayPosition.TOP_LEFT) .put(WidgetInfo.GAUNTLET_TIMER_CONTAINER, OverlayPosition.TOP_LEFT) .build(); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java index 6472381ec3..9ed020b72b 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipManager.java @@ -24,14 +24,27 @@ */ package net.runelite.client.ui.overlay.tooltip; +import com.google.common.base.Strings; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; import javax.inject.Singleton; import lombok.Getter; +import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; @Singleton public class TooltipManager { + private final ConfigManager configManager; + + @Inject + private TooltipManager(final ConfigManager configManager) + { + this.configManager = configManager; + } + @Getter private final List tooltips = new ArrayList<>(); @@ -49,4 +62,17 @@ public class TooltipManager { tooltips.clear(); } + + @Subscribe + public void onConfigChanged(final ConfigChanged event) + { + // Temporary fix for resetting repositioned tooltip overlay + // TODO: Remove this eventually + if (event.getGroup().equals("runelite") && + event.getKey().equals("TooltipOverlay_preferredLocation") && + !Strings.isNullOrEmpty(event.getNewValue())) + { + configManager.unsetConfiguration(event.getGroup(), event.getKey()); + } + } } diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 4560275a3f..f11cb25e32 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -2352,7 +2352,8 @@ ], "cake": [ 1891, - 1893 + 1893, + 24549 ], "chocolate cake": [ 1897, @@ -6929,11 +6930,11 @@ 10364, 10736 ], - "zamorak dhide": [ + "zamorak dhide body": [ 10370, 10790 ], - "saradomin dhide": [ + "saradomin dhide body": [ 10386, 10792 ], @@ -9584,7 +9585,9 @@ ], "blade of saeldor": [ 23995, - 23997 + 23997, + 24551, + 24553 ], "elven top": [ 24009,