From 30001902c36254ce96667c17ca04f57c226e13fa Mon Sep 17 00:00:00 2001
From: Lars van Soest
- * Maintained up to d129c49. + * Maintained up to af5ae4a. * To check for any updates, see https://github.com/runelite/runelite/commits/master/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java *
* diff --git a/src/main/java/com/larsvansoest/runelite/clueitems/data/EmoteClueItem.java b/src/main/java/com/larsvansoest/runelite/clueitems/data/EmoteClueItem.java index 2cfbaf6..c53a4e1 100644 --- a/src/main/java/com/larsvansoest/runelite/clueitems/data/EmoteClueItem.java +++ b/src/main/java/com/larsvansoest/runelite/clueitems/data/EmoteClueItem.java @@ -394,14 +394,24 @@ public enum EmoteClueItem implements ItemRequirement OAK_SHORTBOW("Oak shortbow", ItemID.OAK_SHORTBOW), OBSIDIAN_CAPE("Obsidian cape", ItemID.OBSIDIAN_CAPE), ORANGE_BOATER("Orange boater", ItemID.ORANGE_BOATER), - PHARAOHS_SCEPTRE_1("Pharaohs sceptre 1", ItemID.PHARAOHS_SCEPTRE_1), - PHARAOHS_SCEPTRE_2("Pharaohs sceptre 2", ItemID.PHARAOHS_SCEPTRE_2), - PHARAOHS_SCEPTRE_3("Pharaohs sceptre 3", ItemID.PHARAOHS_SCEPTRE_3), - PHARAOHS_SCEPTRE_4("Pharaohs sceptre 4", ItemID.PHARAOHS_SCEPTRE_4), - PHARAOHS_SCEPTRE_5("Pharaohs sceptre 5", ItemID.PHARAOHS_SCEPTRE_5), - PHARAOHS_SCEPTRE_6("Pharaohs sceptre 6", ItemID.PHARAOHS_SCEPTRE_6), - PHARAOHS_SCEPTRE_7("Pharaohs sceptre 7", ItemID.PHARAOHS_SCEPTRE_7), - PHARAOHS_SCEPTRE_8("Pharaohs sceptre 8", ItemID.PHARAOHS_SCEPTRE_8), + PHARAOHS_SCEPTRE_13074("Pharaohs sceptre 13074", ItemID.PHARAOHS_SCEPTRE_13074), + PHARAOHS_SCEPTRE_13075("Pharaohs sceptre 13075", ItemID.PHARAOHS_SCEPTRE_13075), + PHARAOHS_SCEPTRE_13076("Pharaohs sceptre 13076", ItemID.PHARAOHS_SCEPTRE_13076), + PHARAOHS_SCEPTRE_13077("Pharaohs sceptre 13077", ItemID.PHARAOHS_SCEPTRE_13077), + PHARAOHS_SCEPTRE_13078("Pharaohs sceptre 13078", ItemID.PHARAOHS_SCEPTRE_13078), + PHARAOHS_SCEPTRE_16176("Pharaohs sceptre 16176", ItemID.PHARAOHS_SCEPTRE_16176), + PHARAOHS_SCEPTRE_21445("Pharaohs sceptre 21445", ItemID.PHARAOHS_SCEPTRE_21445), + PHARAOHS_SCEPTRE_21446("Pharaohs sceptre 21446", ItemID.PHARAOHS_SCEPTRE_21446), + PHARAOHS_SCEPTRE_26948("Pharaohs sceptre 26950", ItemID.PHARAOHS_SCEPTRE_26948), + PHARAOHS_SCEPTRE_26950("Pharaohs sceptre 26950", ItemID.PHARAOHS_SCEPTRE_26950), + PHARAOHS_SCEPTRE_9045("Pharaohs sceptre 9045", ItemID.PHARAOHS_SCEPTRE_9045), + PHARAOHS_SCEPTRE_9046("Pharaohs sceptre 9046", ItemID.PHARAOHS_SCEPTRE_9046), + PHARAOHS_SCEPTRE_9047("Pharaohs sceptre 9047", ItemID.PHARAOHS_SCEPTRE_9047), + PHARAOHS_SCEPTRE_9048("Pharaohs sceptre 9048", ItemID.PHARAOHS_SCEPTRE_9048), + PHARAOHS_SCEPTRE_9049("Pharaohs sceptre 9049", ItemID.PHARAOHS_SCEPTRE_9049), + PHARAOHS_SCEPTRE_9050("Pharaohs sceptre 9050", ItemID.PHARAOHS_SCEPTRE_9050), + PHARAOHS_SCEPTRE_9051("Pharaohs sceptre 9051", ItemID.PHARAOHS_SCEPTRE_9051), + PHARAOHS_SCEPTRE_UNCHARGED("Pharaohs sceptre uncharged", ItemID.PHARAOHS_SCEPTRE_UNCHARGED), PHARAOHS_SCEPTRE("Pharaohs sceptre", ItemID.PHARAOHS_SCEPTRE), PINK_BOATER("Pink boater", ItemID.PINK_BOATER), PINK_HEADBAND("Pink headband", ItemID.PINK_HEADBAND), @@ -926,15 +936,25 @@ public enum EmoteClueItem implements ItemRequirement ), ANY_PHARAOHS_SCEPTRE("Pharaoh's sceptre", false, - EmoteClueItem.PHARAOHS_SCEPTRE, - EmoteClueItem.PHARAOHS_SCEPTRE_1, - EmoteClueItem.PHARAOHS_SCEPTRE_2, - EmoteClueItem.PHARAOHS_SCEPTRE_3, - EmoteClueItem.PHARAOHS_SCEPTRE_4, - EmoteClueItem.PHARAOHS_SCEPTRE_5, - EmoteClueItem.PHARAOHS_SCEPTRE_6, - EmoteClueItem.PHARAOHS_SCEPTRE_7, - EmoteClueItem.PHARAOHS_SCEPTRE_8 + EmoteClueItem.PHARAOHS_SCEPTRE_13074, + EmoteClueItem.PHARAOHS_SCEPTRE_13075, + EmoteClueItem.PHARAOHS_SCEPTRE_13076, + EmoteClueItem.PHARAOHS_SCEPTRE_13077, + EmoteClueItem.PHARAOHS_SCEPTRE_13078, + EmoteClueItem.PHARAOHS_SCEPTRE_16176, + EmoteClueItem.PHARAOHS_SCEPTRE_21445, + EmoteClueItem.PHARAOHS_SCEPTRE_21446, + EmoteClueItem.PHARAOHS_SCEPTRE_26948, + EmoteClueItem.PHARAOHS_SCEPTRE_26950, + EmoteClueItem.PHARAOHS_SCEPTRE_9045, + EmoteClueItem.PHARAOHS_SCEPTRE_9046, + EmoteClueItem.PHARAOHS_SCEPTRE_9047, + EmoteClueItem.PHARAOHS_SCEPTRE_9048, + EmoteClueItem.PHARAOHS_SCEPTRE_9049, + EmoteClueItem.PHARAOHS_SCEPTRE_9050, + EmoteClueItem.PHARAOHS_SCEPTRE_9051, + EmoteClueItem.PHARAOHS_SCEPTRE_UNCHARGED, + EmoteClueItem.PHARAOHS_SCEPTRE ), ANY_PIRATE_BANDANA("Any pirate bandana", false, EmoteClueItem.PIRATE_BANDANA, EmoteClueItem.PIRATE_BANDANA_7124, EmoteClueItem.PIRATE_BANDANA_7130, EmoteClueItem.PIRATE_BANDANA_7136), ANY_RUNE_CROSSBOW("Any rune crossbow", false, EmoteClueItem.RUNE_CROSSBOW, EmoteClueItem.RUNE_CROSSBOW_OR), diff --git a/src/main/java/com/larsvansoest/runelite/clueitems/overlay/EmoteClueItemsWorldOverlay.java b/src/main/java/com/larsvansoest/runelite/clueitems/overlay/EmoteClueItemsWorldOverlay.java deleted file mode 100644 index e8df89e..0000000 --- a/src/main/java/com/larsvansoest/runelite/clueitems/overlay/EmoteClueItemsWorldOverlay.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.larsvansoest.runelite.clueitems.overlay; - -import com.larsvansoest.runelite.clueitems.data.EmoteClueDifficulty; -import com.larsvansoest.runelite.clueitems.data.EmoteClueImages; -import lombok.Setter; -import net.runelite.api.Client; -import net.runelite.api.coords.LocalPoint; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayLayer; -import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.OverlayUtil; - -import java.awt.*; -import java.util.Objects; - -public class EmoteClueItemsWorldOverlay extends Overlay -{ - private final Client client; - @Setter - private LocalPoint localPoint; - - public EmoteClueItemsWorldOverlay(final Client client) - { - this.setPosition(OverlayPosition.DYNAMIC); - this.setLayer(OverlayLayer.ABOVE_SCENE); - this.client = client; - } - - @Override - public Dimension render(final Graphics2D graphics) - { - if (Objects.nonNull(this.localPoint)) - { - OverlayUtil.renderTileOverlay(this.client, graphics, this.localPoint, EmoteClueImages.getScroll(EmoteClueDifficulty.Master), EmoteClueDifficulty.Master.getColor()); - } - - return null; - } -}